🐛 fix: add missing replicas field to the Deployment generated by the …

…Helm plugin
monteiro-renato · Nov 21, 2024 · db6764d · db6764d
1 parent e07823e
commit db6764d
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 6 deletions.
diff --git a/...ins/optional/helm/v1alpha/scaffolds/internal/templates/chart-templates/manager/manager.go b/...ins/optional/helm/v1alpha/scaffolds/internal/templates/chart-templates/manager/manager.go
@@ -63,6 +63,7 @@ metadata:
     {{ "{{- include \"chart.labels\" . | nindent 4 }}" }}
     control-plane: controller-manager
 spec:
+  replicas:  {{ "{{ .Values.controllerManager.replicas }}" }}
   selector:
     matchLabels:
       {{ "{{- include \"chart.selectorLabels\" . | nindent 6 }}" }}

diff --git a/pkg/plugins/optional/helm/v1alpha/scaffolds/internal/templates/values.go b/pkg/plugins/optional/helm/v1alpha/scaffolds/internal/templates/values.go
@@ -57,11 +57,11 @@ func (f *HelmValues) SetTemplateDefaults() error {
 
 const helmValuesTemplate = `# [MANAGER]: Manager Deployment Configurations
 controllerManager:
+  replicas: 1
   container:
     image:
       repository: controller
-      tag: latest
-    replicas: 1
+      tag: latest  
     args:
       - "--leader-elect"
       - "--metrics-bind-address=:8443"

diff --git a/testdata/project-v4-multigroup/go.mod b/testdata/project-v4-multigroup/go.mod
@@ -3,7 +3,7 @@ module sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup
 go 1.22.0
 
 require (
-	github.com/cert-manager/cert-manager v1.16.1
+	github.com/cert-manager/cert-manager v1.16.2
 	github.com/onsi/ginkgo/v2 v2.19.0
 	github.com/onsi/gomega v1.33.1
 	k8s.io/api v0.31.1

diff --git a/testdata/project-v4-with-plugins/dist/chart/templates/manager/manager.yaml b/testdata/project-v4-with-plugins/dist/chart/templates/manager/manager.yaml
@@ -7,6 +7,7 @@ metadata:
     {{- include "chart.labels" . | nindent 4 }}
     control-plane: controller-manager
 spec:
+  replicas:  {{ .Values.controllerManager.replicas }}
   selector:
     matchLabels:
       {{- include "chart.selectorLabels" . | nindent 6 }}

diff --git a/testdata/project-v4-with-plugins/dist/chart/values.yaml b/testdata/project-v4-with-plugins/dist/chart/values.yaml
@@ -1,10 +1,10 @@
 # [MANAGER]: Manager Deployment Configurations
 controllerManager:
+  replicas: 1
   container:
     image:
       repository: controller
-      tag: latest
-    replicas: 1
+      tag: latest  
     args:
       - "--leader-elect"
       - "--metrics-bind-address=:8443"

diff --git a/testdata/project-v4/go.mod b/testdata/project-v4/go.mod
@@ -3,7 +3,7 @@ module sigs.k8s.io/kubebuilder/testdata/project-v4
 go 1.22.0
 
 require (
-	github.com/cert-manager/cert-manager v1.16.1
+	github.com/cert-manager/cert-manager v1.16.2
 	github.com/onsi/ginkgo/v2 v2.19.0
 	github.com/onsi/gomega v1.33.1
 	k8s.io/api v0.31.1