Skip to content

Commit a8c663c

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #5174 from camilamacedo86/helm-v2-name-manager-spec
🐛 (helm/v2alpha) Use manager instead of controllerManager to expose manager values
2 parents 93dd3cb + eea0224 commit a8c663c

File tree

12 files changed

+65
-66
lines changed

12 files changed

+65
-66
lines changed

‎docs/book/src/cronjob-tutorial/testdata/project/dist/chart/templates/manager/manager.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ spec:
3030
- --metrics-bind-address=0
3131
{{- end }}
3232
- --health-probe-bind-address=:8081
33-
{{- range .Values.controllerManager.args }}
33+
{{- range .Values.manager.args }}
3434
- {{ . }}
3535
{{- end }}
3636
{{- if and .Values.certManager.enable .Values.metrics.enable }}
@@ -41,8 +41,8 @@ spec:
4141
{{- end }}
4242
command:
4343
- /manager
44-
image: "{{ .Values.controllerManager.image.repository }}:{{ .Values.controllerManager.image.tag }}"
45-
imagePullPolicy: {{ .Values.controllerManager.image.pullPolicy }}
44+
image: "{{ .Values.manager.image.repository }}:{{ .Values.manager.image.tag }}"
45+
imagePullPolicy: {{ .Values.manager.image.pullPolicy }}
4646
livenessProbe:
4747
httpGet:
4848
path: /healthz
@@ -61,14 +61,14 @@ spec:
6161
initialDelaySeconds: 5
6262
periodSeconds: 10
6363
resources:
64-
{{- if .Values.controllerManager.resources }}
65-
{{- toYaml .Values.controllerManager.resources | nindent 20 }}
64+
{{- if .Values.manager.resources }}
65+
{{- toYaml .Values.manager.resources | nindent 20 }}
6666
{{- else }}
6767
{}
6868
{{- end }}
6969
securityContext:
70-
{{- if .Values.controllerManager.securityContext }}
71-
{{- toYaml .Values.controllerManager.securityContext | nindent 20 }}
70+
{{- if .Values.manager.securityContext }}
71+
{{- toYaml .Values.manager.securityContext | nindent 20 }}
7272
{{- else }}
7373
{}
7474
{{- end }}
@@ -84,8 +84,8 @@ spec:
8484
readOnly: true
8585
{{- end }}
8686
securityContext:
87-
{{- if .Values.controllerManager.podSecurityContext }}
88-
{{- toYaml .Values.controllerManager.podSecurityContext | nindent 14 }}
87+
{{- if .Values.manager.podSecurityContext }}
88+
{{- toYaml .Values.manager.podSecurityContext | nindent 14 }}
8989
{{- else }}
9090
{}
9191
{{- end }}

‎docs/book/src/cronjob-tutorial/testdata/project/dist/chart/values.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Configure the controller manager deployment
2-
controllerManager:
2+
manager:
33
replicas: 1
44

55
image:

‎docs/book/src/getting-started/testdata/project/dist/chart/templates/manager/manager.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ spec:
3030
- --metrics-bind-address=0
3131
{{- end }}
3232
- --health-probe-bind-address=:8081
33-
{{- range .Values.controllerManager.args }}
33+
{{- range .Values.manager.args }}
3434
- {{ . }}
3535
{{- end }}
3636
command:
3737
- /manager
38-
image: "{{ .Values.controllerManager.image.repository }}:{{ .Values.controllerManager.image.tag }}"
39-
imagePullPolicy: {{ .Values.controllerManager.image.pullPolicy }}
38+
image: "{{ .Values.manager.image.repository }}:{{ .Values.manager.image.tag }}"
39+
imagePullPolicy: {{ .Values.manager.image.pullPolicy }}
4040
livenessProbe:
4141
httpGet:
4242
path: /healthz
@@ -52,21 +52,21 @@ spec:
5252
initialDelaySeconds: 5
5353
periodSeconds: 10
5454
resources:
55-
{{- if .Values.controllerManager.resources }}
56-
{{- toYaml .Values.controllerManager.resources | nindent 20 }}
55+
{{- if .Values.manager.resources }}
56+
{{- toYaml .Values.manager.resources | nindent 20 }}
5757
{{- else }}
5858
{}
5959
{{- end }}
6060
securityContext:
61-
{{- if .Values.controllerManager.securityContext }}
62-
{{- toYaml .Values.controllerManager.securityContext | nindent 20 }}
61+
{{- if .Values.manager.securityContext }}
62+
{{- toYaml .Values.manager.securityContext | nindent 20 }}
6363
{{- else }}
6464
{}
6565
{{- end }}
6666
volumeMounts: []
6767
securityContext:
68-
{{- if .Values.controllerManager.podSecurityContext }}
69-
{{- toYaml .Values.controllerManager.podSecurityContext | nindent 14 }}
68+
{{- if .Values.manager.podSecurityContext }}
69+
{{- toYaml .Values.manager.podSecurityContext | nindent 14 }}
7070
{{- else }}
7171
{}
7272
{{- end }}

‎docs/book/src/getting-started/testdata/project/dist/chart/values.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Configure the controller manager deployment
2-
controllerManager:
2+
manager:
33
replicas: 1
44

55
image:

‎docs/book/src/multiversion-tutorial/testdata/project/dist/chart/templates/manager/manager.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ spec:
3030
- --metrics-bind-address=0
3131
{{- end }}
3232
- --health-probe-bind-address=:8081
33-
{{- range .Values.controllerManager.args }}
33+
{{- range .Values.manager.args }}
3434
- {{ . }}
3535
{{- end }}
3636
{{- if and .Values.certManager.enable .Values.metrics.enable }}
@@ -41,8 +41,8 @@ spec:
4141
{{- end }}
4242
command:
4343
- /manager
44-
image: "{{ .Values.controllerManager.image.repository }}:{{ .Values.controllerManager.image.tag }}"
45-
imagePullPolicy: {{ .Values.controllerManager.image.pullPolicy }}
44+
image: "{{ .Values.manager.image.repository }}:{{ .Values.manager.image.tag }}"
45+
imagePullPolicy: {{ .Values.manager.image.pullPolicy }}
4646
livenessProbe:
4747
httpGet:
4848
path: /healthz
@@ -61,14 +61,14 @@ spec:
6161
initialDelaySeconds: 5
6262
periodSeconds: 10
6363
resources:
64-
{{- if .Values.controllerManager.resources }}
65-
{{- toYaml .Values.controllerManager.resources | nindent 20 }}
64+
{{- if .Values.manager.resources }}
65+
{{- toYaml .Values.manager.resources | nindent 20 }}
6666
{{- else }}
6767
{}
6868
{{- end }}
6969
securityContext:
70-
{{- if .Values.controllerManager.securityContext }}
71-
{{- toYaml .Values.controllerManager.securityContext | nindent 20 }}
70+
{{- if .Values.manager.securityContext }}
71+
{{- toYaml .Values.manager.securityContext | nindent 20 }}
7272
{{- else }}
7373
{}
7474
{{- end }}
@@ -84,8 +84,8 @@ spec:
8484
readOnly: true
8585
{{- end }}
8686
securityContext:
87-
{{- if .Values.controllerManager.podSecurityContext }}
88-
{{- toYaml .Values.controllerManager.podSecurityContext | nindent 14 }}
87+
{{- if .Values.manager.podSecurityContext }}
88+
{{- toYaml .Values.manager.podSecurityContext | nindent 14 }}
8989
{{- else }}
9090
{}
9191
{{- end }}

‎docs/book/src/multiversion-tutorial/testdata/project/dist/chart/values.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Configure the controller manager deployment
2-
controllerManager:
2+
manager:
33
replicas: 1
44

55
image:

‎pkg/plugins/optional/helm/v2alpha/scaffolds/internal/kustomize/helm_templater.go‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ func (t *HelmTemplater) templateEnvironmentVariables(yamlContent string) string
216216
}
217217
}
218218

219-
if i+1 < len(lines) && strings.Contains(lines[i+1], ".Values.controllerManager.env") {
219+
if i+1 < len(lines) && strings.Contains(lines[i+1], ".Values.manager.env") {
220220
return yamlContent
221221
}
222222

@@ -225,8 +225,8 @@ func (t *HelmTemplater) templateEnvironmentVariables(yamlContent string) string
225225

226226
block := []string{
227227
indentStr + "env:",
228-
childIndent + "{{- if .Values.controllerManager.env }}",
229-
childIndent + "{{- toYaml .Values.controllerManager.env | nindent " + childIndentWidth + " }}",
228+
childIndent + "{{- if .Values.manager.env }}",
229+
childIndent + "{{- toYaml .Values.manager.env | nindent " + childIndentWidth + " }}",
230230
childIndent + "{{- else }}",
231231
childIndent + "[]",
232232
childIndent + "{{- end }}",
@@ -273,7 +273,7 @@ func (t *HelmTemplater) templateResources(yamlContent string) string {
273273
}
274274
}
275275

276-
if i+1 < len(lines) && strings.Contains(lines[i+1], ".Values.controllerManager.resources") {
276+
if i+1 < len(lines) && strings.Contains(lines[i+1], ".Values.manager.resources") {
277277
return yamlContent
278278
}
279279

@@ -282,8 +282,8 @@ func (t *HelmTemplater) templateResources(yamlContent string) string {
282282

283283
block := []string{
284284
indentStr + "resources:",
285-
childIndent + "{{- if .Values.controllerManager.resources }}",
286-
childIndent + "{{- toYaml .Values.controllerManager.resources | nindent " + childIndentWidth + " }}",
285+
childIndent + "{{- if .Values.manager.resources }}",
286+
childIndent + "{{- toYaml .Values.manager.resources | nindent " + childIndentWidth + " }}",
287287
childIndent + "{{- else }}",
288288
childIndent + "{}",
289289
childIndent + "{{- end }}",
@@ -352,7 +352,7 @@ func (t *HelmTemplater) templatePodSecurityContext(yamlContent string) string {
352352
continue
353353
}
354354

355-
if i+1 < len(lines) && strings.Contains(lines[i+1], ".Values.controllerManager.podSecurityContext") {
355+
if i+1 < len(lines) && strings.Contains(lines[i+1], ".Values.manager.podSecurityContext") {
356356
return yamlContent
357357
}
358358

@@ -361,8 +361,8 @@ func (t *HelmTemplater) templatePodSecurityContext(yamlContent string) string {
361361

362362
block := []string{
363363
indentStr + "securityContext:",
364-
childIndent + "{{- if .Values.controllerManager.podSecurityContext }}",
365-
childIndent + "{{- toYaml .Values.controllerManager.podSecurityContext | nindent " + childIndentWidth + " }}",
364+
childIndent + "{{- if .Values.manager.podSecurityContext }}",
365+
childIndent + "{{- toYaml .Values.manager.podSecurityContext | nindent " + childIndentWidth + " }}",
366366
childIndent + "{{- else }}",
367367
childIndent + "{}",
368368
childIndent + "{{- end }}",
@@ -415,7 +415,7 @@ func (t *HelmTemplater) templateContainerSecurityContext(yamlContent string) str
415415
lookAheadEnd = len(lines)
416416
}
417417
joined := strings.Join(lines[i:lookAheadEnd], "\n")
418-
if strings.Contains(joined, ".Values.controllerManager.securityContext") {
418+
if strings.Contains(joined, ".Values.manager.securityContext") {
419419
return yamlContent
420420
}
421421

@@ -424,8 +424,8 @@ func (t *HelmTemplater) templateContainerSecurityContext(yamlContent string) str
424424

425425
block := []string{
426426
indentStr + "securityContext:",
427-
childIndent + "{{- if .Values.controllerManager.securityContext }}",
428-
childIndent + "{{- toYaml .Values.controllerManager.securityContext | nindent " + childIndentWidth + " }}",
427+
childIndent + "{{- if .Values.manager.securityContext }}",
428+
childIndent + "{{- toYaml .Values.manager.securityContext | nindent " + childIndentWidth + " }}",
429429
childIndent + "{{- else }}",
430430
childIndent + "{}",
431431
childIndent + "{{- end }}",
@@ -459,7 +459,7 @@ func (t *HelmTemplater) templateControllerManagerArgs(yamlContent string) string
459459
}
460460

461461
match := yamlContent[loc[0]:loc[1]]
462-
if strings.Contains(match, ".Values.controllerManager.args") {
462+
if strings.Contains(match, ".Values.manager.args") {
463463
return yamlContent
464464
}
465465

@@ -531,7 +531,7 @@ func (t *HelmTemplater) templateControllerManagerArgs(yamlContent string) string
531531
}
532532

533533
builder.WriteString(itemIndent)
534-
builder.WriteString("{{- range .Values.controllerManager.args }}\n")
534+
builder.WriteString("{{- range .Values.manager.args }}\n")
535535
builder.WriteString(itemIndent)
536536
builder.WriteString("- {{ . }}\n")
537537
builder.WriteString(itemIndent)
@@ -560,7 +560,7 @@ func (t *HelmTemplater) templateImageReference(yamlContent string) string {
560560
continue
561561
}
562562

563-
if strings.Contains(lines[i], ".Values.controllerManager.image.repository") {
563+
if strings.Contains(lines[i], ".Values.manager.image.repository") {
564564
return yamlContent
565565
}
566566

@@ -597,9 +597,8 @@ func (t *HelmTemplater) templateImageReference(yamlContent string) string {
597597
lines = append(lines[:i+1], append(filtered, lines[end:]...)...)
598598
end = i + 1 + len(filtered)
599599

600-
//nolint:lll
601-
imageLine := indentStr + "image: \"{{ .Values.controllerManager.image.repository }}:{{ .Values.controllerManager.image.tag }}\""
602-
pullPolicyLine := indentStr + "imagePullPolicy: {{ .Values.controllerManager.image.pullPolicy }}"
600+
imageLine := indentStr + "image: \"{{ .Values.manager.image.repository }}:{{ .Values.manager.image.tag }}\""
601+
pullPolicyLine := indentStr + "imagePullPolicy: {{ .Values.manager.image.pullPolicy }}"
603602

604603
remainder := lines[end:]
605604
if len(remainder) > 0 && strings.HasPrefix(strings.TrimSpace(remainder[0]), "imagePullPolicy:") {

‎pkg/plugins/optional/helm/v2alpha/scaffolds/internal/kustomize/helm_templater_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,12 +147,12 @@ spec:
147147
Expect(result).To(ContainSubstring("- --metrics-bind-address=:8443"))
148148
Expect(result).To(ContainSubstring("- --metrics-bind-address=0"))
149149
Expect(result).To(ContainSubstring("- --health-probe-bind-address=:8081"))
150-
Expect(result).To(ContainSubstring("{{- range .Values.controllerManager.args }}"))
150+
Expect(result).To(ContainSubstring("{{- range .Values.manager.args }}"))
151151
Expect(result).NotTo(ContainSubstring("BUSYBOX_IMAGE"))
152152
Expect(result).NotTo(ContainSubstring("MEMCACHED_IMAGE"))
153153
Expect(result).To(ContainSubstring("image: " +
154-
"\"{{ .Values.controllerManager.image.repository }}:{{ .Values.controllerManager.image.tag }}\""))
155-
Expect(result).To(ContainSubstring("imagePullPolicy: {{ .Values.controllerManager.image.pullPolicy }}"))
154+
"\"{{ .Values.manager.image.repository }}:{{ .Values.manager.image.tag }}\""))
155+
Expect(result).To(ContainSubstring("imagePullPolicy: {{ .Values.manager.image.pullPolicy }}"))
156156
Expect(result).NotTo(ContainSubstring("controller:latest"))
157157
})
158158

‎pkg/plugins/optional/helm/v2alpha/scaffolds/internal/templates/values_basic.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ func (f *HelmValuesBasic) generateBasicValues() string {
9090
}
9191

9292
buf.WriteString(fmt.Sprintf(`# Configure the controller manager deployment
93-
controllerManager:
93+
manager:
9494
replicas: 1
9595
9696
image:

‎pkg/plugins/optional/helm/v2alpha/scaffolds/internal/templates/values_basic_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ var _ = Describe("HelmValuesBasic", func() {
4949
It("should include all basic sections", func() {
5050
content := valuesTemplate.GetBody()
5151

52-
Expect(content).To(ContainSubstring("controllerManager:"))
52+
Expect(content).To(ContainSubstring("manager:"))
5353
Expect(content).To(ContainSubstring("args: []"))
5454
Expect(content).To(ContainSubstring("env: []"))
5555
Expect(content).To(ContainSubstring("metrics:"))
@@ -79,7 +79,7 @@ var _ = Describe("HelmValuesBasic", func() {
7979
It("should still include other basic sections", func() {
8080
content := valuesTemplate.GetBody()
8181

82-
Expect(content).To(ContainSubstring("controllerManager:"))
82+
Expect(content).To(ContainSubstring("manager:"))
8383
Expect(content).To(ContainSubstring("args: []"))
8484
Expect(content).To(ContainSubstring("metrics:"))
8585
Expect(content).To(ContainSubstring("prometheus:"))

0 commit comments

Comments
 (0)