fixup! ♻️ migration externalsecrets

kubernetes/apps/default/pushover-notifier/ankr-queries/patches/postgres.yaml

@@ -1,23 +0,0 @@
----
-# yaml-language-server: $schema=https://kubernetes-schemas.devbu.io/helm.toolkit.fluxcd.io/helmrelease_v2beta1.json
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
-kind: HelmRelease
-metadata:
-  name: pushover-notifier-ankr-queries
-  namespace: default
-spec:
-  values:
-    initContainers:
-      init-db:
-        image: ghcr.io/onedr0p/postgres-initdb:14.8
-        env:
-          - name: POSTGRES_HOST
-            value: ${POSTGRES_HOST}
-          - name: POSTGRES_SUPER_PASS
-            valueFrom:
-              secretKeyRef:
-                name: postgres-superuser
-                key: password
-        envFrom:
-          - secretRef:
-              name: pushover-notifier-ankr-queries-secret

kubernetes/apps/default/pushover-notifier/app/ankr-queries/helmrelease.yaml

@@ -32,6 +32,12 @@ spec:
       cronjob:
         concurrencyPolicy: Forbid
         schedule: "*/30 * * * *"
+      01-init-db:
+        image: ghcr.io/onedr0p/postgres-init:14.8
+        imagePullPolicy: IfNotPresent
+        envFrom: &envFrom
+          - secretRef:
+              name: pushover-notifier-secret
     image:
       repository: ghcr.io/auricom/python
       tag: 1.0.0@sha256:f709710021a6e20a15eac41d7823d5c4722204bad3dcf0702763a693782492bf
@@ -41,13 +47,7 @@ spec:
     service:
       main:
         enabled: false
-    env:
-      POSTGRES_HOST: ${POSTGRES_HOST}
-    envFrom:
-      - secretRef:
-          name: pushover-notifier-ankr-queries-secret
-    podAnnotations:
-      reloader.stakater.com/auto: "true"
+    envFrom: *envFrom
     resources:
       requests:
         cpu: 50m

kubernetes/apps/default/pushover-notifier/app/ankr-queries/kustomization.yaml

@@ -5,9 +5,6 @@ kind: Kustomization
 namespace: default
 resources:
   - ./helmrelease.yaml
-  - ./secret.sops.yaml
-patchesStrategicMerge:
-  - ./patches/postgres.yaml
 configMapGenerator:
   - name: pushover-notifier-ankr-queries-configmap
     files:

kubernetes/apps/default/pushover-notifier/app/externalsecret.yaml

@@ -0,0 +1,37 @@
+---
+# yaml-language-server: $schema=https://kubernetes-schemas.devbu.io/external-secrets.io/externalsecret_v1beta1.json
+apiVersion: external-secrets.io/v1beta1
+kind: ExternalSecret
+metadata:
+  name: pushover-notifier
+  namespace: default
+spec:
+  secretStoreRef:
+    kind: ClusterSecretStore
+    name: onepassword-connect
+  target:
+    name: pushover-notifier-secret
+    creationPolicy: Owner
+    template:
+      engineVersion: v2
+      data:
+        # App
+        POSTGRES_DB: &dbName pushover-notifier
+        POSTGRES_HOST: &dbHost postgres-rw.default.svc.cluster.local
+        POSTGRES_USER: &dbUser "{{ .POSTGRES_USER }}"
+        POSTGRES_PASS: &dbPass "{{ .POSTGRES_PASS }}"
+        PUSHOVER_API_TOKEN: "{{ .PUSHOVER_API_TOKEN }}"
+        PUSHOVER_USER_KEY: "{{ .PUSHOVER_USER_KEY }}"
+        # Postgres Init
+        INIT_POSTGRES_DBNAME: *dbName
+        INIT_POSTGRES_HOST: *dbHost
+        INIT_POSTGRES_USER: *dbUser
+        INIT_POSTGRES_PASS: *dbPass
+        INIT_POSTGRES_SUPER_PASS: "{{ .POSTGRES_SUPER_PASS }}"
+  dataFrom:
+    - extract:
+        key: cloudnative-pg
+    - extract:
+        key: pushover-notifier
+    - extract:
+        key: pushover

kubernetes/apps/default/pushover-notifier/app/github-releases/helmrelease.yaml

@@ -32,6 +32,13 @@ spec:
       cronjob:
         concurrencyPolicy: Forbid
         schedule: "23 */3 * * *"
+    initContainers:
+      01-init-db:
+        image: ghcr.io/onedr0p/postgres-init:14.8
+        imagePullPolicy: IfNotPresent
+        envFrom: &envFrom
+          - secretRef:
+              name: pushover-notifier-secret
     image:
       repository: ghcr.io/auricom/python
       tag: 1.0.0@sha256:f709710021a6e20a15eac41d7823d5c4722204bad3dcf0702763a693782492bf
@@ -41,13 +48,7 @@ spec:
     service:
       main:
         enabled: false
-    env:
-      POSTGRES_HOST: ${POSTGRES_HOST}
-    envFrom:
-      - secretRef:
-          name: pushover-notifier-github-releases-secret
-    podAnnotations:
-      reloader.stakater.com/auto: "true"
+    envFrom: *envFrom
     resources:
       requests:
         cpu: 50m

kubernetes/apps/default/pushover-notifier/app/github-releases/kustomization.yaml

@@ -5,9 +5,6 @@ kind: Kustomization
 namespace: default
 resources:
   - ./helmrelease.yaml
-  - ./secret.sops.yaml
-patchesStrategicMerge:
-  - ./patches/postgres.yaml
 configMapGenerator:
   - name: pushover-notifier-github-releases-configmap
     files:

kubernetes/apps/default/pushover-notifier/app/kustomization.yaml

@@ -0,0 +1,9 @@
+---
+# yaml-language-server: $schema=https://json.schemastore.org/kustomization
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: default
+resources:
+  - ./ankr-queries
+  - ./externalsecret.yaml
+  - ./github-releases

kubernetes/apps/default/pushover-notifier/github-releases/patches/postgres.yaml

@@ -1,23 +0,0 @@
----
-# yaml-language-server: $schema=https://kubernetes-schemas.devbu.io/helm.toolkit.fluxcd.io/helmrelease_v2beta1.json
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
-kind: HelmRelease
-metadata:
-  name: pushover-notifier-github-releases
-  namespace: default
-spec:
-  values:
-    initContainers:
-      init-db:
-        image: ghcr.io/onedr0p/postgres-initdb:14.8
-        env:
-          - name: POSTGRES_HOST
-            value: ${POSTGRES_HOST}
-          - name: POSTGRES_SUPER_PASS
-            valueFrom:
-              secretKeyRef:
-                name: postgres-superuser
-                key: password
-        envFrom:
-          - secretRef:
-              name: pushover-notifier-github-releases-secret

kubernetes/apps/default/pushover-notifier/ks.yaml

@@ -3,12 +3,15 @@
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: cluster-apps-pushover-notifier-github-releases
+  name: cluster-apps-pushover-notifier
   namespace: flux-system
   labels:
     substitution.flux.home.arpa/enabled: "true"
 spec:
-  path: ./kubernetes/apps/default/pushover-notifier/github-releases
+  dependsOn:
+    - name: cluster-apps-cloudnative-pg-cluster
+    - name: cluster-apps-external-secrets-stores
+  path: ./kubernetes/apps/default/pushover-notifier/app
   prune: true
   sourceRef:
     kind: GitRepository
@@ -18,25 +21,6 @@ spec:
       kind: HelmRelease
       name: pushover-notifier-github-releases
       namespace: default
-  interval: 30m
-  retryInterval: 1m
-  timeout: 3m
----
-# yaml-language-server: $schema=https://kubernetes-schemas.devbu.io/kustomization_v1beta2.json
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
-metadata:
-  name: cluster-apps-pushover-notifier-ankr-queries
-  namespace: flux-system
-  labels:
-    substitution.flux.home.arpa/enabled: "true"
-spec:
-  path: ./kubernetes/apps/default/pushover-notifier/ankr-queries
-  prune: true
-  sourceRef:
-    kind: GitRepository
-    name: home-ops-kubernetes
-  healthChecks:
     - apiVersion: helm.toolkit.fluxcd.io/v2beta1
       kind: HelmRelease
       name: pushover-notifier-ankr-queries