chore: expose klusterlet values in fleetconfig chart (#42)

* chore: expose klusterlet values in fleetconfig chart

Signed-off-by: Artur Shad Nik <[email protected]>

* fix: check for nil value

Signed-off-by: Artur Shad Nik <[email protected]>

---------

Signed-off-by: Artur Shad Nik <[email protected]>

Author: arturshadnik

fleetconfig-controller/build/Dockerfile.devspace

@@ -16,7 +16,8 @@ RUN apk add --no-cache bash curl python3 py3-pip
 RUN go install github.com/go-delve/delve/cmd/dlv@latest
 
 # Install clusteradm
-RUN curl -L https://raw.githubusercontent.com/open-cluster-management-io/clusteradm/main/install.sh | bash
+ARG CLUSTERADM_VERSION=1.0.1
+RUN curl -L https://raw.githubusercontent.com/open-cluster-management-io/clusteradm/main/install.sh | bash -s -- ${CLUSTERADM_VERSION}
 
 # Install aws-iam-authenticator if building for EKS
 ARG AWSIAMAUTH_VERSION=0.7.2

fleetconfig-controller/charts/fleetconfig-controller/README.md

@@ -100,6 +100,7 @@ Refer to the [Multicluster Controlplane configuration](https://github.com/open-c
 | `fleetConfig.spokes[0].klusterlet.forceInternalEndpointLookupManaged` | If true, the klusterlet accesses the managed cluster using the internal endpoint from the public cluster-info in the managed cluster instead of using managedClusterKubeconfig.                                                                                                                                                                                        | `false`                           |
 | `fleetConfig.spokes[0].klusterlet.resources`                          | Resource specifications for all klusterlet-managed containers.                                                                                                                                                                                                                                                                                                         | `{}`                              |
 | `fleetConfig.spokes[0].klusterlet.singleton`                          | If true, deploy klusterlet in singleton mode, with registration and work agents running in a single pod. This is an alpha stage flag.                                                                                                                                                                                                                                  | `false`                           |
+| `fleetConfig.spokes[0].klusterlet.values`                             | Values to pass to the klusterlet Helm chart.                                                                                                                                                                                                                                                                                                                           | `{}`                              |
 
 ### Topology Resources
 
@@ -115,7 +116,7 @@ Refer to the [Multicluster Controlplane configuration](https://github.com/open-c
 | `replicas`                                          | fleetconfig-controller replica count                                                                                                   | `1`                                                      |
 | `imageRegistry`                                     | Image registry                                                                                                                         | `""`                                                     |
 | `image.repository`                                  | Image repository                                                                                                                       | `quay.io/open-cluster-management/fleetconfig-controller` |
-| `image.tag`                                         | Image tag                                                                                                                              | `v0.0.9`                                                 |
+| `image.tag`                                         | Image tag                                                                                                                              | `v0.0.10`                                                |
 | `image.pullPolicy`                                  | Image pull policy                                                                                                                      | `IfNotPresent`                                           |
 | `imagePullSecrets`                                  | Image pull secrets                                                                                                                     | `[]`                                                     |
 | `serviceAccount.annotations`                        | Annotations to add to the service account                                                                                              | `{}`                                                     |

fleetconfig-controller/charts/fleetconfig-controller/templates/fleetconfig.yaml

@@ -71,6 +71,9 @@ spec:
         source:
           bundleVersion: {{ $.Values.fleetConfig.source.bundleVersion }}
           registry: {{ $.Values.fleetConfig.source.registry }}
+        {{- if .klusterlet.values }}
+        values: {{- toYaml .klusterlet.values | nindent 10 }}
+        {{- end }}
       addOns: {{- toYaml .addOns | nindent 8 }}
     {{- end }}
   addOnConfigs: {{- toYaml .Values.fleetConfig.addOnConfigs | nindent 4 }}

fleetconfig-controller/charts/fleetconfig-controller/values.yaml

@@ -231,6 +231,8 @@ fleetConfig:
         # # Options: [ Default | BestEffort | ResourceRequirement ].
         # qosClass: "Default"
       singleton: false
+      ## @param fleetConfig.spokes[0].klusterlet.values Values to pass to the klusterlet Helm chart.
+      values: {}
     # Add-on configuration for the spoke cluster.
     # ## @param fleetConfig.spokes[0].addOns[0].configName Name of the add-on to enable. Must match one of the configured add-on names in fleetConfig.addOnConfigs.
     # ## @param fleetConfig.spokes[0].addOns[0].installNamespace Namespace to install the add-on.
@@ -277,7 +279,7 @@ imageRegistry: ""
 ## @param image.pullPolicy Image pull policy
 image:
   repository: quay.io/open-cluster-management/fleetconfig-controller
-  tag: v0.0.9
+  tag: v0.0.10
   pullPolicy: IfNotPresent
 
 ## @param imagePullSecrets Image pull secrets