From 2bdc0a928d73f8570c4470a8357a385e1316061f Mon Sep 17 00:00:00 2001 From: auricom <27022259+auricom@users.noreply.github.com> Date: Thu, 14 Sep 2023 18:53:43 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=91=20fix=20weaveworks=20gitops?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../home-assistant/app/kustomization.yaml | 17 ++++++++--------- .../default/zigbee2mqtt/app/kustomization.yaml | 15 +++++++-------- .../notifications/github/externalsecret.yaml | 6 +++--- .../notifications/github/notification.yaml | 6 +++--- .../addons/webhooks/github/externalsecret.yaml | 4 ++-- .../addons/webhooks/github/receiver.yaml | 12 ++---------- .../weave-gitops/app/externalsecret.yaml | 2 +- .../weave-gitops/app/helmrelease.yaml | 4 +++- .../vector/aggregator/kustomization.yaml | 15 +++++++-------- kubernetes/archive/gitea/app/helmrelease.yaml | 2 +- kubernetes/archive/gitea/app/kustomization.yaml | 11 +++++------ 11 files changed, 42 insertions(+), 52 deletions(-) diff --git a/kubernetes/apps/default/home-assistant/app/kustomization.yaml b/kubernetes/apps/default/home-assistant/app/kustomization.yaml index b27f3bd3a..d06896c35 100644 --- a/kubernetes/apps/default/home-assistant/app/kustomization.yaml +++ b/kubernetes/apps/default/home-assistant/app/kustomization.yaml @@ -1,14 +1,13 @@ ---- # yaml-language-server: $schema=https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/kustomization.json apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization namespace: default resources: - - ./externalsecret.yaml - - ./gatus.yaml - - ./helmrelease.yaml - - ./podmonitor.yaml - - ./volsync.yaml - - ./volume.yaml -patchesStrategicMerge: - - ./patches/addons.yaml +- ./externalsecret.yaml +- ./gatus.yaml +- ./helmrelease.yaml +- ./podmonitor.yaml +- ./volsync.yaml +- ./volume.yaml +patches: +- path: ./patches/addons.yaml diff --git a/kubernetes/apps/default/zigbee2mqtt/app/kustomization.yaml b/kubernetes/apps/default/zigbee2mqtt/app/kustomization.yaml index ce0589192..80e96f462 100644 --- a/kubernetes/apps/default/zigbee2mqtt/app/kustomization.yaml +++ b/kubernetes/apps/default/zigbee2mqtt/app/kustomization.yaml @@ -1,13 +1,12 @@ ---- # yaml-language-server: $schema=https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/kustomization.json apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization namespace: default resources: - - ./gatus.yaml - - ./helmrelease.yaml - - ./prometheusrule.yaml - - ./volsync.yaml - - ./volume.yaml -patchesStrategicMerge: - - ./patches/exporter.yaml +- ./gatus.yaml +- ./helmrelease.yaml +- ./prometheusrule.yaml +- ./volsync.yaml +- ./volume.yaml +patches: +- path: ./patches/exporter.yaml diff --git a/kubernetes/apps/flux-system/addons/notifications/github/externalsecret.yaml b/kubernetes/apps/flux-system/addons/notifications/github/externalsecret.yaml index 444a71197..f5908667e 100644 --- a/kubernetes/apps/flux-system/addons/notifications/github/externalsecret.yaml +++ b/kubernetes/apps/flux-system/addons/notifications/github/externalsecret.yaml @@ -2,19 +2,19 @@ apiVersion: external-secrets.io/v1beta1 kind: ExternalSecret metadata: - name: flux + name: github-token namespace: flux-system spec: secretStoreRef: kind: ClusterSecretStore name: onepassword-connect target: - name: github-notification-token + name: github-token-secret creationPolicy: Owner template: engineVersion: v2 data: - token: '{{ .GITHUB_NOTIFICATION_WEBHOOK_TOKEN }}' + token: '{{ .GITHUB_NOTIFICATION_TOKEN }}' dataFrom: - extract: key: weaveworks diff --git a/kubernetes/apps/flux-system/addons/notifications/github/notification.yaml b/kubernetes/apps/flux-system/addons/notifications/github/notification.yaml index 5390d3501..617f4cfc7 100644 --- a/kubernetes/apps/flux-system/addons/notifications/github/notification.yaml +++ b/kubernetes/apps/flux-system/addons/notifications/github/notification.yaml @@ -1,6 +1,6 @@ --- # yaml-language-server: $schema=https://kubernetes-schemas.devbu.io/provider_v1beta2.json -apiVersion: notification.toolkit.fluxcd.io/v1beta1 +apiVersion: notification.toolkit.fluxcd.io/v1beta2 kind: Provider metadata: name: github @@ -9,10 +9,10 @@ spec: type: github address: https://github.com/auricom/home-ops secretRef: - name: github-notification-token + name: github-token-secret --- # yaml-language-server: $schema=https://kubernetes-schemas.devbu.io/alert_v1beta2.json -apiVersion: notification.toolkit.fluxcd.io/v1beta1 +apiVersion: notification.toolkit.fluxcd.io/v1beta2 kind: Alert metadata: name: github diff --git a/kubernetes/apps/flux-system/addons/webhooks/github/externalsecret.yaml b/kubernetes/apps/flux-system/addons/webhooks/github/externalsecret.yaml index a27c5fe78..d2abfda8d 100644 --- a/kubernetes/apps/flux-system/addons/webhooks/github/externalsecret.yaml +++ b/kubernetes/apps/flux-system/addons/webhooks/github/externalsecret.yaml @@ -3,14 +3,14 @@ apiVersion: external-secrets.io/v1beta1 kind: ExternalSecret metadata: - name: flux + name: github-webhook-token namespace: flux-system spec: secretStoreRef: kind: ClusterSecretStore name: onepassword-connect target: - name: flux-github-webhook-secret + name: github-webhook-token-secret creationPolicy: Owner template: engineVersion: v2 diff --git a/kubernetes/apps/flux-system/addons/webhooks/github/receiver.yaml b/kubernetes/apps/flux-system/addons/webhooks/github/receiver.yaml index df253af02..d4182679e 100644 --- a/kubernetes/apps/flux-system/addons/webhooks/github/receiver.yaml +++ b/kubernetes/apps/flux-system/addons/webhooks/github/receiver.yaml @@ -11,9 +11,9 @@ spec: - ping - push secretRef: - name: flux-github-webhook-secret + name: github-webhook-token-secret resources: - - apiVersion: source.toolkit.fluxcd.io/v1beta2 + - apiVersion: source.toolkit.fluxcd.io/v1 kind: GitRepository name: home-ops-kubernetes namespace: flux-system @@ -21,14 +21,6 @@ spec: kind: Kustomization name: apps namespace: flux-system - - apiVersion: kustomize.toolkit.fluxcd.io/v1 - kind: Kustomization - name: core - namespace: flux-system - - apiVersion: kustomize.toolkit.fluxcd.io/v1 - kind: Kustomization - name: base - namespace: flux-system - apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization name: flux-cluster diff --git a/kubernetes/apps/flux-system/weave-gitops/app/externalsecret.yaml b/kubernetes/apps/flux-system/weave-gitops/app/externalsecret.yaml index 13596b302..f62f5656a 100644 --- a/kubernetes/apps/flux-system/weave-gitops/app/externalsecret.yaml +++ b/kubernetes/apps/flux-system/weave-gitops/app/externalsecret.yaml @@ -15,7 +15,7 @@ spec: template: engineVersion: v2 data: - adminPassword: "{{ .password }}" + adminPassword: "{{ .GITOPS_PASSWORD_BCRYPT }}" dataFrom: - extract: key: weaveworks diff --git a/kubernetes/apps/flux-system/weave-gitops/app/helmrelease.yaml b/kubernetes/apps/flux-system/weave-gitops/app/helmrelease.yaml index 2602959c1..1f544987b 100644 --- a/kubernetes/apps/flux-system/weave-gitops/app/helmrelease.yaml +++ b/kubernetes/apps/flux-system/weave-gitops/app/helmrelease.yaml @@ -28,6 +28,8 @@ spec: uninstall: keepHistory: false values: + annotations: + secret.reloader.stakater.com/reload: &secret weave-gitops-secret adminUser: create: true username: admin @@ -47,6 +49,6 @@ spec: - *host valuesFrom: - kind: Secret - name: weave-gitops-secret + name: *secret valuesKey: adminPassword targetPath: adminUser.passwordHash diff --git a/kubernetes/apps/monitoring/vector/aggregator/kustomization.yaml b/kubernetes/apps/monitoring/vector/aggregator/kustomization.yaml index fee5c9aa1..fb6bd0e05 100644 --- a/kubernetes/apps/monitoring/vector/aggregator/kustomization.yaml +++ b/kubernetes/apps/monitoring/vector/aggregator/kustomization.yaml @@ -1,16 +1,15 @@ ---- # yaml-language-server: $schema=https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/kustomization.json apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization namespace: monitoring resources: - - ./secret.sops.yaml - - ./helmrelease.yaml -patchesStrategicMerge: - - ./patches/geoip.yaml +- ./secret.sops.yaml +- ./helmrelease.yaml configMapGenerator: - - name: vector-aggregator-configmap - files: - - vector.yaml=./config/vector.yaml +- files: + - vector.yaml=./config/vector.yaml + name: vector-aggregator-configmap generatorOptions: disableNameSuffixHash: true +patches: +- path: ./patches/geoip.yaml diff --git a/kubernetes/archive/gitea/app/helmrelease.yaml b/kubernetes/archive/gitea/app/helmrelease.yaml index 848de8e1b..f8fbae2f9 100644 --- a/kubernetes/archive/gitea/app/helmrelease.yaml +++ b/kubernetes/archive/gitea/app/helmrelease.yaml @@ -178,7 +178,7 @@ spec: valuesKey: GITEA_AWS_S3_SECRET_KEY postRenderers: - kustomize: - patchesStrategicMerge: + patches: - kind: Deployment apiVersion: apps/v1 metadata: diff --git a/kubernetes/archive/gitea/app/kustomization.yaml b/kubernetes/archive/gitea/app/kustomization.yaml index d2d070c00..438711c36 100644 --- a/kubernetes/archive/gitea/app/kustomization.yaml +++ b/kubernetes/archive/gitea/app/kustomization.yaml @@ -1,11 +1,10 @@ ---- # yaml-language-server: $schema=https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/kustomization.json apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization namespace: default resources: - - ./externalbackup.yaml - - ./externalsecret.yaml - - ./helmrelease.yaml - - ./volsync.yaml - - ./volume.yaml +- ./externalbackup.yaml +- ./externalsecret.yaml +- ./helmrelease.yaml +- ./volsync.yaml +- ./volume.yaml