✨ Make webhook and metrics ports configurable in Helm chart template

docs/book/src/cronjob-tutorial/testdata/project/cmd/main.go

@@ -79,6 +79,7 @@ func main() {
 	var metricsAddr string
 	var metricsCertPath, metricsCertName, metricsCertKey string
 	var webhookCertPath, webhookCertName, webhookCertKey string
+	var webhookPort int
 	var enableLeaderElection bool
 	var probeAddr string
 	var secureMetrics bool
@@ -95,6 +96,7 @@ func main() {
 	flag.StringVar(&webhookCertPath, "webhook-cert-path", "", "The directory that contains the webhook certificate.")
 	flag.StringVar(&webhookCertName, "webhook-cert-name", "tls.crt", "The name of the webhook certificate file.")
 	flag.StringVar(&webhookCertKey, "webhook-cert-key", "tls.key", "The name of the webhook key file.")
+	flag.IntVar(&webhookPort, "webhook-port", 9443, "The port that the webhook endpoint binds to.")
 	flag.StringVar(&metricsCertPath, "metrics-cert-path", "",
 		"The directory that contains the metrics server certificate.")
 	flag.StringVar(&metricsCertName, "metrics-cert-name", "tls.crt", "The name of the metrics server certificate file.")
@@ -151,6 +153,7 @@ func main() {
 
 	webhookServer := webhook.NewServer(webhook.Options{
 		TLSOpts: webhookTLSOpts,
+		Port:    webhookPort,
 	})
 
 	// Metrics endpoint is enabled in 'config/default/kustomization.yaml'. The Metrics options configure the server.

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

@@ -47,7 +47,7 @@ spec:
             {{- toYaml .Values.controllerManager.container.readinessProbe | nindent 12 }}
           {{- if .Values.webhook.enable }}
           ports:
-            - containerPort: 9443
+            - containerPort: {{ .Values.webhook.port }}
               name: webhook-server
               protocol: TCP
           {{- end }}

docs/book/src/cronjob-tutorial/testdata/project/dist/chart/templates/metrics/metrics-service.yaml

@@ -9,8 +9,8 @@ metadata:
     control-plane: controller-manager
 spec:
   ports:
-    - port: 8443
-      targetPort: 8443
+    - port: {{ .Values.metrics.port }}
+      targetPort: {{ .Values.metrics.port }}
       protocol: TCP
       name: https
   selector:

docs/book/src/cronjob-tutorial/testdata/project/dist/chart/templates/webhook/service.yaml

@@ -10,7 +10,7 @@ spec:
   ports:
     - port: 443
       protocol: TCP
-      targetPort: 9443
+      targetPort: {{ .Values.webhook.port }}
   selector:
     control-plane: controller-manager
 {{- end }}

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

@@ -7,8 +7,9 @@ controllerManager:
       tag: latest
     args:
       - "--leader-elect"
-      - "--metrics-bind-address=:8443"
+      - "--metrics-bind-address=:{{ .Values.metrics.port }}"
       - "--health-probe-bind-address=:8081"
+      - "--webhook-port={{ .Values.webhook.port }}"
     resources:
       limits:
         cpu: 500m
@@ -62,13 +63,15 @@ crd:
 # ControllerManager argument "--metrics-bind-address=:8443" is removed.
 metrics:
   enable: true
+  port: 8443
 
 # [WEBHOOKS]: Webhooks configuration
 # The following configuration is automatically generated from the manifests
 # generated by controller-gen. To update run 'make manifests' and
 # the edit command with the '--force' flag
 webhook:
   enable: true
+  port: 9443
 
 # [PROMETHEUS]: To enable a ServiceMonitor to export metrics to Prometheus set true
 prometheus:

docs/book/src/getting-started/testdata/project/cmd/main.go

@@ -59,6 +59,7 @@ func main() {
 	var metricsAddr string
 	var metricsCertPath, metricsCertName, metricsCertKey string
 	var webhookCertPath, webhookCertName, webhookCertKey string
+	var webhookPort int
 	var enableLeaderElection bool
 	var probeAddr string
 	var secureMetrics bool
@@ -75,6 +76,7 @@ func main() {
 	flag.StringVar(&webhookCertPath, "webhook-cert-path", "", "The directory that contains the webhook certificate.")
 	flag.StringVar(&webhookCertName, "webhook-cert-name", "tls.crt", "The name of the webhook certificate file.")
 	flag.StringVar(&webhookCertKey, "webhook-cert-key", "tls.key", "The name of the webhook key file.")
+	flag.IntVar(&webhookPort, "webhook-port", 9443, "The port that the webhook endpoint binds to.")
 	flag.StringVar(&metricsCertPath, "metrics-cert-path", "",
 		"The directory that contains the metrics server certificate.")
 	flag.StringVar(&metricsCertName, "metrics-cert-name", "tls.crt", "The name of the metrics server certificate file.")
@@ -131,6 +133,7 @@ func main() {
 
 	webhookServer := webhook.NewServer(webhook.Options{
 		TLSOpts: webhookTLSOpts,
+		Port:    webhookPort,
 	})
 
 	// Metrics endpoint is enabled in 'config/default/kustomization.yaml'. The Metrics options configure the server.

docs/book/src/getting-started/testdata/project/dist/chart/templates/metrics/metrics-service.yaml

@@ -9,8 +9,8 @@ metadata:
     control-plane: controller-manager
 spec:
   ports:
-    - port: 8443
-      targetPort: 8443
+    - port: {{ .Values.metrics.port }}
+      targetPort: {{ .Values.metrics.port }}
       protocol: TCP
       name: https
   selector:

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

@@ -7,7 +7,7 @@ controllerManager:
       tag: latest
     args:
       - "--leader-elect"
-      - "--metrics-bind-address=:8443"
+      - "--metrics-bind-address=:{{ .Values.metrics.port }}"
       - "--health-probe-bind-address=:8081"
     resources:
       limits:
@@ -62,6 +62,7 @@ crd:
 # ControllerManager argument "--metrics-bind-address=:8443" is removed.
 metrics:
   enable: true
+  port: 8443
 
 # [PROMETHEUS]: To enable a ServiceMonitor to export metrics to Prometheus set true
 prometheus:

docs/book/src/multiversion-tutorial/testdata/project/cmd/main.go

@@ -78,6 +78,7 @@ func main() {
 	var metricsAddr string
 	var metricsCertPath, metricsCertName, metricsCertKey string
 	var webhookCertPath, webhookCertName, webhookCertKey string
+	var webhookPort int
 	var enableLeaderElection bool
 	var probeAddr string
 	var secureMetrics bool
@@ -94,6 +95,7 @@ func main() {
 	flag.StringVar(&webhookCertPath, "webhook-cert-path", "", "The directory that contains the webhook certificate.")
 	flag.StringVar(&webhookCertName, "webhook-cert-name", "tls.crt", "The name of the webhook certificate file.")
 	flag.StringVar(&webhookCertKey, "webhook-cert-key", "tls.key", "The name of the webhook key file.")
+	flag.IntVar(&webhookPort, "webhook-port", 9443, "The port that the webhook endpoint binds to.")
 	flag.StringVar(&metricsCertPath, "metrics-cert-path", "",
 		"The directory that contains the metrics server certificate.")
 	flag.StringVar(&metricsCertName, "metrics-cert-name", "tls.crt", "The name of the metrics server certificate file.")
@@ -150,6 +152,7 @@ func main() {
 
 	webhookServer := webhook.NewServer(webhook.Options{
 		TLSOpts: webhookTLSOpts,
+		Port:    webhookPort,
 	})
 
 	// Metrics endpoint is enabled in 'config/default/kustomization.yaml'. The Metrics options configure the server.

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

@@ -47,7 +47,7 @@ spec:
             {{- toYaml .Values.controllerManager.container.readinessProbe | nindent 12 }}
           {{- if .Values.webhook.enable }}
           ports:
-            - containerPort: 9443
+            - containerPort: {{ .Values.webhook.port }}
               name: webhook-server
               protocol: TCP
           {{- end }}

docs/book/src/multiversion-tutorial/testdata/project/dist/chart/templates/metrics/metrics-service.yaml

@@ -9,8 +9,8 @@ metadata:
     control-plane: controller-manager
 spec:
   ports:
-    - port: 8443
-      targetPort: 8443
+    - port: {{ .Values.metrics.port }}
+      targetPort: {{ .Values.metrics.port }}
       protocol: TCP
       name: https
   selector:

docs/book/src/multiversion-tutorial/testdata/project/dist/chart/templates/webhook/service.yaml

@@ -10,7 +10,7 @@ spec:
   ports:
     - port: 443
       protocol: TCP
-      targetPort: 9443
+      targetPort: {{ .Values.webhook.port }}
   selector:
     control-plane: controller-manager
 {{- end }}

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

@@ -7,8 +7,9 @@ controllerManager:
       tag: latest
     args:
       - "--leader-elect"
-      - "--metrics-bind-address=:8443"
+      - "--metrics-bind-address=:{{ .Values.metrics.port }}"
       - "--health-probe-bind-address=:8081"
+      - "--webhook-port={{ .Values.webhook.port }}"
     resources:
       limits:
         cpu: 500m
@@ -62,13 +63,15 @@ crd:
 # ControllerManager argument "--metrics-bind-address=:8443" is removed.
 metrics:
   enable: true
+  port: 8443
 
 # [WEBHOOKS]: Webhooks configuration
 # The following configuration is automatically generated from the manifests
 # generated by controller-gen. To update run 'make manifests' and
 # the edit command with the '--force' flag
 webhook:
   enable: true
+  port: 9443
 
 # [PROMETHEUS]: To enable a ServiceMonitor to export metrics to Prometheus set true
 prometheus:

pkg/plugins/golang/v4/scaffolds/internal/templates/cmd/main.go

@@ -267,6 +267,7 @@ func main() {
 	var metricsAddr string
 	var metricsCertPath, metricsCertName, metricsCertKey string
 	var webhookCertPath, webhookCertName, webhookCertKey string
+	var webhookPort int
 	var enableLeaderElection bool
 	var probeAddr string
 	var secureMetrics bool
@@ -283,6 +284,7 @@ func main() {
 	flag.StringVar(&webhookCertPath, "webhook-cert-path", "", "The directory that contains the webhook certificate.")
 	flag.StringVar(&webhookCertName, "webhook-cert-name", "tls.crt", "The name of the webhook certificate file.")
 	flag.StringVar(&webhookCertKey, "webhook-cert-key", "tls.key", "The name of the webhook key file.")
+	flag.IntVar(&webhookPort, "webhook-port", 9443, "The port that the webhook endpoint binds to.")
 	flag.StringVar(&metricsCertPath, "metrics-cert-path", "",
 		"The directory that contains the metrics server certificate.")
 	flag.StringVar(&metricsCertName, "metrics-cert-name", "tls.crt", "The name of the metrics server certificate file.")
@@ -339,6 +341,7 @@ func main() {
 
 	webhookServer := webhook.NewServer(webhook.Options{
 		TLSOpts: webhookTLSOpts,
+		Port:    webhookPort,
 	})
 
 	// Metrics endpoint is enabled in 'config/default/kustomization.yaml'. The Metrics options configure the server.

pkg/plugins/optional/helm/v1alpha/scaffolds/internal/templates/chart-templates/manager/manager.go

@@ -105,7 +105,7 @@ spec:
 {{- if .HasWebhooks }}
           {{ "{{- if .Values.webhook.enable }}" }}
           ports:
-            - containerPort: 9443
+            - containerPort: {{ "{{ .Values.webhook.port }}" }}
               name: webhook-server
               protocol: TCP
           {{ "{{- end }}" }}

pkg/plugins/optional/helm/v1alpha/scaffolds/internal/templates/chart-templates/metrics/metrics_service.go

@@ -53,8 +53,8 @@ metadata:
     control-plane: controller-manager
 spec:
   ports:
-    - port: 8443
-      targetPort: 8443
+    - port: {{ "{{ .Values.metrics.port }}" }}
+      targetPort: {{ "{{ .Values.metrics.port }}" }}
       protocol: TCP
       name: https
   selector:

pkg/plugins/optional/helm/v1alpha/scaffolds/internal/templates/chart-templates/webhook/service.go

@@ -57,7 +57,7 @@ spec:
   ports:
     - port: 443
       protocol: TCP
-      targetPort: 9443
+      targetPort: {{ "{{ .Values.webhook.port }}" }}
   selector:
     control-plane: controller-manager
 {{` + "`" + `{{- end }}` + "`" + `}}

pkg/plugins/optional/helm/v1alpha/scaffolds/internal/templates/values.go

@@ -61,8 +61,9 @@ controllerManager:
       tag: latest
     args:
       - "--leader-elect"
-      - "--metrics-bind-address=:8443"
-      - "--health-probe-bind-address=:8081"
+      - "--metrics-bind-address=:{{ "{{" }} .Values.metrics.port {{ "}}" }}"
+      - "--health-probe-bind-address=:8081"{{ if .HasWebhooks }}
+      - "--webhook-port={{ "{{" }} .Values.webhook.port {{ "}}" }}"{{ end }}
     resources:
       limits:
         cpu: 500m
@@ -122,13 +123,15 @@ crd:
 # ControllerManager argument "--metrics-bind-address=:8443" is removed.
 metrics:
   enable: true
+  port: 8443
 {{ if .HasWebhooks }}
 # [WEBHOOKS]: Webhooks configuration
 # The following configuration is automatically generated from the manifests
 # generated by controller-gen. To update run 'make manifests' and
 # the edit command with the '--force' flag
 webhook:
   enable: true
+  port: 9443
 {{ end }}
 # [PROMETHEUS]: To enable a ServiceMonitor to export metrics to Prometheus set true
 prometheus:

testdata/project-v4-multigroup/cmd/main.go

@@ -100,6 +100,7 @@ func main() {
 	var metricsAddr string
 	var metricsCertPath, metricsCertName, metricsCertKey string
 	var webhookCertPath, webhookCertName, webhookCertKey string
+	var webhookPort int
 	var enableLeaderElection bool
 	var probeAddr string
 	var secureMetrics bool
@@ -116,6 +117,7 @@ func main() {
 	flag.StringVar(&webhookCertPath, "webhook-cert-path", "", "The directory that contains the webhook certificate.")
 	flag.StringVar(&webhookCertName, "webhook-cert-name", "tls.crt", "The name of the webhook certificate file.")
 	flag.StringVar(&webhookCertKey, "webhook-cert-key", "tls.key", "The name of the webhook key file.")
+	flag.IntVar(&webhookPort, "webhook-port", 9443, "The port that the webhook endpoint binds to.")
 	flag.StringVar(&metricsCertPath, "metrics-cert-path", "",
 		"The directory that contains the metrics server certificate.")
 	flag.StringVar(&metricsCertName, "metrics-cert-name", "tls.crt", "The name of the metrics server certificate file.")
@@ -172,6 +174,7 @@ func main() {
 
 	webhookServer := webhook.NewServer(webhook.Options{
 		TLSOpts: webhookTLSOpts,
+		Port:    webhookPort,
 	})
 
 	// Metrics endpoint is enabled in 'config/default/kustomization.yaml'. The Metrics options configure the server.

testdata/project-v4-with-plugins/cmd/main.go

@@ -65,6 +65,7 @@ func main() {
 	var metricsAddr string
 	var metricsCertPath, metricsCertName, metricsCertKey string
 	var webhookCertPath, webhookCertName, webhookCertKey string
+	var webhookPort int
 	var enableLeaderElection bool
 	var probeAddr string
 	var secureMetrics bool
@@ -81,6 +82,7 @@ func main() {
 	flag.StringVar(&webhookCertPath, "webhook-cert-path", "", "The directory that contains the webhook certificate.")
 	flag.StringVar(&webhookCertName, "webhook-cert-name", "tls.crt", "The name of the webhook certificate file.")
 	flag.StringVar(&webhookCertKey, "webhook-cert-key", "tls.key", "The name of the webhook key file.")
+	flag.IntVar(&webhookPort, "webhook-port", 9443, "The port that the webhook endpoint binds to.")
 	flag.StringVar(&metricsCertPath, "metrics-cert-path", "",
 		"The directory that contains the metrics server certificate.")
 	flag.StringVar(&metricsCertName, "metrics-cert-name", "tls.crt", "The name of the metrics server certificate file.")
@@ -137,6 +139,7 @@ func main() {
 
 	webhookServer := webhook.NewServer(webhook.Options{
 		TLSOpts: webhookTLSOpts,
+		Port:    webhookPort,
 	})
 
 	// Metrics endpoint is enabled in 'config/default/kustomization.yaml'. The Metrics options configure the server.

testdata/project-v4-with-plugins/dist/chart/templates/manager/manager.yaml

@@ -47,7 +47,7 @@ spec:
             {{- toYaml .Values.controllerManager.container.readinessProbe | nindent 12 }}
           {{- if .Values.webhook.enable }}
           ports:
-            - containerPort: 9443
+            - containerPort: {{ .Values.webhook.port }}
               name: webhook-server
               protocol: TCP
           {{- end }}

testdata/project-v4-with-plugins/dist/chart/templates/metrics/metrics-service.yaml

@@ -9,8 +9,8 @@ metadata:
     control-plane: controller-manager
 spec:
   ports:
-    - port: 8443
-      targetPort: 8443
+    - port: {{ .Values.metrics.port }}
+      targetPort: {{ .Values.metrics.port }}
       protocol: TCP
       name: https
   selector:

testdata/project-v4-with-plugins/dist/chart/templates/webhook/service.yaml

@@ -10,7 +10,7 @@ spec:
   ports:
     - port: 443
       protocol: TCP
-      targetPort: 9443
+      targetPort: {{ .Values.webhook.port }}
   selector:
     control-plane: controller-manager
 {{- end }}

testdata/project-v4-with-plugins/dist/chart/values.yaml

@@ -7,8 +7,9 @@ controllerManager:
       tag: latest
     args:
       - "--leader-elect"
-      - "--metrics-bind-address=:8443"
+      - "--metrics-bind-address=:{{ .Values.metrics.port }}"
       - "--health-probe-bind-address=:8081"
+      - "--webhook-port={{ .Values.webhook.port }}"
     resources:
       limits:
         cpu: 500m
@@ -65,13 +66,15 @@ crd:
 # ControllerManager argument "--metrics-bind-address=:8443" is removed.
 metrics:
   enable: true
+  port: 8443
 
 # [WEBHOOKS]: Webhooks configuration
 # The following configuration is automatically generated from the manifests
 # generated by controller-gen. To update run 'make manifests' and
 # the edit command with the '--force' flag
 webhook:
   enable: true
+  port: 9443
 
 # [PROMETHEUS]: To enable a ServiceMonitor to export metrics to Prometheus set true
 prometheus: