Improve flux config

helm/templates/flux-config.yaml

@@ -28,4 +28,12 @@ spec:
     provider: sops
     secretRef:
       name: {{ .Values.flux.name }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ .Values.flux.name }}
+  namespace: {{ .Values.flux.namespace }}
+stringData:
+  age.agekey: {{ .Values.flux.age }}
 {{- end }}

helm/templates/flux.yaml

@@ -345,13 +345,13 @@ spec:
     spec:
       containers:
         - args:
-            - --events-addr=http://notification-controller.{{ .Values.flux.namespace }}.svc.cluster.local./
+            - --events-addr=http://notification-controller.{{ .Values.flux.namespace }}.svc.{{ .Values.cluster.name }}.local./
             - --watch-all-namespaces=true
             - --log-level=info
             - --log-encoding=json
             - --enable-leader-election
             - --storage-path=/data
-            - --storage-adv-addr=source-controller.$(RUNTIME_NAMESPACE).svc.cluster.local.
+            - --storage-adv-addr=source-controller.$(RUNTIME_NAMESPACE).svc.{{ .Values.cluster.name }}.local.
           env:
             - name: RUNTIME_NAMESPACE
               valueFrom:
@@ -451,7 +451,7 @@ spec:
     spec:
       containers:
         - args:
-            - --events-addr=http://notification-controller.{{ .Values.flux.namespace }}.svc.cluster.local./
+            - --events-addr=http://notification-controller.{{ .Values.flux.namespace }}.svc.{{ .Values.cluster.name }}.local./
             - --watch-all-namespaces=true
             - --log-level=info
             - --log-encoding=json
@@ -546,7 +546,7 @@ spec:
     spec:
       containers:
         - args:
-            - --events-addr=http://notification-controller.{{ .Values.flux.namespace }}.svc.cluster.local./
+            - --events-addr=http://notification-controller.{{ .Values.flux.namespace }}.svc.{{ .Values.cluster.name }}.local./
             - --watch-all-namespaces=true
             - --log-level=info
             - --log-encoding=json

helm/values.yaml

@@ -53,9 +53,7 @@ flux:
   namespace: kube-ops
   image:
     repository: registry.ipv6.docker.com
-  age:
-    public: agepublickey
-    private:  agesecretkey
+  age: agesecretkey
   source:
     url: https://path.to.git.repo
     branch: main