From 5d883cdcfc270b3cf9bbec551409a893bfb9fbdd Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Fri, 15 Aug 2025 21:29:43 -0500 Subject: [PATCH] Move things into more hierarchical namespaces --- manifests/apply.sh | 5 +- manifests/bitwarden/kustomization.yaml | 1 + .../namespace.yaml} | 0 manifests/databases/kustomization.yaml | 2 + .../db.yaml => databases/namespace.yaml} | 0 manifests/databases/secrets.yaml | 135 ++++++++++++++++++ manifests/gitlab-runner/kustomization.yaml | 2 + .../namespace.yaml} | 0 .../secrets.yaml} | 0 manifests/kustomization.yaml | 2 - manifests/matrix/kustomization.yaml | 1 + .../matrix.yaml => matrix/namespace.yaml} | 0 manifests/namespaces/kustomization.yaml | 5 - manifests/secrets/k3sbackup.yaml | 33 ----- manifests/secrets/kustomization.yaml | 5 - manifests/secrets/postgres-user-gitlab.yaml | 33 ----- manifests/secrets/postgres-user-matrix.yaml | 33 ----- manifests/secrets/postgres-user-pgadmin.yaml | 33 ----- 18 files changed, 143 insertions(+), 147 deletions(-) rename manifests/{namespaces/bitwarden.yaml => bitwarden/namespace.yaml} (100%) rename manifests/{namespaces/db.yaml => databases/namespace.yaml} (100%) create mode 100644 manifests/databases/secrets.yaml rename manifests/{namespaces/gitlab-runner.yaml => gitlab-runner/namespace.yaml} (100%) rename manifests/{secrets/gitlab-runner.yaml => gitlab-runner/secrets.yaml} (100%) rename manifests/{namespaces/matrix.yaml => matrix/namespace.yaml} (100%) delete mode 100644 manifests/namespaces/kustomization.yaml delete mode 100644 manifests/secrets/k3sbackup.yaml delete mode 100644 manifests/secrets/postgres-user-gitlab.yaml delete mode 100644 manifests/secrets/postgres-user-matrix.yaml delete mode 100644 manifests/secrets/postgres-user-pgadmin.yaml diff --git a/manifests/apply.sh b/manifests/apply.sh index 21f056a..0907a9d 100755 --- a/manifests/apply.sh +++ b/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 diff --git a/manifests/bitwarden/kustomization.yaml b/manifests/bitwarden/kustomization.yaml index 6154c52..65ded28 100644 --- a/manifests/bitwarden/kustomization.yaml +++ b/manifests/bitwarden/kustomization.yaml @@ -1,6 +1,7 @@ namespace: bitwarden resources: + - namespace.yaml - deployment.yaml - service.yaml - cluster-stores.yaml diff --git a/manifests/namespaces/bitwarden.yaml b/manifests/bitwarden/namespace.yaml similarity index 100% rename from manifests/namespaces/bitwarden.yaml rename to manifests/bitwarden/namespace.yaml diff --git a/manifests/databases/kustomization.yaml b/manifests/databases/kustomization.yaml index d8e8a11..3d46a2d 100644 --- a/manifests/databases/kustomization.yaml +++ b/manifests/databases/kustomization.yaml @@ -1,6 +1,8 @@ namespace: db resources: + - namespace.yaml + - secrets.yaml - postgres-cluster.yaml - postgres-gitlab.yaml - postgres-pgadmin.yaml diff --git a/manifests/namespaces/db.yaml b/manifests/databases/namespace.yaml similarity index 100% rename from manifests/namespaces/db.yaml rename to manifests/databases/namespace.yaml diff --git a/manifests/databases/secrets.yaml b/manifests/databases/secrets.yaml new file mode 100644 index 0000000..bca61d8 --- /dev/null +++ b/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 diff --git a/manifests/gitlab-runner/kustomization.yaml b/manifests/gitlab-runner/kustomization.yaml index ce305c5..195cdcd 100644 --- a/manifests/gitlab-runner/kustomization.yaml +++ b/manifests/gitlab-runner/kustomization.yaml @@ -1,4 +1,6 @@ namespace: gitlab-runner resources: + - namespace.yaml + - secrets.yaml - chart.yaml diff --git a/manifests/namespaces/gitlab-runner.yaml b/manifests/gitlab-runner/namespace.yaml similarity index 100% rename from manifests/namespaces/gitlab-runner.yaml rename to manifests/gitlab-runner/namespace.yaml diff --git a/manifests/secrets/gitlab-runner.yaml b/manifests/gitlab-runner/secrets.yaml similarity index 100% rename from manifests/secrets/gitlab-runner.yaml rename to manifests/gitlab-runner/secrets.yaml diff --git a/manifests/kustomization.yaml b/manifests/kustomization.yaml index 7f1876f..292400e 100644 --- a/manifests/kustomization.yaml +++ b/manifests/kustomization.yaml @@ -1,6 +1,4 @@ resources: - - namespaces - - pvc - helm - bitwarden - secrets diff --git a/manifests/matrix/kustomization.yaml b/manifests/matrix/kustomization.yaml index 34b5e68..9b7efa2 100644 --- a/manifests/matrix/kustomization.yaml +++ b/manifests/matrix/kustomization.yaml @@ -1,6 +1,7 @@ namespace: matrix resources: + - namespace.yaml - dendrite-config.yaml - deployment.yaml - service.yaml diff --git a/manifests/namespaces/matrix.yaml b/manifests/matrix/namespace.yaml similarity index 100% rename from manifests/namespaces/matrix.yaml rename to manifests/matrix/namespace.yaml diff --git a/manifests/namespaces/kustomization.yaml b/manifests/namespaces/kustomization.yaml deleted file mode 100644 index 310d54c..0000000 --- a/manifests/namespaces/kustomization.yaml +++ /dev/null @@ -1,5 +0,0 @@ -resources: - - bitwarden.yaml - - db.yaml - - gitlab-runner.yaml - - matrix.yaml diff --git a/manifests/secrets/k3sbackup.yaml b/manifests/secrets/k3sbackup.yaml deleted file mode 100644 index ec52d84..0000000 --- a/manifests/secrets/k3sbackup.yaml +++ /dev/null @@ -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 diff --git a/manifests/secrets/kustomization.yaml b/manifests/secrets/kustomization.yaml index ba8494d..e378b89 100644 --- a/manifests/secrets/kustomization.yaml +++ b/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 diff --git a/manifests/secrets/postgres-user-gitlab.yaml b/manifests/secrets/postgres-user-gitlab.yaml deleted file mode 100644 index fde4202..0000000 --- a/manifests/secrets/postgres-user-gitlab.yaml +++ /dev/null @@ -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 diff --git a/manifests/secrets/postgres-user-matrix.yaml b/manifests/secrets/postgres-user-matrix.yaml deleted file mode 100644 index dff00b2..0000000 --- a/manifests/secrets/postgres-user-matrix.yaml +++ /dev/null @@ -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 diff --git a/manifests/secrets/postgres-user-pgadmin.yaml b/manifests/secrets/postgres-user-pgadmin.yaml deleted file mode 100644 index 0f2500a..0000000 --- a/manifests/secrets/postgres-user-pgadmin.yaml +++ /dev/null @@ -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