From a6f35480df593aa3ea70e0363663d93f090d4f55 Mon Sep 17 00:00:00 2001
From: kaiyou <dev@kaiyou.fr>
Date: Sat, 9 Dec 2023 13:05:02 +0100
Subject: [PATCH] Improve flux config
---
helm/templates/flux-config.yaml | 8 ++++++++
helm/templates/flux.yaml | 8 ++++----
helm/values.yaml | 4 +---
3 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/helm/templates/flux-config.yaml b/helm/templates/flux-config.yaml
index 953f681..53b1878 100644
--- a/helm/templates/flux-config.yaml
+++ b/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 }}
diff --git a/helm/templates/flux.yaml b/helm/templates/flux.yaml
index ae5a7fe..8185541 100644
--- a/helm/templates/flux.yaml
+++ b/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
diff --git a/helm/values.yaml b/helm/values.yaml
index 6de306a..985a22c 100644
--- a/helm/values.yaml
+++ b/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
--
GitLab