Skip to content

Commit

Permalink
Merge pull request #665 from Arakos/fix/helmchart
Browse files Browse the repository at this point in the history
🐛 Remove metricsBindAddr from helmchart
  • Loading branch information
k8s-ci-robot authored Dec 20, 2024
2 parents 57fd624 + 9afb69c commit d03c162
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
11 changes: 7 additions & 4 deletions hack/charts/cluster-api-operator/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,6 @@ spec:
{{- if .Values.healthAddr }}
- --health-addr={{ .Values.healthAddr }}
{{- end }}
{{- if .Values.metricsBindAddr }}
- --metrics-bind-addr={{ .Values.metricsBindAddr }}
{{- end }}
{{- if .Values.diagnosticsAddress }}
- --diagnostics-address={{ .Values.diagnosticsAddress }}
{{- end }}
Expand Down Expand Up @@ -100,9 +97,15 @@ spec:
- containerPort: 9443
name: webhook-server
protocol: TCP
- containerPort: {{ ( split ":" $.Values.metricsBindAddr)._1 | int }}
{{- if $.Values.diagnosticsAddress }}
{{- $diagnosticsPort := $.Values.diagnosticsAddress }}
{{- if contains ":" $diagnosticsPort -}}
{{ $diagnosticsPort = ( split ":" $.Values.diagnosticsAddress)._1 | int }}
{{- end }}
- containerPort: {{ $diagnosticsPort | int }}
name: metrics
protocol: TCP
{{- end }}
{{- with .Values.resources.manager }}
resources:
{{- toYaml . | nindent 12 }}
Expand Down
3 changes: 1 addition & 2 deletions hack/charts/cluster-api-operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ image:
env:
manager: []
healthAddr: ":8081"
metricsBindAddr: "127.0.0.1:8080"
diagnosticsAddress: "8443"
diagnosticsAddress: ":8443"
insecureDiagnostics: false
watchConfigSecret: false
imagePullSecrets: {}
Expand Down
5 changes: 2 additions & 3 deletions test/e2e/resources/full-chart-install.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28387,8 +28387,7 @@ spec:
- args:
- --v=2
- --health-addr=:8081
- --metrics-bind-addr=127.0.0.1:8080
- --diagnostics-address=8443
- --diagnostics-address=:8443
- --leader-elect=true
command:
- /manager
Expand All @@ -28399,7 +28398,7 @@ spec:
- containerPort: 9443
name: webhook-server
protocol: TCP
- containerPort: 8080
- containerPort: 8443
name: metrics
protocol: TCP
resources:
Expand Down

0 comments on commit d03c162

Please sign in to comment.