Move things into more hierarchical namespaces

manifests/apply.sh

@@ -21,15 +21,12 @@ kubectl annotate nodes --overwrite zeke 'node.longhorn.io/default-disks-config=[
   { "path": "/var/lib/longhorn", "allowScheduling" : trues, "tags": ["ssd", "fast"]}
 ]'
 
-kubectl apply -k namespaces
 kubectl apply -f helm/flux.yaml
 sleep 5
 kubectl apply -f helm/kyverno.yaml
 sleep 15
 kubectl apply -k helm
 sleep 5
-kubectl apply -k .
-sleep 5
 # https://cloudnative-pg.io
 helm repo add cnpg https://cloudnative-pg.github.io/charts/
 helm upgrade --install cnpg \
@@ -37,5 +34,7 @@ helm upgrade --install cnpg \
     cnpg/cloudnative-pg \
     -f values/cnpg.yaml \
     --wait
+sleep 5
+kubectl apply -k .
 
 ./immich/apply.sh

manifests/bitwarden/kustomization.yaml

@@ -1,6 +1,7 @@
 namespace: bitwarden
 
 resources:
+  - namespace.yaml
   - deployment.yaml
   - service.yaml
   - cluster-stores.yaml

manifests/databases/kustomization.yaml

@@ -1,6 +1,8 @@
 namespace: db
 
 resources:
+  - namespace.yaml
+  - secrets.yaml
   - postgres-cluster.yaml
   - postgres-gitlab.yaml
   - postgres-pgadmin.yaml

manifests/databases/secrets.yaml

@@ -0,0 +1,135 @@
+apiVersion: external-secrets.io/v1
+kind: ExternalSecret
+metadata:
+  name: postgres-user-gitlab
+  namespace: db
+spec:
+  target:
+    name: postgres-user-gitlab
+    deletionPolicy: Delete
+    template:
+      type: Opaque
+      data:
+        username: |-
+          {{ .username }}
+        password: |-
+          {{ .password }}
+  data:
+    - secretKey: username
+      sourceRef:
+        storeRef:
+          name: bitwarden-login
+          kind: ClusterSecretStore
+      remoteRef:
+        key: 5282ad16-c2dc-49d3-8fb3-b2e9012bab57
+        property: username
+    - secretKey: password
+      sourceRef:
+        storeRef:
+          name: bitwarden-login
+          kind: ClusterSecretStore
+      remoteRef:
+        key: 5282ad16-c2dc-49d3-8fb3-b2e9012bab57
+        property: password
+---
+apiVersion: external-secrets.io/v1
+kind: ExternalSecret
+metadata:
+  name: postgres-user-matrix
+  namespace: db
+spec:
+  target:
+    name: postgres-user-matrix
+    deletionPolicy: Delete
+    template:
+      type: Opaque
+      data:
+        username: |-
+          {{ .username }}
+        password: |-
+          {{ .password }}
+  data:
+    - secretKey: username
+      sourceRef:
+        storeRef:
+          name: bitwarden-login
+          kind: ClusterSecretStore
+      remoteRef:
+        key: 36d1046b-727e-4e09-a391-b2e90171d3d0
+        property: username
+    - secretKey: password
+      sourceRef:
+        storeRef:
+          name: bitwarden-login
+          kind: ClusterSecretStore
+      remoteRef:
+        key: 36d1046b-727e-4e09-a391-b2e90171d3d0
+        property: password
+---
+apiVersion: external-secrets.io/v1
+kind: ExternalSecret
+metadata:
+  name: postgres-user-pgadmin
+  namespace: db
+spec:
+  target:
+    name: postgres-user-pgadmin
+    deletionPolicy: Delete
+    template:
+      type: Opaque
+      data:
+        username: |-
+          {{ .username }}
+        password: |-
+          {{ .password }}
+  data:
+    - secretKey: username
+      sourceRef:
+        storeRef:
+          name: bitwarden-login
+          kind: ClusterSecretStore
+      remoteRef:
+        key: f333d637-1667-499d-b9a0-b2e9012bd8b7
+        property: username
+    - secretKey: password
+      sourceRef:
+        storeRef:
+          name: bitwarden-login
+          kind: ClusterSecretStore
+      remoteRef:
+        key: f333d637-1667-499d-b9a0-b2e9012bd8b7
+        property: password
+---
+apiVersion: external-secrets.io/v1
+kind: ExternalSecret
+metadata:
+  name: k3sbackup
+  namespace: db
+spec:
+  target:
+    name: k3sbackup
+    deletionPolicy: Delete
+    template:
+      type: Opaque
+      data:
+        username: |-
+          {{ .username }}
+        password: |-
+          {{ .password }}
+  data:
+    - secretKey: username
+      sourceRef:
+        storeRef:
+          name: bitwarden-login
+          kind: ClusterSecretStore
+      remoteRef:
+        key: 685b29c6-9264-4e60-ba4a-b2ea005a5d7b
+        property: username
+    - secretKey: password
+      sourceRef:
+        storeRef:
+          name: bitwarden-login
+          kind: ClusterSecretStore
+      remoteRef:
+        key: 685b29c6-9264-4e60-ba4a-b2ea005a5d7b
+        property: password

manifests/gitlab-runner/kustomization.yaml

@@ -1,4 +1,6 @@
 namespace: gitlab-runner
 
 resources:
+  - namespace.yaml
+  - secrets.yaml
   - chart.yaml

manifests/kustomization.yaml

@@ -1,6 +1,4 @@
 resources:
-  - namespaces
-  - pvc
   - helm
   - bitwarden
   - secrets

manifests/matrix/kustomization.yaml

@@ -1,6 +1,7 @@
 namespace: matrix
 
 resources:
+  - namespace.yaml
   - dendrite-config.yaml
   - deployment.yaml
   - service.yaml

manifests/namespaces/kustomization.yaml

@@ -1,5 +0,0 @@
-resources:
-  - bitwarden.yaml
-  - db.yaml
-  - gitlab-runner.yaml
-  - matrix.yaml

manifests/secrets/k3sbackup.yaml

@@ -1,33 +0,0 @@
-apiVersion: external-secrets.io/v1
-kind: ExternalSecret
-metadata:
-  name: k3sbackup
-  namespace: db
-spec:
-  target:
-    name: k3sbackup
-    deletionPolicy: Delete
-    template:
-      type: Opaque
-      data:
-        username: |-
-          {{ .username }}
-        password: |-
-          {{ .password }}
-  data:
-    - secretKey: username
-      sourceRef:
-        storeRef:
-          name: bitwarden-login
-          kind: ClusterSecretStore
-      remoteRef:
-        key: 685b29c6-9264-4e60-ba4a-b2ea005a5d7b
-        property: username
-    - secretKey: password
-      sourceRef:
-        storeRef:
-          name: bitwarden-login
-          kind: ClusterSecretStore
-      remoteRef:
-        key: 685b29c6-9264-4e60-ba4a-b2ea005a5d7b
-        property: password

manifests/secrets/kustomization.yaml

@@ -1,7 +1,2 @@
 resources:
-  - postgres-user-gitlab.yaml
-  - postgres-user-pgadmin.yaml
-  - postgres-user-matrix.yaml
-  - k3sbackup.yaml
-  - gitlab-runner.yaml
   - longhorn.yaml

manifests/secrets/postgres-user-gitlab.yaml

@@ -1,33 +0,0 @@
-apiVersion: external-secrets.io/v1
-kind: ExternalSecret
-metadata:
-  name: postgres-user-gitlab
-  namespace: db
-spec:
-  target:
-    name: postgres-user-gitlab
-    deletionPolicy: Delete
-    template:
-      type: Opaque
-      data:
-        username: |-
-          {{ .username }}
-        password: |-
-          {{ .password }}
-  data:
-    - secretKey: username
-      sourceRef:
-        storeRef:
-          name: bitwarden-login
-          kind: ClusterSecretStore
-      remoteRef:
-        key: 5282ad16-c2dc-49d3-8fb3-b2e9012bab57
-        property: username
-    - secretKey: password
-      sourceRef:
-        storeRef:
-          name: bitwarden-login
-          kind: ClusterSecretStore
-      remoteRef:
-        key: 5282ad16-c2dc-49d3-8fb3-b2e9012bab57
-        property: password

manifests/secrets/postgres-user-matrix.yaml

@@ -1,33 +0,0 @@
-apiVersion: external-secrets.io/v1
-kind: ExternalSecret
-metadata:
-  name: postgres-user-matrix
-  namespace: db
-spec:
-  target:
-    name: postgres-user-matrix
-    deletionPolicy: Delete
-    template:
-      type: Opaque
-      data:
-        username: |-
-          {{ .username }}
-        password: |-
-          {{ .password }}
-  data:
-    - secretKey: username
-      sourceRef:
-        storeRef:
-          name: bitwarden-login
-          kind: ClusterSecretStore
-      remoteRef:
-        key: 36d1046b-727e-4e09-a391-b2e90171d3d0
-        property: username
-    - secretKey: password
-      sourceRef:
-        storeRef:
-          name: bitwarden-login
-          kind: ClusterSecretStore
-      remoteRef:
-        key: 36d1046b-727e-4e09-a391-b2e90171d3d0
-        property: password

manifests/secrets/postgres-user-pgadmin.yaml

@@ -1,33 +0,0 @@
-apiVersion: external-secrets.io/v1
-kind: ExternalSecret
-metadata:
-  name: postgres-user-pgadmin
-  namespace: db
-spec:
-  target:
-    name: postgres-user-pgadmin
-    deletionPolicy: Delete
-    template:
-      type: Opaque
-      data:
-        username: |-
-          {{ .username }}
-        password: |-
-          {{ .password }}
-  data:
-    - secretKey: username
-      sourceRef:
-        storeRef:
-          name: bitwarden-login
-          kind: ClusterSecretStore
-      remoteRef:
-        key: f333d637-1667-499d-b9a0-b2e9012bd8b7
-        property: username
-    - secretKey: password
-      sourceRef:
-        storeRef:
-          name: bitwarden-login
-          kind: ClusterSecretStore
-      remoteRef:
-        key: f333d637-1667-499d-b9a0-b2e9012bd8b7
-        property: password