Add flux to base chart (#748)

pluralsh · Mar 5, 2024 · e733d18 · e733d18
1 parent 9db84a1
commit e733d18
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 20 deletions.
diff --git a/.github/workflows/add-asana-comment.yml b/.github/workflows/add-asana-comment.yml
diff --git a/charts/console/Chart.lock b/charts/console/Chart.lock
@@ -5,5 +5,8 @@ dependencies:
 - name: controller
   repository: file://../controller
   version: 0.0.20
-digest: sha256:adc3feb57d179eb46be70f35560655f9f25da37c1bc856801e0139d3893a01c7
-generated: "2024-03-04T19:25:14.184405624Z"
+- name: flux2
+  repository: https://fluxcd-community.github.io/helm-charts
+  version: 2.11.1
+digest: sha256:89336104f2252bd6796d3f61fac7c0b2c9abe149dd456b92a5496afa5ac027a4
+generated: "2024-03-04T16:41:22.223231-05:00"
diff --git a/charts/console/Chart.yaml b/charts/console/Chart.yaml
@@ -3,12 +3,16 @@ name: console
 description: >-
   deploys the plural console and additional dependencies, for use in bring-your-own-kube setups
 appVersion: 0.8.14
-version: 0.1.38
+version: 0.1.39
 dependencies:
   - name: kas
     version: 0.0.5
     repository: file://../../plural/helm/kas
   - name: controller
     version: 0.0.20
     repository: file://../controller
+  - name: flux2
+    repository: https://fluxcd-community.github.io/helm-charts
+    version: 2.11.1
+    condition: flux2.enabled
 type: application
diff --git a/charts/console/charts/controller-0.0.20.tgz b/charts/console/charts/controller-0.0.20.tgz
diff --git a/charts/console/charts/flux2-2.11.1.tgz b/charts/console/charts/flux2-2.11.1.tgz
diff --git a/charts/console/charts/kas-0.0.5.tgz b/charts/console/charts/kas-0.0.5.tgz
diff --git a/charts/console/values.yaml b/charts/console/values.yaml
@@ -221,3 +221,20 @@ dashboard:
     #  namespaced: true
 
 provider: custom
+
+flux2:
+  enabled: false
+  helmController:
+    create: false
+  imageAutomationController:
+    create: false
+  imageReflectionController:
+    create: false
+  kustomizeController:
+    create: false
+  notificationController:
+    create: false
+  sourceController:
+    create: true
+  policies:
+    create: false
diff --git a/templates/values.yaml.liquid b/templates/values.yaml.liquid
@@ -40,6 +40,9 @@ extraSecretEnv:
   POSTGRES_URL: {{ configuration.postgresUrl }}
   CONSOLE_BYOK: 'true'
 
+flux2:
+  enabled: true
+
 kas:
   enabled: true
   consoleUrl: {{ configuration.consoleDns }}