Skip to content

Commit 613ff1e

Browse files
committed
fix: gate metrics flag and port on metrics.enabled in Helm chart
The released operator binary does not support --metrics-bind-address, so deploying it with the current Helm chart crashes the operator. Gate the flag and metrics port in sync-helm.sh on metrics.enabled, and disable metrics when installing the released image in the upgrade test. Also filter --metrics-bind-address from controllerExtraArgs to prevent duplication. Assisted-by: AI Signed-off-by: Alice Frosi <afrosi@redhat.com>
1 parent b7d8f44 commit 613ff1e

2 files changed

Lines changed: 24 additions & 5 deletions

File tree

‎hack/sync-helm.sh‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,20 @@ sed -i '/^ image: {{ include "bootc-operator\.image" \. }}/i\
9090
- {{ . | quote }}\
9191
{{- end }}' "$CHART_DIR/templates/controller-deployment.yaml"
9292

93+
# Make --metrics-bind-address conditional on metrics.enabled
94+
sed -i 's|^\( - --metrics-bind-address=\):8443$| {{- if .Values.metrics.enabled }}\n\1:{{ .Values.metrics.service.port }}\n {{- end }}|' \
95+
"$CHART_DIR/templates/controller-deployment.yaml"
96+
97+
# Make metrics containerPort conditional on metrics.enabled
98+
python3 -c "
99+
import re, sys
100+
text = open(sys.argv[1]).read()
101+
pattern = r' - containerPort: 8443\n name: metrics\n protocol: TCP\n'
102+
repl = ' {{- if .Values.metrics.enabled }}\n - containerPort: {{ .Values.metrics.service.port }}\n name: metrics\n protocol: TCP\n {{- end }}\n'
103+
text = re.sub(pattern, repl, text)
104+
open(sys.argv[1], 'w').write(text)
105+
" "$CHART_DIR/templates/controller-deployment.yaml"
106+
93107
gen_workload "$CONFIG_DIR/daemon/daemon.yaml" DaemonSet daemon \
94108
"$CHART_DIR/templates/daemon-daemonset.yaml"
95109
echo "Synced workloads"

‎test/e2e/upgrade_test.go‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,11 @@ func TestOperatorUpgrade(t *testing.T) {
6767
t.Logf("Released operator tag: %s, image: %s", releaseTag, releasedImg)
6868

6969
// Phase 1: Uninstall the current operator and re-install with
70-
// the released image via Helm.
70+
// the released image via Helm. Disable metrics because the
71+
// released binary does not support --metrics-bind-address.
7172
uninstallOperator(t, g, ctx, env)
72-
helmInstallOperator(t, chartPath, releasedImg, extraArgs)
73+
helmInstallOperator(t, chartPath, releasedImg, extraArgs,
74+
"--set", "metrics.enabled=false")
7375
waitForOperatorReady(t, g, ctx, env.Client)
7476

7577
t.Logf("Released operator %s installed via Helm", releaseTag)
@@ -175,25 +177,27 @@ func uninstallOperator(
175177
}
176178

177179
// helmInstallOperator installs the operator via helm install.
178-
func helmInstallOperator(t *testing.T, chartPath, img string, extraArgs []string) {
180+
func helmInstallOperator(t *testing.T, chartPath, img string, extraArgs []string, helmSetArgs ...string) {
179181
t.Helper()
180182
args := []string{
181183
"install", helmReleaseName, chartPath,
182184
"--namespace", testutil.OperatorNamespaceName,
183185
"--create-namespace",
184186
}
185187
args = append(args, helmImageArgs(t, img, extraArgs)...)
188+
args = append(args, helmSetArgs...)
186189
helmRun(t, args...)
187190
}
188191

189192
// helmUpgradeOperator upgrades the operator via helm upgrade.
190-
func helmUpgradeOperator(t *testing.T, chartPath, img string, extraArgs []string) {
193+
func helmUpgradeOperator(t *testing.T, chartPath, img string, extraArgs []string, helmSetArgs ...string) {
191194
t.Helper()
192195
args := []string{
193196
"upgrade", helmReleaseName, chartPath,
194197
"--namespace", testutil.OperatorNamespaceName,
195198
}
196199
args = append(args, helmImageArgs(t, img, extraArgs)...)
200+
args = append(args, helmSetArgs...)
197201
helmRun(t, args...)
198202
}
199203

@@ -255,7 +259,8 @@ func controllerExtraArgs(t *testing.T, containers []corev1.Container) []string {
255259
for _, arg := range c.Args {
256260
switch {
257261
case arg == "--leader-elect",
258-
strings.HasPrefix(arg, "--health-probe-bind-address="):
262+
strings.HasPrefix(arg, "--health-probe-bind-address="),
263+
strings.HasPrefix(arg, "--metrics-bind-address="):
259264
default:
260265
extra = append(extra, arg)
261266
}

0 commit comments

Comments
 (0)