From f85315c75851ce0158cf6d66663a45fe85945289 Mon Sep 17 00:00:00 2001 From: Willian Paixao Date: Fri, 14 Jun 2024 02:44:51 +0200 Subject: [PATCH] fix: rename path to old cluster --- .../apps/cert-manager/cert-manager/ks.yaml | 4 +- .../main/apps/database/kustomization.yaml | 5 -- kubernetes/main/apps/database/namespace.yaml | 8 --- .../database/postgres/app/helmrelease.yaml | 52 ------------------- .../database/postgres/app/kustomization.yaml | 5 -- .../postgres/app/postgresql-secret.sops.yaml | 31 ----------- .../main/apps/database/postgres/ks.yaml | 21 -------- kubernetes/main/apps/default/homepage/ks.yaml | 2 +- .../main/apps/flux-system/webhooks/ks.yaml | 2 +- .../main/apps/kube-system/cilium/ks.yaml | 2 +- .../apps/kube-system/csi-driver-nfs/ks.yaml | 2 +- .../main/apps/kube-system/descheduler/ks.yaml | 2 +- kubernetes/main/apps/media/immich/ks.yaml | 2 +- kubernetes/main/apps/media/jellyfin/ks.yaml | 2 +- .../main/apps/network/cloudflared/ks.yaml | 2 +- .../main/apps/network/echo-server/ks.yaml | 3 +- .../main/apps/network/external-dns/ks.yaml | 3 +- .../main/apps/network/ingress-nginx/ks.yaml | 6 +-- kubernetes/main/flux/config/cluster.yaml | 4 +- 19 files changed, 19 insertions(+), 139 deletions(-) delete mode 100644 kubernetes/main/apps/database/kustomization.yaml delete mode 100644 kubernetes/main/apps/database/namespace.yaml delete mode 100644 kubernetes/main/apps/database/postgres/app/helmrelease.yaml delete mode 100644 kubernetes/main/apps/database/postgres/app/kustomization.yaml delete mode 100644 kubernetes/main/apps/database/postgres/app/postgresql-secret.sops.yaml delete mode 100644 kubernetes/main/apps/database/postgres/ks.yaml diff --git a/kubernetes/main/apps/cert-manager/cert-manager/ks.yaml b/kubernetes/main/apps/cert-manager/cert-manager/ks.yaml index ea0d2af9a..39b7b344f 100644 --- a/kubernetes/main/apps/cert-manager/cert-manager/ks.yaml +++ b/kubernetes/main/apps/cert-manager/cert-manager/ks.yaml @@ -9,7 +9,7 @@ spec: commonMetadata: labels: app.kubernetes.io/name: *app - path: ./kubernetes/apps/cert-manager/cert-manager/app + path: ./kubernetes/main/apps/cert-manager/cert-manager/app prune: true sourceRef: kind: GitRepository @@ -31,7 +31,7 @@ spec: app.kubernetes.io/name: *app dependsOn: - name: cert-manager - path: ./kubernetes/apps/cert-manager/cert-manager/issuers + path: ./kubernetes/main/apps/cert-manager/cert-manager/issuers prune: true sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/database/kustomization.yaml b/kubernetes/main/apps/database/kustomization.yaml deleted file mode 100644 index 5413fe6af..000000000 --- a/kubernetes/main/apps/database/kustomization.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: - - ./namespace.yaml diff --git a/kubernetes/main/apps/database/namespace.yaml b/kubernetes/main/apps/database/namespace.yaml deleted file mode 100644 index c526a84a2..000000000 --- a/kubernetes/main/apps/database/namespace.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -apiVersion: v1 -kind: Namespace -metadata: - name: database - labels: - kubernetes.io/metadata.name: database - kustomize.toolkit.fluxcd.io/prune: disabled diff --git a/kubernetes/main/apps/database/postgres/app/helmrelease.yaml b/kubernetes/main/apps/database/postgres/app/helmrelease.yaml deleted file mode 100644 index 27937754c..000000000 --- a/kubernetes/main/apps/database/postgres/app/helmrelease.yaml +++ /dev/null @@ -1,52 +0,0 @@ ---- -apiVersion: helm.toolkit.fluxcd.io/v2 -kind: HelmRelease -metadata: - name: &app postgresql - namespace: &namespace database -spec: - interval: 30m - chart: - spec: - chart: postgresql - version: 15.2.12 - sourceRef: - kind: HelmRepository - name: bitnami - namespace: flux-system - install: - remediation: - retries: 3 - upgrade: - cleanupOnFail: true - remediation: - strategy: rollback - retries: 3 - values: - global: - postgresql: - auth: - existingSecret: postgresql-secret - database: main - image: - repository: bitnami/postgresql - tag: "16.3.0" - primary: - containerSecurityContext: - runAsNonRoot: false - readOnlyRootFilesystem: false - persistence: - enabled: true - type: persistentVolumeClaim - accessMode: ReadWriteOnce - size: 16Gi - metrics: - enabled: true - serviceMonitor: - enabled: true - backup: - enabled: true - cronjob: - storage: - storageClass: longhorn - size: 16Gi diff --git a/kubernetes/main/apps/database/postgres/app/kustomization.yaml b/kubernetes/main/apps/database/postgres/app/kustomization.yaml deleted file mode 100644 index dbc604ed7..000000000 --- a/kubernetes/main/apps/database/postgres/app/kustomization.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: - - helmrelease.yaml diff --git a/kubernetes/main/apps/database/postgres/app/postgresql-secret.sops.yaml b/kubernetes/main/apps/database/postgres/app/postgresql-secret.sops.yaml deleted file mode 100644 index ca7015dba..000000000 --- a/kubernetes/main/apps/database/postgres/app/postgresql-secret.sops.yaml +++ /dev/null @@ -1,31 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: postgresql-secret - namespace: database - creationTimestamp: "2024-05-13T13:57:19Z" - uid: e128cd7f-59ac-48f1-8a39-c23618239268 -type: Opaque -data: - password: ENC[AES256_GCM,data:baJEArjpxp4QcTSz/fjoaaGRbKLSogOp/RJDpFzylbiRNxrkTQITbeH6euo=,iv:OmjcsrYsECOlR/T/wVy0ABt/kjOJsfXwhhvSUeMTJm4=,tag:jTIbSoKO740UC4/ItkGkRA==,type:str] - postgres-password: ENC[AES256_GCM,data:25thpO2WeTaYYWGOQ6CImChVanfJN5p7Br9wdH4sJ92bNWJnqC/PacJdrQU=,iv:ZxLCbi8B5/LW0NgXRm2iS42VOmN8SV4PZhztUrk4IYU=,tag:HyRM8WnKt7Gh8kiZEK3KfA==,type:str] -sops: - kms: [] - gcp_kms: [] - azure_kv: [] - hc_vault: [] - age: - - recipient: age17ary36xtm566uptguuhsj7xmuqzyz06ce54tcf6p3mge2thphqfs3gln40 - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBFbzkxVyt6ek5pTGQwK0Ez - ZXQrd3pRMjVnUFRCazUxaEY2K1pTRFg2bm1vCjBjYjlvVVMzSWFheDZWRnZmcGpp - cVh2UU11dXRPc3FRN2R0YVViT2pQQXMKLS0tIGVibkxlcWxXUnFQcDFmZXJmdkd1 - SStycTUxMUY3TTRNS2wrc1J3blRielEKnq+VPDIzCiYAF3TzXEF6vxuavddXB2Rv - 0ndgAfG+CnL92adpH8YOlB4V/EWxjDdHTwPR8MbgB6zxtb0FOEyjEg== - -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-05-13T14:25:48Z" - mac: ENC[AES256_GCM,data:zUNpn95cbNxrnyCgRoIw1PyOw4kXemMUj2Q0/LdRFt/ojyTIXx99ExVYsyNQBMuqTYfqc+XD7De6cg0BhEkBkstgDvgfKRJq/btQBsIzLWRgRUNUdPStVJx30Ylqp+qp1jyJtD5ID+uuHUy3eqIs4fbnXDueR4lolgetUNxlDCI=,iv:0ZIGOfCNaTgRc71pFf1rIv37+Z2BfuGl/SEhm55zssg=,tag:Ktq8xNxzu0UCYde/Arx7uw==,type:str] - pgp: [] - encrypted_regex: ^(data|stringData)$ - version: 3.7.3 diff --git a/kubernetes/main/apps/database/postgres/ks.yaml b/kubernetes/main/apps/database/postgres/ks.yaml deleted file mode 100644 index 10a039a48..000000000 --- a/kubernetes/main/apps/database/postgres/ks.yaml +++ /dev/null @@ -1,21 +0,0 @@ ---- -# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/kustomize.toolkit.fluxcd.io/kustomization_v1.json -apiVersion: kustomize.toolkit.fluxcd.io/v1 -kind: Kustomization -metadata: - name: &app postgres - namespace: flux-system -spec: - targetNamespace: database - commonMetadata: - labels: - app.kubernetes.io/name: *app - path: ./kubernetes/apps/database/postgres/app - prune: true - sourceRef: - kind: GitRepository - name: home-kubernetes - wait: false - interval: 30m - retryInterval: 1m - timeout: 15m diff --git a/kubernetes/main/apps/default/homepage/ks.yaml b/kubernetes/main/apps/default/homepage/ks.yaml index cf65074dc..c94ab7b38 100644 --- a/kubernetes/main/apps/default/homepage/ks.yaml +++ b/kubernetes/main/apps/default/homepage/ks.yaml @@ -10,7 +10,7 @@ spec: commonMetadata: labels: app.kubernetes.io/name: *app - path: ./kubernetes/apps/default/homepage/app + path: ./kubernetes/main/apps/default/homepage/app prune: true sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/flux-system/webhooks/ks.yaml b/kubernetes/main/apps/flux-system/webhooks/ks.yaml index e80c50b23..d4ae468cb 100644 --- a/kubernetes/main/apps/flux-system/webhooks/ks.yaml +++ b/kubernetes/main/apps/flux-system/webhooks/ks.yaml @@ -9,7 +9,7 @@ spec: commonMetadata: labels: app.kubernetes.io/name: *app - path: ./kubernetes/apps/flux-system/webhooks/app + path: ./kubernetes/main/apps/flux-system/webhooks/app prune: true sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/kube-system/cilium/ks.yaml b/kubernetes/main/apps/kube-system/cilium/ks.yaml index 34fbd9a98..976550425 100644 --- a/kubernetes/main/apps/kube-system/cilium/ks.yaml +++ b/kubernetes/main/apps/kube-system/cilium/ks.yaml @@ -9,7 +9,7 @@ spec: commonMetadata: labels: app.kubernetes.io/name: *app - path: ./kubernetes/apps/kube-system/cilium/app + path: ./kubernetes/main/apps/kube-system/cilium/app prune: false # never should be deleted sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/kube-system/csi-driver-nfs/ks.yaml b/kubernetes/main/apps/kube-system/csi-driver-nfs/ks.yaml index a6e2fd0e0..2d2ada91c 100644 --- a/kubernetes/main/apps/kube-system/csi-driver-nfs/ks.yaml +++ b/kubernetes/main/apps/kube-system/csi-driver-nfs/ks.yaml @@ -9,7 +9,7 @@ spec: commonMetadata: labels: app.kubernetes.io/name: *app - path: ./kubernetes/apps/kube-system/csi-driver-nfs/app + path: ./kubernetes/main/apps/kube-system/csi-driver-nfs/app prune: true sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/kube-system/descheduler/ks.yaml b/kubernetes/main/apps/kube-system/descheduler/ks.yaml index 50d763521..5bba59a0f 100644 --- a/kubernetes/main/apps/kube-system/descheduler/ks.yaml +++ b/kubernetes/main/apps/kube-system/descheduler/ks.yaml @@ -10,7 +10,7 @@ spec: commonMetadata: labels: app.kubernetes.io/name: *app - path: ./kubernetes/apps/kube-system/descheduler/app + path: ./kubernetes/main/apps/kube-system/descheduler/app prune: true sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/media/immich/ks.yaml b/kubernetes/main/apps/media/immich/ks.yaml index dfba6cace..8d3d2ef06 100644 --- a/kubernetes/main/apps/media/immich/ks.yaml +++ b/kubernetes/main/apps/media/immich/ks.yaml @@ -10,7 +10,7 @@ spec: commonMetadata: labels: app.kubernetes.io/name: *app - path: ./kubernetes/apps/media/immich/app + path: ./kubernetes/main/apps/media/immich/app prune: true sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/media/jellyfin/ks.yaml b/kubernetes/main/apps/media/jellyfin/ks.yaml index 9a6e3e120..1d0919962 100644 --- a/kubernetes/main/apps/media/jellyfin/ks.yaml +++ b/kubernetes/main/apps/media/jellyfin/ks.yaml @@ -10,7 +10,7 @@ spec: commonMetadata: labels: app.kubernetes.io/name: *app - path: ./kubernetes/apps/media/jellyfin/app + path: ./kubernetes/main/apps/media/jellyfin/app prune: true sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/network/cloudflared/ks.yaml b/kubernetes/main/apps/network/cloudflared/ks.yaml index eb8d8da0b..d05dd2479 100644 --- a/kubernetes/main/apps/network/cloudflared/ks.yaml +++ b/kubernetes/main/apps/network/cloudflared/ks.yaml @@ -11,7 +11,7 @@ spec: app.kubernetes.io/name: *app dependsOn: - name: external-dns - path: ./kubernetes/apps/network/cloudflared/app + path: ./kubernetes/main/apps/network/cloudflared/app prune: true sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/network/echo-server/ks.yaml b/kubernetes/main/apps/network/echo-server/ks.yaml index 2984f219c..8b7ba5489 100644 --- a/kubernetes/main/apps/network/echo-server/ks.yaml +++ b/kubernetes/main/apps/network/echo-server/ks.yaml @@ -1,4 +1,5 @@ --- +# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/kustomization-kustomize-v1.json apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: @@ -9,7 +10,7 @@ spec: commonMetadata: labels: app.kubernetes.io/name: *app - path: ./kubernetes/apps/network/echo-server/app + path: ./kubernetes/main/apps/network/echo-server/app prune: true sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/network/external-dns/ks.yaml b/kubernetes/main/apps/network/external-dns/ks.yaml index eaed4b566..96dce27fa 100644 --- a/kubernetes/main/apps/network/external-dns/ks.yaml +++ b/kubernetes/main/apps/network/external-dns/ks.yaml @@ -1,4 +1,5 @@ --- +# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/kustomization-kustomize-v1.json apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: @@ -9,7 +10,7 @@ spec: commonMetadata: labels: app.kubernetes.io/name: *app - path: ./kubernetes/apps/network/external-dns/app + path: ./kubernetes/main/apps/network/external-dns/app prune: true sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/network/ingress-nginx/ks.yaml b/kubernetes/main/apps/network/ingress-nginx/ks.yaml index 99b1abb58..081e26bb7 100644 --- a/kubernetes/main/apps/network/ingress-nginx/ks.yaml +++ b/kubernetes/main/apps/network/ingress-nginx/ks.yaml @@ -11,7 +11,7 @@ spec: app.kubernetes.io/name: *app dependsOn: - name: cert-manager-issuers - path: ./kubernetes/apps/network/ingress-nginx/certificates + path: ./kubernetes/main/apps/network/ingress-nginx/certificates prune: true sourceRef: kind: GitRepository @@ -33,7 +33,7 @@ spec: app.kubernetes.io/name: *app dependsOn: - name: ingress-nginx-certificates - path: ./kubernetes/apps/network/ingress-nginx/internal + path: ./kubernetes/main/apps/network/ingress-nginx/internal prune: true sourceRef: kind: GitRepository @@ -55,7 +55,7 @@ spec: app.kubernetes.io/name: *app dependsOn: - name: ingress-nginx-certificates - path: ./kubernetes/apps/network/ingress-nginx/external + path: ./kubernetes/main/apps/network/ingress-nginx/external prune: true sourceRef: kind: GitRepository diff --git a/kubernetes/main/flux/config/cluster.yaml b/kubernetes/main/flux/config/cluster.yaml index e02d5c0db..41d2f7c2e 100644 --- a/kubernetes/main/flux/config/cluster.yaml +++ b/kubernetes/main/flux/config/cluster.yaml @@ -15,7 +15,7 @@ spec: # exclude all /* # include kubernetes directory - !/kubernetes + !/kubernetes/main --- apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization @@ -24,7 +24,7 @@ metadata: namespace: flux-system spec: interval: 30m - path: ./kubernetes/flux + path: ./kubernetes/main/flux prune: true wait: false sourceRef: