Skip to content
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

🐛 Remove metricsBindAddr from helmchart #665

Merged
merged 5 commits into from
Dec 20, 2024
Merged

🐛 Remove metricsBindAddr from helmchart #665

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
05dd214
remove metricsBindAddress flag from helmchart
Arakos Dec 19, 2024
357bbd1
expose diagnostics address port if configured
Arakos Dec 20, 2024
c9bf67e
generate resources
Arakos Dec 20, 2024
d4aca3c
keep metrics as port name
Arakos Dec 20, 2024
9afb69c
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
13 changes: 8 additions & 5 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 }}
Arakos marked this conversation as resolved.
Show resolved Hide resolved
name: metrics
{{- if $.Values.diagnosticsAddress }}
{{- $diagnosticsPort := $.Values.diagnosticsAddress }}
{{- if contains ":" $diagnosticsPort -}}
{{ $diagnosticsPort = ( split ":" $.Values.diagnosticsAddress)._1 }}
furkatgofurov7 marked this conversation as resolved.
Show resolved Hide resolved
{{- end }}
- containerPort: {{ $diagnosticsPort | int }}
name: diagnostics
furkatgofurov7 marked this conversation as resolved.
Show resolved Hide resolved
protocol: TCP
{{- end }}
{{- with .Values.resources.manager }}
resources:
{{- toYaml . | nindent 12 }}
Expand Down
1 change: 0 additions & 1 deletion 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,7 +24,6 @@ image:
env:
manager: []
healthAddr: ":8081"
metricsBindAddr: "127.0.0.1:8080"
diagnosticsAddress: "8443"
furkatgofurov7 marked this conversation as resolved.
Show resolved Hide resolved
insecureDiagnostics: false
watchConfigSecret: false
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,7 +28387,6 @@ spec:
- args:
- --v=2
- --health-addr=:8081
- --metrics-bind-addr=127.0.0.1:8080
- --diagnostics-address=8443
- --leader-elect=true
command:
Expand All @@ -28399,8 +28398,8 @@ spec:
- containerPort: 9443
name: webhook-server
protocol: TCP
- containerPort: 8080
name: metrics
- containerPort: 8443
name: diagnostics
protocol: TCP
resources:
limits:
Expand Down
Loading