Skip to content

🐛 Remove metricsBindAddr from helmchart #669

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Dec 24, 2024
Merged

🐛 Remove metricsBindAddr from helmchart #669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
50f583e
remove metricsBindAddress flag from helmchart
Arakos Dec 19, 2024
0bf1d4c
expose diagnostics address port if configured
Arakos Dec 20, 2024
1060b46
generate resources
Arakos Dec 20, 2024
ae4d724
keep metrics as port name
Arakos Dec 20, 2024
2b0e750
Make diagnostics-address a FQDN address
furkatgofurov7 Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions hack/charts/cluster-api-operator/templates/deployment.yaml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading