Merge pull request #107 from blazarecki/add-substituteFrom

stefanprodan · web-flow · commit d192b2022ee9 · 2025-03-21T17:49:36.000+02:00
Add support for `substituteFrom` to flux-oci-sync and flux-git-sync modules
diff --git a/modules/flux-git-sync/README.md b/modules/flux-git-sync/README.md
@@ -38,6 +38,7 @@ timoni -n flux-system delete my-repo-sync
 | `sync: serviceAccountName:` | `string`              | `""`              | Service account to impersonate                                                                                                             |
 | `sync: targetNamespace:`    | `string`              | `""`              | Target namespace                                                                                                                           |
 | `substitute:`               | `{[ string]: string}` | `{}`              | Configure [post build variable substitution](https://fluxcd.io/flux/components/kustomize/kustomizations/#post-build-variable-substitution) |
+| `substituteFrom:`           | `[...{kind: string, name: string, optional: bool}]` | `[]` | List of ConfigMaps and Secrets to use for variable substitution                                                                             |
 | `dependsOn:`                | `[...{name: string}]` | `{}`              | List of dependencies                                                                                                                       |
 | `metadata: labels:`         | `{[ string]: string}` | `{}`              | Custom labels                                                                                                                              |
 | `metadata: annotations:`    | `{[ string]: string}` | `{}`              | Custom annotations                                                                                                                         |
diff --git a/modules/flux-git-sync/templates/config.cue b/modules/flux-git-sync/templates/config.cue
@@ -36,6 +36,11 @@ import (
 	}
 
 	substitute?: [string]: string
+	substituteFrom?: [...{
+		kind:      "Secret" | "ConfigMap"
+		name:      string
+		optional?: bool
+	}]
 
 	dependsOn?: [...{
 		name:       string
diff --git a/modules/flux-git-sync/templates/kustomization.cue b/modules/flux-git-sync/templates/kustomization.cue
@@ -30,6 +30,10 @@ import (
 			postBuild: substitute: #config.substitute
 		}
 
+		if #config.substituteFrom != _|_ {
+			postBuild: substituteFrom: #config.substituteFrom
+		}
+
 		if #config.dependsOn != _|_ {
 			dependsOn: #config.dependsOn
 		}
diff --git a/modules/flux-oci-sync/README.md b/modules/flux-oci-sync/README.md
@@ -42,6 +42,7 @@ timoni -n flux-system delete my-repo-sync
 | `sync: serviceAccountName:`    | `string`              | `""`        | Service account to impersonate                                                                                                             |
 | `sync: targetNamespace:`       | `string`              | `""`        | Target namespace                                                                                                                           |
 | `substitute:`                  | `{[ string]: string}` | `{}`        | Configure [post build variable substitution](https://fluxcd.io/flux/components/kustomize/kustomizations/#post-build-variable-substitution) |
+| `substituteFrom:`              | `[...{kind: string, name: string, optional: bool}]` | `[]`        | List of ConfigMaps and Secrets to use for variable substitution                                                                             |
 | `dependsOn:`                   | `[...{name: string}]` | `{}`        | List of dependencies                                                                                                                       |
 | `metadata: labels:`            | `{[ string]: string}` | `{}`        | Custom labels                                                                                                                              |
 | `metadata: annotations:`       | `{[ string]: string}` | `{}`        | Custom annotations                                                                                                                         |
diff --git a/modules/flux-oci-sync/templates/config.cue b/modules/flux-oci-sync/templates/config.cue
@@ -54,6 +54,11 @@ import (
 	}
 
 	substitute?: [string]: string
+	substituteFrom?: [...{
+		kind:      "Secret" | "ConfigMap"
+		name:      string
+		optional?: bool
+	}]
 
 	dependsOn?: [...{
 		name:       string
diff --git a/modules/flux-oci-sync/templates/kustomization.cue b/modules/flux-oci-sync/templates/kustomization.cue
@@ -28,6 +28,9 @@ import (
 		if #config.substitute != _|_ {
 			postBuild: substitute: #config.substitute
 		}
+		if #config.substituteFrom != _|_ {
+			postBuild: substituteFrom: #config.substituteFrom
+		}
 		if #config.dependsOn != _|_ {
 			dependsOn: #config.dependsOn
 		}

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,10 @@ import (`
`30`	`30`	`postBuild: substitute: #config.substitute`
`31`	`31`	`}`
`32`	`32`
	`33`	`+ if #config.substituteFrom != _\|_ {`
	`34`	`+ postBuild: substituteFrom: #config.substituteFrom`
	`35`	`+ }`
	`36`	`+`
`33`	`37`	`if #config.dependsOn != _\|_ {`
`34`	`38`	`dependsOn: #config.dependsOn`
`35`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,9 @@ import (`
`28`	`28`	`if #config.substitute != _\|_ {`
`29`	`29`	`postBuild: substitute: #config.substitute`
`30`	`30`	`}`
	`31`	`+ if #config.substituteFrom != _\|_ {`
	`32`	`+ postBuild: substituteFrom: #config.substituteFrom`
	`33`	`+ }`
`31`	`34`	`if #config.dependsOn != _\|_ {`
`32`	`35`	`dependsOn: #config.dependsOn`
`33`	`36`	`}`