Merge pull request #51 from stefanprodan/env-options

Allow configuring the env of controller containers
stefanprodan · Nov 22, 2023 · aedf966 · aedf966
2 parents ec1484c + 30cc7a2
commit aedf966
Show file tree

Hide file tree

Showing 9 changed files with 47 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -73,6 +73,17 @@ bundle: {
 }
 ```
 
+For clusters without `kube-proxy`, you'll have to set following env vars:
+
+```cue
+values: {
+	env: {
+		"KUBERNETES_SERVICE_HOST": "<host>"
+		"KUBERNETES_SERVICE_PORT": "<port>"
+	}
+}
+```
+
 Apply the bundle with:
 
 ```shell

diff --git a/modules/flux-aio/README.md b/modules/flux-aio/README.md
@@ -75,8 +75,9 @@ flux -n flux-system uninstall
 | `persistence: size:`         | `string`                           | `8Gi`                         | The persistent volume size                                                                                                                                                               |
 | `tmpfs: enabled:`            | `bool`                             | `false`                       | Enable RAM-backed filesystem for the Flux [emptyDir volume](https://kubernetes.io/docs/concepts/storage/volumes/#emptydir) to speed up the git pull and kustomize build operations       |
 | `tmpfs: sizeLimit:`          | `string`                           | `null`                        | The tmpfs memory limit e.g. `500Mi` or `1Gi`                                                                                                                                             |
-| `proxy: http:`               | `string`                           | `""`                          | HTTP Proxy URL                                                                                                                                                                           |
-| `proxy: https:`              | `string`                           | `""`                          | HTTPS Proxy URL                                                                                                                                                                          |
+| `proxy: http:`               | `string`                           | `null`                        | HTTP Proxy URL                                                                                                                                                                           |
+| `proxy: https:`              | `string`                           | `null`                        | HTTPS Proxy URL                                                                                                                                                                          |
+| `env:`                       | `[string]: string`                 | `null`                        | Environment key values pairs for setting the `env` on all controller containers                                                                                                          |
 | `logLevel:`                  | `string`                           | `info`                        | Flux log level can be `debug`, `info`, `error`                                                                                                                                           |
 | `resources:`                 | `corev1.#ResourceRequirements`     | `limits: memory: "1Gi"`       | [Kubernetes resource requests and limits](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers) common to all containers, can be overridden by controller basis |
 | `tolerations:`               | `[ ...corev1.#Toleration]`         | `[{operator: "Exists"}]`      | [Kubernetes toleration](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration)                                                                                    |

diff --git a/modules/flux-aio/debug_values.cue b/modules/flux-aio/debug_values.cue
@@ -59,4 +59,9 @@ values: {
 		sourceServer:       true
 	}
 	persistence: enabled: true
+	proxy: http: "http://my.proxy"
+	env: {
+		"TEST_KEY1": "VAL1"
+		"TEST_KEY2": "VAL2"
+	}
 }
diff --git a/modules/flux-aio/templates/config.cue b/modules/flux-aio/templates/config.cue
@@ -67,6 +67,8 @@ import (
 		no:     *".cluster.local.,.cluster.local,.svc" | string
 	}
 
+	env?: [string]: string
+
 	securityProfile: "restricted" | "privileged"
 
 	logLevel: *"info" | string
@@ -133,18 +135,19 @@ import (
 
 // Instance takes the config values and outputs the Kubernetes objects.
 #Instance: {
-	config: #Config
+	config:       #Config
+	containerEnv: #ContainerEnv & {_config: config}
 
 	containers: [
-		#SourceController & {_config: config},
+		#SourceController & {_config: config, _env: containerEnv},
 		if config.controllers.kustomize.enabled {
-			#KustomizeController & {_config: config}
+			#KustomizeController & {_config: config, _env: containerEnv}
 		},
 		if config.controllers.helm.enabled {
-			#HelmController & {_config: config}
+			#HelmController & {_config: config, _env: containerEnv}
 		},
 		if config.controllers.notification.enabled {
-			#NotificationController & {_config: config}
+			#NotificationController & {_config: config, _env: containerEnv}
 		},
 	]
 

diff --git a/modules/flux-aio/templates/env.cue b/modules/flux-aio/templates/env.cue
@@ -2,7 +2,7 @@ package templates
 
 #ContainerEnv: {
 	_config: #Config
-	env: [
+	defaultEnv: [
 		{
 			name:  "SOURCE_CONTROLLER_LOCALHOST"
 			value: "localhost:9790"
@@ -30,4 +30,11 @@ package templates
 				value: _config.proxy.http
 			}},
 	]
+
+	extraEnv: [...]
+	if _config.env != _|_ {
+		extraEnv: [ for k , v in _config.env {name: k, value: v}]
+	}
+
+	env: defaultEnv + extraEnv
 }
diff --git a/modules/flux-aio/templates/helm-controller.cue b/modules/flux-aio/templates/helm-controller.cue
@@ -5,14 +5,14 @@ import (
 )
 
 #HelmController: corev1.#Container & {
-	_config:       #Config
-	_containerEnv: #ContainerEnv & {_config: _config}
+	_config: #Config
+	_env:    #ContainerEnv
 
 	name:            "helm-controller"
 	image:           _config.controllers.helm.image.reference
 	imagePullPolicy: "IfNotPresent"
 	securityContext: _config.securityContext
-	env:             _containerEnv.env
+	env:             _env.env
 	ports: [{
 		containerPort: 9795
 		name:          "http-prom-hc"

diff --git a/modules/flux-aio/templates/kustomize-controller.cue b/modules/flux-aio/templates/kustomize-controller.cue
@@ -5,14 +5,14 @@ import (
 )
 
 #KustomizeController: corev1.#Container & {
-	_config:       #Config
-	_containerEnv: #ContainerEnv & {_config: _config}
+	_config: #Config
+	_env:    #ContainerEnv
 
 	name:            "kustomize-controller"
 	image:           _config.controllers.kustomize.image.reference
 	imagePullPolicy: "IfNotPresent"
 	securityContext: _config.securityContext
-	env:             _containerEnv.env
+	env:             _env.env
 	ports: [{
 		containerPort: 9793
 		name:          "http-prom-kc"

diff --git a/modules/flux-aio/templates/notification-controller.cue b/modules/flux-aio/templates/notification-controller.cue
@@ -5,14 +5,14 @@ import (
 )
 
 #NotificationController: corev1.#Container & {
-	_config:       #Config
-	_containerEnv: #ContainerEnv & {_config: _config}
+	_config: #Config
+	_env:    #ContainerEnv
 
 	name:            "notification-controller"
 	image:           _config.controllers.notification.image.reference
 	imagePullPolicy: "IfNotPresent"
 	securityContext: _config.securityContext
-	env:             _containerEnv.env
+	env:             _env.env
 	ports: [{
 		containerPort: 9690
 		name:          "http-nc"

diff --git a/modules/flux-aio/templates/source-controller.cue b/modules/flux-aio/templates/source-controller.cue
@@ -5,14 +5,14 @@ import (
 )
 
 #SourceController: corev1.#Container & {
-	_config:       #Config
-	_containerEnv: #ContainerEnv & {_config: _config}
+	_config: #Config
+	_env:    #ContainerEnv
 
 	name:            "source-controller"
 	image:           _config.controllers.source.image.reference
 	imagePullPolicy: "IfNotPresent"
 	securityContext: _config.securityContext
-	env:             _containerEnv.env
+	env:             _env.env
 
 	ports: [{
 		containerPort: 9790