Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

✨ (kustomize/v2-alpha): remove unnecessary varReference for setup cert-manager #2794

Merged
merged 1 commit into from
Jul 5, 2022
Merged

✨ (kustomize/v2-alpha): remove unnecessary varReference for setup cert-manager #2794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions ...mon/kustomize/v2-alpha/scaffolds/internal/templates/config/certmanager/kustomizeconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,20 +44,12 @@ func (f *KustomizeConfig) SetTemplateDefaults() error {
}

//nolint:lll
const kustomizeConfigTemplate = `# This configuration is for teaching kustomize how to update name ref and var substitution
const kustomizeConfigTemplate = `# This configuration is for teaching kustomize how to update name ref substitution
nameReference:
- kind: Issuer
group: cert-manager.io
fieldSpecs:
- kind: Certificate
group: cert-manager.io
path: spec/issuerRef/name

camilamacedo86 marked this conversation as resolved.
Show resolved Hide resolved
varReference:
- kind: Certificate
group: cert-manager.io
path: spec/commonName
- kind: Certificate
group: cert-manager.io
path: spec/dnsNames
`
5 changes: 1 addition & 4 deletions .../common/kustomize/v2-alpha/scaffolds/internal/templates/config/webhook/kustomizeconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ func (f *KustomizeConfig) SetTemplateDefaults() error {
}

//nolint:lll
const kustomizeConfigWebhookTemplate = `# the following config is for teaching kustomize where to look at when substituting vars.
const kustomizeConfigWebhookTemplate = `# the following config is for teaching kustomize where to look at when substituting nameReference.
# It requires kustomize v2.1.0 or newer to work properly.
nameReference:
- kind: Service
Expand All @@ -66,7 +66,4 @@ namespace:
group: admissionregistration.k8s.io
path: webhooks/clientConfig/service/namespace
create: true

varReference:
- path: metadata/annotations
`
10 changes: 1 addition & 9 deletions testdata/project-v3-with-kustomize-v2/config/certmanager/kustomizeconfig.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,8 @@
# This configuration is for teaching kustomize how to update name ref and var substitution
# This configuration is for teaching kustomize how to update name ref substitution
nameReference:
- kind: Issuer
group: cert-manager.io
fieldSpecs:
- kind: Certificate
group: cert-manager.io
path: spec/issuerRef/name

varReference:
- kind: Certificate
group: cert-manager.io
path: spec/commonName
- kind: Certificate
group: cert-manager.io
path: spec/dnsNames
5 changes: 1 addition & 4 deletions testdata/project-v3-with-kustomize-v2/config/webhook/kustomizeconfig.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# the following config is for teaching kustomize where to look at when substituting vars.
# the following config is for teaching kustomize where to look at when substituting nameReference.
# It requires kustomize v2.1.0 or newer to work properly.
nameReference:
- kind: Service
Expand All @@ -20,6 +20,3 @@ namespace:
group: admissionregistration.k8s.io
path: webhooks/clientConfig/service/namespace
create: true

varReference:
- path: metadata/annotations