Skip to content

Commit f66aeec

Browse files
SzymonSAPSzymonSAP
authored
Use 9443 port for webhook (#335)
1 parent 50e39b7 commit f66aeec

File tree

4 files changed

+66
-66
lines changed

4 files changed

+66
-66
lines changed

‎cmd/manager/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ func main() { // nolint: gocyclo
113113
"Enforce the first boot probing of a Server even if it is powered on in the Initial state.")
114114
flag.BoolVar(&enforcePowerOff, "enforce-power-off", false,
115115
"Enforce the power off of a Server when graceful shutdown fails.")
116-
flag.IntVar(&webhookPort, "webhook-port", 9445, "The port to use for webhook server.")
116+
flag.IntVar(&webhookPort, "webhook-port", 9443, "The port to use for webhook server.")
117117
flag.BoolVar(&enableLeaderElection, "leader-elect", false,
118118
"Enable leader election for controller manager. "+
119119
"Enabling this will ensure there is only one active controller manager.")

‎config/webhook/service.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ spec:
1010
ports:
1111
- port: 443
1212
protocol: TCP
13-
targetPort: 9445
13+
targetPort: 9443
1414
selector:
1515
control-plane: controller-manager
1616
app.kubernetes.io/name: metal-operator

‎dist/chart/templates/_helpers.tpl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414

1515

1616
{{- define "chart.labels" -}}
17-
{{- if .Chart.AppVersion -}}
18-
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
19-
{{- end }}
20-
{{- if .Chart.Version }}
17+
{{- if .Chart.Version -}}
2118
helm.sh/chart: {{ .Chart.Version | quote }}
2219
{{- end }}
2320
app.kubernetes.io/name: {{ include "chart.name" . }}
2421
app.kubernetes.io/instance: {{ .Release.Name }}
22+
{{- if .Chart.AppVersion }}
23+
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
24+
{{- end }}
2525
app.kubernetes.io/managed-by: {{ .Release.Service }}
2626
{{- end }}
2727

‎dist/chart/templates/manager/manager.yaml‎

Lines changed: 60 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ metadata:
44
name: metal-operator-controller-manager
55
namespace: {{ .Release.Namespace }}
66
labels:
7-
{{- include "chart.labels" . | nindent 4 }}
87
control-plane: controller-manager
8+
{{- include "chart.labels" . | nindent 4 }}
99
spec:
10-
replicas: {{ .Values.controllerManager.replicas }}
10+
replicas: {{ .Values.controllerManager.replicas }}
1111
strategy:
1212
type: {{ .Values.controllerManager.strategy.type | quote }}
1313
selector:
@@ -16,76 +16,76 @@ spec:
1616
control-plane: controller-manager
1717
template:
1818
metadata:
19-
annotations:
20-
kubectl.kubernetes.io/default-container: manager
2119
labels:
22-
{{- include "chart.labels" . | nindent 8 }}
2320
control-plane: controller-manager
21+
{{- include "chart.labels" . | nindent 8 }}
2422
{{- if and .Values.controllerManager.pod .Values.controllerManager.pod.labels }}
2523
{{- range $key, $value := .Values.controllerManager.pod.labels }}
2624
{{ $key }}: {{ $value }}
2725
{{- end }}
2826
{{- end }}
27+
annotations:
28+
kubectl.kubernetes.io/default-container: manager
2929
spec:
3030
containers:
31-
- name: manager
32-
args:
33-
{{- range .Values.controllerManager.manager.args }}
34-
- {{ . }}
35-
{{- end }}
36-
command:
37-
- /manager
38-
image: {{ .Values.controllerManager.manager.image.repository }}:{{ .Values.controllerManager.manager.image.tag }}
39-
{{- if .Values.controllerManager.manager.env }}
40-
env:
41-
{{- range $key, $value := .Values.controllerManager.manager.env }}
42-
- name: {{ $key }}
43-
value: {{ $value }}
44-
{{- end }}
45-
{{- end }}
46-
livenessProbe:
47-
{{- toYaml .Values.controllerManager.manager.livenessProbe | nindent 12 }}
48-
readinessProbe:
49-
{{- toYaml .Values.controllerManager.manager.readinessProbe | nindent 12 }}
50-
{{- if .Values.webhook.enable }}
51-
ports:
52-
- containerPort: 9443
53-
name: webhook-server
54-
protocol: TCP
55-
{{- end }}
56-
resources:
57-
{{- toYaml .Values.controllerManager.manager.resources | nindent 12 }}
58-
securityContext:
59-
{{- toYaml .Values.controllerManager.manager.securityContext | nindent 12 }}
60-
volumeMounts:
61-
- mountPath: /etc/macdb/
62-
name: macdb
63-
{{- if and .Values.webhook.enable .Values.certmanager.enable }}
64-
- name: webhook-cert
65-
mountPath: /tmp/k8s-webhook-server/serving-certs
66-
readOnly: true
67-
{{- end }}
68-
{{- if and .Values.metrics.enable .Values.certmanager.enable }}
69-
- name: metrics-certs
70-
mountPath: /tmp/k8s-metrics-server/metrics-certs
71-
readOnly: true
72-
{{- end }}
73-
securityContext:
74-
{{- toYaml .Values.controllerManager.podSecurityContext | nindent 8 }}
75-
serviceAccountName: {{ .Values.controllerManager.serviceAccountName }}
76-
hostNetwork: {{ .Values.controllerManager.hostNetwork }}
77-
terminationGracePeriodSeconds: {{ .Values.controllerManager.terminationGracePeriodSeconds }}
78-
volumes:
79-
- name: macdb
80-
secret:
81-
secretName: macdb
31+
- name: manager
32+
args:
33+
{{- range .Values.controllerManager.manager.args }}
34+
- {{ . }}
35+
{{- end }}
36+
command:
37+
- /manager
38+
image: {{ .Values.controllerManager.manager.image.repository }}:{{ .Values.controllerManager.manager.image.tag }}
39+
{{- if .Values.controllerManager.manager.env }}
40+
env:
41+
{{- range $key, $value := .Values.controllerManager.manager.env }}
42+
- name: {{ $key }}
43+
value: {{ $value }}
44+
{{- end }}
45+
{{- end }}
46+
livenessProbe:
47+
{{- toYaml .Values.controllerManager.manager.livenessProbe | nindent 10 }}
48+
readinessProbe:
49+
{{- toYaml .Values.controllerManager.manager.readinessProbe | nindent 10 }}
50+
{{- if .Values.webhook.enable }}
51+
ports:
52+
- containerPort: 9443
53+
name: webhook-server
54+
protocol: TCP
55+
{{- end }}
56+
resources:
57+
{{- toYaml .Values.controllerManager.manager.resources | nindent 10 }}
58+
securityContext:
59+
{{- toYaml .Values.controllerManager.manager.securityContext | nindent 10 }}
60+
volumeMounts:
61+
- mountPath: /etc/macdb/
62+
name: macdb
8263
{{- if and .Values.webhook.enable .Values.certmanager.enable }}
8364
- name: webhook-cert
84-
secret:
85-
secretName: webhook-server-cert
65+
mountPath: /tmp/k8s-webhook-server/serving-certs
66+
readOnly: true
8667
{{- end }}
8768
{{- if and .Values.metrics.enable .Values.certmanager.enable }}
8869
- name: metrics-certs
89-
secret:
90-
secretName: metrics-server-cert
70+
mountPath: /tmp/k8s-metrics-server/metrics-certs
71+
readOnly: true
9172
{{- end }}
73+
securityContext:
74+
{{- toYaml .Values.controllerManager.podSecurityContext | nindent 8 }}
75+
serviceAccountName: {{ .Values.controllerManager.serviceAccountName }}
76+
hostNetwork: {{ .Values.controllerManager.hostNetwork }}
77+
terminationGracePeriodSeconds: {{ .Values.controllerManager.terminationGracePeriodSeconds }}
78+
volumes:
79+
- name: macdb
80+
secret:
81+
secretName: macdb
82+
{{- if and .Values.webhook.enable .Values.certmanager.enable }}
83+
- name: webhook-cert
84+
secret:
85+
secretName: webhook-server-cert
86+
{{- end }}
87+
{{- if and .Values.metrics.enable .Values.certmanager.enable }}
88+
- name: metrics-certs
89+
secret:
90+
secretName: metrics-server-cert
91+
{{- end }}

0 commit comments

Comments
 (0)