🚑 fix weaveworks gitops

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
+- ./externalsecret.yaml
-  - ./gatus.yaml
+- ./gatus.yaml
-  - ./helmrelease.yaml
+- ./helmrelease.yaml
-  - ./podmonitor.yaml
+- ./podmonitor.yaml
-  - ./volsync.yaml
+- ./volsync.yaml
-  - ./volume.yaml
+- ./volume.yaml
-patchesStrategicMerge:
+patches:
-  - ./patches/addons.yaml
+- path: ./patches/addons.yaml

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
+- ./gatus.yaml
-  - ./helmrelease.yaml
+- ./helmrelease.yaml
-  - ./prometheusrule.yaml
+- ./prometheusrule.yaml
-  - ./volsync.yaml
+- ./volsync.yaml
-  - ./volume.yaml
+- ./volume.yaml
-patchesStrategicMerge:
+patches:
-  - ./patches/exporter.yaml
+- path: ./patches/exporter.yaml

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

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

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

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

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

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

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
+- ./secret.sops.yaml
-  - ./helmrelease.yaml
+- ./helmrelease.yaml
-patchesStrategicMerge:
-  - ./patches/geoip.yaml
 configMapGenerator:
-  - name: vector-aggregator-configmap
+- files:
-    files:
+  - vector.yaml=./config/vector.yaml
-      - vector.yaml=./config/vector.yaml
+  name: vector-aggregator-configmap
 generatorOptions:
   disableNameSuffixHash: true
+patches:
+- path: ./patches/geoip.yaml

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:

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
+- ./externalbackup.yaml
-  - ./externalsecret.yaml
+- ./externalsecret.yaml
-  - ./helmrelease.yaml
+- ./helmrelease.yaml
-  - ./volsync.yaml
+- ./volsync.yaml
-  - ./volume.yaml
+- ./volume.yaml