Set unique placeholder values for each substitution #801
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- tests/testdata/cluster/clusters/prod Kustomization: flux-system/flux-system Kustomization: flux-system/apps
+++ tests/testdata/cluster/clusters/prod Kustomization: flux-system/flux-system Kustomization: flux-system/apps
@@ -15,12 +15,14 @@
postBuild:
substitute:
cluster_env: production
substituteFrom:
- kind: ConfigMap
name: cluster-config
+ - kind: Secret
+ name: cluster-secrets
prune: true
sourceRef:
kind: GitRepository
name: flux-system
timeout: 5m0s
wait: true
--- tests/testdata/cluster/apps/prod Kustomization: flux-system/apps Certificate: flux-system/-.PLACEHOLDER_SECRET_DOMAIN3..-staging
+++ tests/testdata/cluster/apps/prod Kustomization: flux-system/apps Certificate: flux-system/-.PLACEHOLDER_SECRET_DOMAIN3..-staging
@@ -0,0 +1,18 @@
+---
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+ labels:
+ kustomize.toolkit.fluxcd.io/name: apps
+ kustomize.toolkit.fluxcd.io/namespace: flux-system
+ name: -.PLACEHOLDER_SECRET_DOMAIN3..-staging
+spec:
+ commonName: ..PLACEHOLDER_SECRET_DOMAIN3..
+ dnsNames:
+ - ..PLACEHOLDER_SECRET_DOMAIN3..
+ - '*...PLACEHOLDER_SECRET_DOMAIN3..'
+ issuerRef:
+ kind: ClusterIssuer
+ name: letsencrypt-staging
+ secretName: -.PLACEHOLDER_SECRET_DOMAIN3..-staging-tls
+
--- tests/testdata/cluster/apps/prod Kustomization: flux-system/apps Certificate: flux-system/-.PLACEHOLDER_SECRET_DOMAIN4..-staging
+++ tests/testdata/cluster/apps/prod Kustomization: flux-system/apps Certificate: flux-system/-.PLACEHOLDER_SECRET_DOMAIN4..-staging
@@ -0,0 +1,18 @@
+---
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+ labels:
+ kustomize.toolkit.fluxcd.io/name: apps
+ kustomize.toolkit.fluxcd.io/namespace: flux-system
+ name: -.PLACEHOLDER_SECRET_DOMAIN4..-staging
+spec:
+ commonName: ..PLACEHOLDER_SECRET_DOMAIN4..
+ dnsNames:
+ - ..PLACEHOLDER_SECRET_DOMAIN4..
+ - '*...PLACEHOLDER_SECRET_DOMAIN4..'
+ issuerRef:
+ kind: ClusterIssuer
+ name: letsencrypt-staging
+ secretName: -.PLACEHOLDER_SECRET_DOMAIN4..-staging-tls
+ |
--- tests/testdata/cluster/clusters/prod Kustomization: flux-system/flux-system Kustomization: flux-system/apps
+++ tests/testdata/cluster/clusters/prod Kustomization: flux-system/flux-system Kustomization: flux-system/apps
@@ -15,12 +15,14 @@
postBuild:
substitute:
cluster_env: production
substituteFrom:
- kind: ConfigMap
name: cluster-config
+ - kind: Secret
+ name: cluster-secrets
prune: true
sourceRef:
kind: GitRepository
name: flux-system
timeout: 5m0s
wait: true
--- tests/testdata/cluster/apps/prod Kustomization: flux-system/apps Certificate: flux-system/-.PLACEHOLDER_SECRET_DOMAIN3..-staging
+++ tests/testdata/cluster/apps/prod Kustomization: flux-system/apps Certificate: flux-system/-.PLACEHOLDER_SECRET_DOMAIN3..-staging
@@ -0,0 +1,18 @@
+---
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+ labels:
+ kustomize.toolkit.fluxcd.io/name: apps
+ kustomize.toolkit.fluxcd.io/namespace: flux-system
+ name: -.PLACEHOLDER_SECRET_DOMAIN3..-staging
+spec:
+ commonName: ..PLACEHOLDER_SECRET_DOMAIN3..
+ dnsNames:
+ - ..PLACEHOLDER_SECRET_DOMAIN3..
+ - '*...PLACEHOLDER_SECRET_DOMAIN3..'
+ issuerRef:
+ kind: ClusterIssuer
+ name: letsencrypt-staging
+ secretName: -.PLACEHOLDER_SECRET_DOMAIN3..-staging-tls
+
--- tests/testdata/cluster/apps/prod Kustomization: flux-system/apps Certificate: flux-system/-.PLACEHOLDER_SECRET_DOMAIN4..-staging
+++ tests/testdata/cluster/apps/prod Kustomization: flux-system/apps Certificate: flux-system/-.PLACEHOLDER_SECRET_DOMAIN4..-staging
@@ -0,0 +1,18 @@
+---
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+ labels:
+ kustomize.toolkit.fluxcd.io/name: apps
+ kustomize.toolkit.fluxcd.io/namespace: flux-system
+ name: -.PLACEHOLDER_SECRET_DOMAIN4..-staging
+spec:
+ commonName: ..PLACEHOLDER_SECRET_DOMAIN4..
+ dnsNames:
+ - ..PLACEHOLDER_SECRET_DOMAIN4..
+ - '*...PLACEHOLDER_SECRET_DOMAIN4..'
+ issuerRef:
+ kind: ClusterIssuer
+ name: letsencrypt-staging
+ secretName: -.PLACEHOLDER_SECRET_DOMAIN4..-staging-tls
+ |
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #801 +/- ##
==========================================
- Coverage 93.40% 93.39% -0.01%
==========================================
Files 20 20
Lines 2288 2287 -1
==========================================
- Hits 2137 2136 -1
Misses 151 151 ☔ View full report in Codecov by Sentry. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix an issue where substitution values (that are from secrets or can't be found) were not unique which may result in resource names that are set with the same value. This may mask bugs if users do not set resource values to the same thing when using secrets.
Fixes #754