Pass fluxcd config from values

Signed-off-by: Tamal Saha <[email protected]>
kluster-manager · Jun 12, 2024 · 5e2d9f5 · 5e2d9f5
1 parent f79a3d7
commit 5e2d9f5
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 35 deletions.
diff --git a/charts/fluxcd-manager/README.md b/charts/fluxcd-manager/README.md
@@ -45,24 +45,31 @@ The command removes all the Kubernetes components associated with the chart and
 
 The following table lists the configurable parameters of the `fluxcd-manager` chart and their default values.
 
-|                   Parameter                   | Description |                      Default                       |
-|-----------------------------------------------|-------------|----------------------------------------------------|
-| nameOverride                                  |             | <code>""</code>                                    |
-| fullnameOverride                              |             | <code>""</code>                                    |
-| image                                         |             | <code>ghcr.io/kluster-manager/fluxcd-addon</code>  |
-| tag                                           |             | <code></code>                                      |
-| kubeconfigSecretName                          |             | <code>""</code>                                    |
-| addonManagerNamespace                         |             | <code>open-cluster-management-fluxcd</code>        |
-| placement.create                              |             | <code>true</code>                                  |
-| placement.name                                |             | <code>global</code>                                |
-| kubectl.image                                 |             | <code>ghcr.io/appscode/kubectl-nonroot:1.25</code> |
-| fluxcdConfig.installCRDs                      |             | <code>true</code>                                  |
-| fluxcdConfig.helmController.create            |             | <code>true</code>                                  |
-| fluxcdConfig.sourceController.create          |             | <code>true</code>                                  |
-| fluxcdConfig.imageReflectionController.create |             | <code>false</code>                                 |
-| fluxcdConfig.imageAutomationController.create |             | <code>false</code>                                 |
-| fluxcdConfig.kustomizeController.create       |             | <code>false</code>                                 |
-| fluxcdConfig.notificationController.create    |             | <code>false</code>                                 |
+|                   Parameter                   | Description |                         Default                         |
+|-----------------------------------------------|-------------|---------------------------------------------------------|
+| nameOverride                                  |             | <code>""</code>                                         |
+| fullnameOverride                              |             | <code>""</code>                                         |
+| image                                         |             | <code>ghcr.io/kluster-manager/fluxcd-addon</code>       |
+| tag                                           |             | <code></code>                                           |
+| kubeconfigSecretName                          |             | <code>""</code>                                         |
+| addonManagerNamespace                         |             | <code>open-cluster-management-fluxcd</code>             |
+| placement.create                              |             | <code>true</code>                                       |
+| placement.name                                |             | <code>global</code>                                     |
+| kubectl.image                                 |             | <code>ghcr.io/appscode/kubectl-nonroot:1.25</code>      |
+| fluxcdConfig.installCRDs                      |             | <code>true</code>                                       |
+| fluxcdConfig.cli.image                        |             | <code>ghcr.io/appscode/flux-cli</code>                  |
+| fluxcdConfig.helmController.create            |             | <code>true</code>                                       |
+| fluxcdConfig.helmController.image             |             | <code>ghcr.io/fluxcd/helm-controller</code>             |
+| fluxcdConfig.imageAutomationController.create |             | <code>false</code>                                      |
+| fluxcdConfig.imageAutomationController.image  |             | <code>ghcr.io/fluxcd/image-automation-controller</code> |
+| fluxcdConfig.imageReflectionController.create |             | <code>false</code>                                      |
+| fluxcdConfig.imageReflectionController.image  |             | <code>ghcr.io/fluxcd/image-reflector-controller</code>  |
+| fluxcdConfig.kustomizeController.create       |             | <code>false</code>                                      |
+| fluxcdConfig.kustomizeController.image        |             | <code>ghcr.io/fluxcd/kustomize-controller</code>        |
+| fluxcdConfig.notificationController.create    |             | <code>false</code>                                      |
+| fluxcdConfig.notificationController.image     |             | <code>ghcr.io/fluxcd/notification-controller</code>     |
+| fluxcdConfig.sourceController.create          |             | <code>true</code>                                       |
+| fluxcdConfig.sourceController.image           |             | <code>ghcr.io/fluxcd/source-controller</code>           |
 
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm upgrade -i`. For example:

diff --git a/charts/fluxcd-manager/common/addon/fluxcd_config.yaml b/charts/fluxcd-manager/common/addon/fluxcd_config.yaml
@@ -10,16 +10,4 @@ metadata:
   name: fluxcd-config
   namespace: {{ include "fluxcd-manager.namespace" . }}
 spec:
-  installCRDs: true
-  helmController:
-    create: true
-  sourceController:
-    create: true
-  imageReflectionController:
-    create: false
-  imageAutomationController:
-    create: false
-  kustomizeController:
-    create: false
-  notificationController:
-    create: false
+  {{- toYaml .Values.fluxcdConfig | nindent 2 }}
diff --git a/charts/fluxcd-manager/values.yaml b/charts/fluxcd-manager/values.yaml
@@ -16,15 +16,23 @@ kubectl:
 
 fluxcdConfig:
   installCRDs: true
+  cli:
+    image: ghcr.io/appscode/flux-cli
   helmController:
     create: true
-  sourceController:
-    create: true
-  imageReflectionController:
-    create: false
+    image: ghcr.io/fluxcd/helm-controller
   imageAutomationController:
     create: false
+    image: ghcr.io/fluxcd/image-automation-controller
+  imageReflectionController:
+    create: false
+    image: ghcr.io/fluxcd/image-reflector-controller
   kustomizeController:
     create: false
+    image: ghcr.io/fluxcd/kustomize-controller
   notificationController:
     create: false
+    image: ghcr.io/fluxcd/notification-controller
+  sourceController:
+    create: true
+    image: ghcr.io/fluxcd/source-controller