From b887b0104a6849f42fcbf28c86d7a88a3ef4b6dd Mon Sep 17 00:00:00 2001
From: Nikolai Rodionov <allanger@badhouseplants.net>
Date: Mon, 29 Apr 2024 15:46:52 +0200
Subject: [PATCH] Update everything

---
 .../templates/tasks/deploy-helmfile-base.yml        |  4 ++--
 helmule/helmule.yaml                                |  8 ++++++++
 service/helmfile.yaml                               | 13 +++++++++++++
 service/values/namespaces.yaml                      |  1 +
 workload/helmfile.yaml                              | 13 +++++++++++++
 5 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/charts/tekton-pipelines/templates/tasks/deploy-helmfile-base.yml b/charts/tekton-pipelines/templates/tasks/deploy-helmfile-base.yml
index e532e01..2b6da74 100644
--- a/charts/tekton-pipelines/templates/tasks/deploy-helmfile-base.yml
+++ b/charts/tekton-pipelines/templates/tasks/deploy-helmfile-base.yml
@@ -22,7 +22,7 @@ spec:
           | yq '.data.kubeconfig' \
           | base64 -d > /tmp/outputs/config
         chmod 0600 /tmp/outputs/config
-    - name: annonate-an-env-cm
+    - name: annonate-an-env-cm-installing
       image: alpine/k8s:1.29.2
       script: |-
         #!/bin/sh
@@ -40,7 +40,7 @@ spec:
         mkdir -p /src
         git clone https://git.badhouseplants.net/softplayer/softplayer-helmfile.git /src/helmfile
         cd /src/helmfile/workload && helmfile sync
-    - name: annonate-an-env-cm
+    - name: annonate-an-env-cm-ready
       image: alpine/k8s:1.29.2
       script: |-
         #!/bin/sh
diff --git a/helmule/helmule.yaml b/helmule/helmule.yaml
index c9ca27f..56114ba 100644
--- a/helmule/helmule.yaml
+++ b/helmule/helmule.yaml
@@ -29,6 +29,9 @@ repositories:
   - name: flannel
     helm:
       url: https://flannel-io.github.io/flannel/
+  - name: fluxcd-community 
+    helm:
+      url: https://fluxcd-community.github.io/helm-charts
   - name: rancher-local-path
     git:
       url: https://github.com/rancher/local-path-provisioner.git
@@ -109,3 +112,8 @@ charts:
     repository: cdf
     mirrors:
       - custom_command
+
+  - name: flux2
+    repository: fluxcd-community
+    mirrors:
+      - custom_command
diff --git a/service/helmfile.yaml b/service/helmfile.yaml
index cce36be..5c5509b 100644
--- a/service/helmfile.yaml
+++ b/service/helmfile.yaml
@@ -38,6 +38,19 @@ releases:
     values:
       - ./values/metrics-server.yaml
 
+  - name: flux2
+    chart: zot/flux2
+    namespace: flux-system
+    version: 2.12.4
+    createNamespace: false
+    needs:
+      - kube-system/coredns
+      - kube-system/cilium
+      - kube-system/namespaces
+    values:
+      - policies:
+          create: false
+
   - name: tekton
     chart: zot/tekton-pipeline
     namespace: tekton-system
diff --git a/service/values/namespaces.yaml b/service/values/namespaces.yaml
index cae607c..ce3865a 100644
--- a/service/values/namespaces.yaml
+++ b/service/values/namespaces.yaml
@@ -1,5 +1,6 @@
 namespaces:
   - name: tekton-system
+  - name: flux-system
   - name: metallb-system
   - name: istio-system
   - name: cert-manager
diff --git a/workload/helmfile.yaml b/workload/helmfile.yaml
index 52cbd3d..db423e2 100644
--- a/workload/helmfile.yaml
+++ b/workload/helmfile.yaml
@@ -36,6 +36,19 @@ releases:
       - kube-system/cilium
     values:
       - ./values/metrics-server.yaml
+  
+  - name: flux2
+    chart: zot/flux2
+    namespace: flux-system
+    version: 2.12.4
+    createNamespace: false
+    needs:
+      - kube-system/coredns
+      - kube-system/cilium
+      - kube-system/namespaces
+    values:
+      - policies:
+          create: false
 
   - name: cert-manager
     chart: zot/cert-manager