Set explicitly entry point for configurator

From 27/08/2024 the operator container can be used as configurator. With this
change any user of the Cluster custom resource can now use single container
without specifing arguments for configurator.

Reference
a897ad3
#211
0868b61
#322

.changes/unreleased/operator-Changed-20250109-091351.yaml

@@ -0,0 +1,10 @@
+project: operator
+kind: Changed
+body: |
+  For any user that is mirroring configurator image and changes entrypoint or wraps configurator with additional 
+    script the following constraint need to be meet:
+    * use the alternative configuration parameter by specifying `additionalCmdFlags` in Redpanda operator helm chart
+      * to change the container repository set `--configurator-base-image=my.repo.com/configurator`
+      * to change the container tag set `--configurator-tag=XYZ`
+    * image needs to supports the entrypoint `redpanda-operator configure` as it is the default one
+time: 2025-01-09T09:13:51.668314+01:00

.goreleaser.yaml

@@ -16,7 +16,7 @@ builds:
       - amd64
       - arm64
     ldflags:
-    - -X "github.com/redpanda-data/redpanda-operator/operator/cmd/version.version={{.Version}}"
+    - -X "github.com/redpanda-data/redpanda-operator/operator/cmd/version.Version={{.Version}}"
     - -X "github.com/redpanda-data/redpanda-operator/operator/cmd/version.commit={{.Commit}}"
     - -X "github.com/redpanda-data/redpanda-operator/operator/cmd/version.buildDate={{.Date}}"
 

charts/operator/deployment.go

@@ -235,15 +235,6 @@ func containerImage(dot *helmette.Dot) string {
 	return fmt.Sprintf("%s:%s", values.Image.Repository, tag)
 }
 
-func configuratorTag(dot *helmette.Dot) string {
-	values := helmette.Unwrap[Values](dot.Values)
-
-	if !helmette.Empty(values.Configurator.Tag) {
-		return *values.Configurator.Tag
-	}
-	return dot.Chart.AppVersion
-}
-
 func isWebhookEnabled(dot *helmette.Dot) bool {
 	values := helmette.Unwrap[Values](dot.Values)
 
@@ -366,8 +357,6 @@ func operatorArguments(dot *helmette.Dot) []string {
 		"--health-probe-bind-address=:8081",
 		"--metrics-bind-address=127.0.0.1:8080",
 		"--leader-elect",
-		fmt.Sprintf("--configurator-tag=%s", configuratorTag(dot)),
-		fmt.Sprintf("--configurator-base-image=%s", values.Configurator.Repository),
 		fmt.Sprintf("--webhook-enabled=%t", isWebhookEnabled(dot)),
 	}
 

charts/operator/templates/_deployment.go.tpl

@@ -101,22 +101,6 @@
 {{- end -}}
 {{- end -}}
 
-{{- define "operator.configuratorTag" -}}
-{{- $dot := (index .a 0) -}}
-{{- range $_ := (list 1) -}}
-{{- $_is_returning := false -}}
-{{- $values := $dot.Values.AsMap -}}
-{{- if (not (empty $values.configurator.tag)) -}}
-{{- $_is_returning = true -}}
-{{- (dict "r" $values.configurator.tag) | toJson -}}
-{{- break -}}
-{{- end -}}
-{{- $_is_returning = true -}}
-{{- (dict "r" $dot.Chart.AppVersion) | toJson -}}
-{{- break -}}
-{{- end -}}
-{{- end -}}
-
 {{- define "operator.isWebhookEnabled" -}}
 {{- $dot := (index .a 0) -}}
 {{- range $_ := (list 1) -}}
@@ -194,7 +178,7 @@
 {{- range $_ := (list 1) -}}
 {{- $_is_returning := false -}}
 {{- $values := $dot.Values.AsMap -}}
-{{- $args := (list "--health-probe-bind-address=:8081" "--metrics-bind-address=127.0.0.1:8080" "--leader-elect" (printf "--configurator-tag=%s" (get (fromJson (include "operator.configuratorTag" (dict "a" (list $dot) ))) "r")) (printf "--configurator-base-image=%s" $values.configurator.repository) (printf "--webhook-enabled=%t" (get (fromJson (include "operator.isWebhookEnabled" (dict "a" (list $dot) ))) "r"))) -}}
+{{- $args := (list "--health-probe-bind-address=:8081" "--metrics-bind-address=127.0.0.1:8080" "--leader-elect" (printf "--webhook-enabled=%t" (get (fromJson (include "operator.isWebhookEnabled" (dict "a" (list $dot) ))) "r"))) -}}
 {{- if (eq $values.scope "Namespace") -}}
 {{- $args = (concat (default (list ) $args) (list (printf "--namespace=%s" $dot.Release.Namespace) (printf "--log-level=%s" $values.logLevel))) -}}
 {{- end -}}