Skip to content

Commit 80506e1

Browse files
Dean-CoakleyDean-Coakley
committed
Improve Helm Chart templates
1 parent 8cbc907 commit 80506e1

File tree

2 files changed

+16
-54
lines changed

2 files changed

+16
-54
lines changed

‎deployments/helm-chart/templates/controller-daemonset.yaml

Lines changed: 8 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,13 @@ spec:
1616
metadata:
1717
labels:
1818
app: {{ .Values.controller.name | trunc 63 }}
19-
{{- if .Values.prometheus }}
2019
{{- if .Values.prometheus.create }}
2120
annotations:
2221
prometheus.io/scrape: "true"
2322
prometheus.io/port: "{{ .Values.prometheus.port }}"
24-
{{- end }}
2523
{{- end }}
2624
spec:
27-
{{- if .Values.controller.serviceAccountName }}
2825
serviceAccountName: {{ .Values.controller.serviceAccountName }}
29-
{{- end }}
3026
terminationGracePeriodSeconds: {{ .Values.controller.terminationGracePeriodSeconds }}
3127
{{- if .Values.controller.nodeSelector }}
3228
nodeSelector:
@@ -62,45 +58,32 @@ spec:
6258
fieldRef:
6359
fieldPath: metadata.name
6460
args:
65-
{{- if .Values.controller.nginxplus }}
66-
- -nginx-plus
67-
{{- end }}
61+
- -nginx-plus={{ .Values.controller.nginxplus }}
6862
- -nginx-configmaps=$(POD_NAMESPACE)/nginx-config
6963
{{- if .Values.controller.defaultTLS.secret }}
7064
- -default-server-tls-secret={{ .Values.controller.defaultTLS.secret }}
7165
{{ else }}
7266
- -default-server-tls-secret=$(POD_NAMESPACE)/default-server-secret
7367
{{- end }}
74-
{{- if .Values.controller.ingressClass }}
7568
- -ingress-class={{ .Values.controller.ingressClass }}
76-
{{- end }}
77-
{{- if .Values.controller.useIngressClassOnly }}
7869
- -use-ingress-class-only={{ .Values.controller.useIngressClassOnly }}
79-
{{- end }}
8070
{{- if .Values.controller.watchNamespace }}
8171
- -watch-namespace={{ .Values.controller.watchNamespace }}
8272
{{- end }}
83-
{{- if .Values.controller.healthStatus }}
84-
- -health-status
85-
{{- end }}
86-
{{- if .Values.controller.nginxStatus }}
87-
- -nginx-status={{ .Values.controller.nginxStatus.enable }}
73+
- -health-status={{ .Values.controller.healthStatus }}
74+
{{- if .Values.controller.nginxStatus.enable }}
75+
- -nginx-status
8876
- -nginx-status-port={{ .Values.controller.nginxStatus.port }}
8977
{{- end }}
9078
{{- if .Values.controller.reportIngressStatus.enable }}
9179
- -report-ingress-status
92-
{{- if .Values.controller.reportIngressStatus.externalService }}
9380
- -external-service={{ .Values.controller.reportIngressStatus.externalService }}
81+
- -enable-leader-election={{ .Values.controller.reportIngressStatus.enableLeaderElection }}
9482
{{- end }}
95-
{{ if .Values.controller.reportIngressStatus.enableLeaderElection }}
96-
- -enable-leader-election
97-
{{- end }}
98-
{{- end }}
99-
{{- if and .Values.prometheus .Values.controller.nginxStatus }}
100-
{{- if .Values.prometheus.create }}
83+
{{- if and .Values.prometheus.create .Values.controller.nginxStatus.enable }}
10184
- image: "{{ .Values.prometheus.image.repository }}:{{ .Values.prometheus.image.tag }}"
102-
imagePullPolicy: "{{ .Values.prometheus.image.pullPolicy }}"
10385
name: nginx-prometheus-exporter
86+
imagePullPolicy: "{{ .Values.prometheus.image.pullPolicy }}"
10487
ports:
10588
- name: prometheus
10689
containerPort: {{ .Values.prometheus.port }}
@@ -109,13 +92,11 @@ spec:
10992
- :{{ .Values.prometheus.port }}
11093
{{- if .Values.controller.nginxplus }}
11194
- -nginx.plus
112-
{{- end }}
11395
- -nginx.scrape-uri
114-
{{- if .Values.controller.nginxplus }}
11596
- http://127.0.0.1:{{ .Values.controller.nginxStatus.port }}/api
11697
{{ else }}
98+
- -nginx.scrape-uri
11799
- http://127.0.0.1:{{ .Values.controller.nginxStatus.port }}/stub_status
118100
{{- end }}
119101
{{- end }}
120102
{{- end }}
121-
{{- end }}

‎deployments/helm-chart/templates/controller-deployment.yaml

Lines changed: 8 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,13 @@ spec:
1717
metadata:
1818
labels:
1919
app: {{ .Values.controller.name | trunc 63 }}
20-
{{- if .Values.prometheus }}
2120
{{- if .Values.prometheus.create }}
2221
annotations:
2322
prometheus.io/scrape: "true"
2423
prometheus.io/port: "{{ .Values.prometheus.port }}"
25-
{{- end }}
2624
{{- end }}
2725
spec:
28-
{{- if .Values.controller.serviceAccountName }}
2926
serviceAccountName: {{ .Values.controller.serviceAccountName }}
30-
{{- end }}
3127
hostNetwork: {{ .Values.controller.hostNetwork }}
3228
containers:
3329
- image: "{{ .Values.controller.image.repository }}:{{ .Values.controller.image.tag }}"
@@ -48,42 +44,29 @@ spec:
4844
fieldRef:
4945
fieldPath: metadata.name
5046
args:
51-
{{- if .Values.controller.nginxplus }}
52-
- -nginx-plus
53-
{{- end }}
47+
- -nginx-plus={{ .Values.controller.nginxplus }}
5448
- -nginx-configmaps=$(POD_NAMESPACE)/nginx-config
5549
{{- if .Values.controller.defaultTLS.secret }}
5650
- -default-server-tls-secret={{ .Values.controller.defaultTLS.secret }}
5751
{{ else }}
5852
- -default-server-tls-secret=$(POD_NAMESPACE)/default-server-secret
5953
{{- end }}
60-
{{- if .Values.controller.ingressClass }}
6154
- -ingress-class={{ .Values.controller.ingressClass }}
62-
{{- end }}
63-
{{- if .Values.controller.useIngressClassOnly }}
6455
- -use-ingress-class-only={{ .Values.controller.useIngressClassOnly }}
65-
{{- end }}
6656
{{- if .Values.controller.watchNamespace }}
6757
- -watch-namespace={{ .Values.controller.watchNamespace }}
6858
{{- end }}
69-
{{- if .Values.controller.healthStatus }}
70-
- -health-status
71-
{{- end }}
72-
{{- if .Values.controller.nginxStatus }}
73-
- -nginx-status={{ .Values.controller.nginxStatus.enable }}
59+
- -health-status={{ .Values.controller.healthStatus }}
60+
{{- if .Values.controller.nginxStatus.enable }}
61+
- -nginx-status
7462
- -nginx-status-port={{ .Values.controller.nginxStatus.port }}
7563
{{- end }}
7664
{{- if .Values.controller.reportIngressStatus.enable }}
7765
- -report-ingress-status
78-
{{- if .Values.controller.reportIngressStatus.externalService }}
7966
- -external-service={{ .Values.controller.reportIngressStatus.externalService }}
67+
- -enable-leader-election={{ .Values.controller.reportIngressStatus.enableLeaderElection }}
8068
{{- end }}
81-
{{- if .Values.controller.reportIngressStatus.enableLeaderElection }}
82-
- -enable-leader-election
83-
{{- end }}
84-
{{- end }}
85-
{{- if and .Values.prometheus .Values.controller.nginxStatus }}
86-
{{- if .Values.prometheus.create }}
69+
{{- if and .Values.prometheus.create .Values.controller.nginxStatus.enable }}
8770
- image: "{{ .Values.prometheus.image.repository }}:{{ .Values.prometheus.image.tag }}"
8871
name: nginx-prometheus-exporter
8972
imagePullPolicy: "{{ .Values.prometheus.image.pullPolicy }}"
@@ -95,13 +78,11 @@ spec:
9578
- :{{ .Values.prometheus.port }}
9679
{{- if .Values.controller.nginxplus }}
9780
- -nginx.plus
98-
{{- end }}
9981
- -nginx.scrape-uri
100-
{{- if .Values.controller.nginxplus }}
10182
- http://127.0.0.1:{{ .Values.controller.nginxStatus.port }}/api
10283
{{ else }}
103-
- http://127.0.0.1:{{ .Values.controller.nginxStatus.port }}/stub_status
104-
{{- end }}
84+
- -nginx.scrape-uri
85+
- http://127.0.0.1:{{ .Values.controller.nginxStatus.port }}/stub_status
10586
{{- end }}
10687
{{- end }}
10788
{{- end }}

0 commit comments

Comments
 (0)