1 From af94c98eee44769a2c1e8f211029f8346a13ebc2 Mon Sep 17 00:00:00 2001
2 From: Robert Church <robert.church@windriver.com>
3 Date: Fri, 22 Mar 2019 03:42:08 -0400
4 Subject: [PATCH 05] Nova: Add support for disabling Readiness/Liveness
7 With the introduction of Readiness/Liveness probes in
8 Ib8e4b93486588320fd2d562c3bc90b65844e52e5, some probes are failing and
9 preventing successful armada manifest applies.
11 Add support to disable the probes.
13 Change-Id: Iebe7327055f58fa78ce3fcac968c1fa617c30c2f
14 Signed-off-by: Robert Church <robert.church@windriver.com>
16 nova/templates/daemonset-compute.yaml | 4 ++++
17 nova/templates/deployment-conductor.yaml | 4 ++++
18 nova/templates/deployment-consoleauth.yaml | 4 ++++
19 nova/templates/deployment-novncproxy.yaml | 4 ++++
20 nova/templates/deployment-scheduler.yaml | 4 ++++
21 nova/templates/deployment-spiceproxy.yaml | 4 ++++
22 nova/values.yaml | 28 ++++++++++++++++++++++++++++
23 7 files changed, 52 insertions(+)
25 diff --git a/nova/templates/daemonset-compute.yaml b/nova/templates/daemonset-compute.yaml
26 index feea6ab..86dc2b9 100644
27 --- a/nova/templates/daemonset-compute.yaml
28 +++ b/nova/templates/daemonset-compute.yaml
29 @@ -190,6 +190,7 @@ spec:
30 - name: LIBVIRT_CEPH_SECRET_UUID
31 value: "{{ .Values.conf.ceph.secret_uuid }}"
33 + {{- if .Values.pod.probes.readiness.nova_compute.enabled }}
37 @@ -202,6 +203,8 @@ spec:
38 initialDelaySeconds: 80
42 + {{- if .Values.pod.probes.liveness.nova_compute.enabled }}
46 @@ -215,6 +218,7 @@ spec:
47 initialDelaySeconds: 120
52 - /tmp/nova-compute.sh
54 diff --git a/nova/templates/deployment-conductor.yaml b/nova/templates/deployment-conductor.yaml
55 index f927afa..0caa006 100644
56 --- a/nova/templates/deployment-conductor.yaml
57 +++ b/nova/templates/deployment-conductor.yaml
58 @@ -59,6 +59,7 @@ spec:
59 {{ tuple $envAll "nova_conductor" | include "helm-toolkit.snippets.image" | indent 10 }}
60 {{ tuple $envAll $envAll.Values.pod.resources.conductor | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
61 {{ dict "envAll" $envAll "application" "nova" "container" "nova_conductor" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
62 + {{- if .Values.pod.probes.readiness.nova_conductor.enabled }}
66 @@ -71,6 +72,8 @@ spec:
67 initialDelaySeconds: 80
71 + {{- if .Values.pod.probes.liveness.nova_conductor.enabled }}
75 @@ -84,6 +87,7 @@ spec:
76 initialDelaySeconds: 120
81 - /tmp/nova-conductor.sh
83 diff --git a/nova/templates/deployment-consoleauth.yaml b/nova/templates/deployment-consoleauth.yaml
84 index b9cb717..0f590e0 100644
85 --- a/nova/templates/deployment-consoleauth.yaml
86 +++ b/nova/templates/deployment-consoleauth.yaml
87 @@ -59,6 +59,7 @@ spec:
88 {{ tuple $envAll "nova_consoleauth" | include "helm-toolkit.snippets.image" | indent 10 }}
89 {{ tuple $envAll $envAll.Values.pod.resources.consoleauth | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
90 {{ dict "envAll" $envAll "application" "nova" "container" "nova_consoleauth" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
91 + {{- if .Values.pod.probes.readiness.nova_consoleauth.enabled }}
95 @@ -71,6 +72,8 @@ spec:
96 initialDelaySeconds: 80
100 + {{- if .Values.pod.probes.liveness.nova_consoleauth.enabled }}
104 @@ -84,6 +87,7 @@ spec:
105 initialDelaySeconds: 120
110 - /tmp/nova-consoleauth.sh
112 diff --git a/nova/templates/deployment-novncproxy.yaml b/nova/templates/deployment-novncproxy.yaml
113 index 42a52af..495c1ac 100644
114 --- a/nova/templates/deployment-novncproxy.yaml
115 +++ b/nova/templates/deployment-novncproxy.yaml
116 @@ -103,14 +103,18 @@ spec:
117 {{ tuple $envAll "nova_novncproxy" | include "helm-toolkit.snippets.image" | indent 10 }}
118 {{ tuple $envAll $envAll.Values.pod.resources.novncproxy | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
119 {{ dict "envAll" $envAll "application" "nova" "container" "nova_novncproxy" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
120 + {{- if .Values.pod.probes.readiness.nova_novcnproxy.enabled }}
123 port: {{ tuple "compute_novnc_proxy" "internal" "novnc_proxy" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
124 initialDelaySeconds: 30
126 + {{- if .Values.pod.probes.liveness.nova_novcnproxy.enabled }}
129 port: {{ tuple "compute_novnc_proxy" "internal" "novnc_proxy" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
130 initialDelaySeconds: 30
133 - /tmp/nova-console-proxy.sh
135 diff --git a/nova/templates/deployment-scheduler.yaml b/nova/templates/deployment-scheduler.yaml
136 index 05ee949..9a30fa6 100644
137 --- a/nova/templates/deployment-scheduler.yaml
138 +++ b/nova/templates/deployment-scheduler.yaml
139 @@ -59,6 +59,7 @@ spec:
140 {{ tuple $envAll "nova_scheduler" | include "helm-toolkit.snippets.image" | indent 10 }}
141 {{ tuple $envAll $envAll.Values.pod.resources.scheduler | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
142 {{ dict "envAll" $envAll "application" "nova" "container" "nova_scheduler" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
143 + {{- if .Values.pod.probes.readiness.nova_scheduler.enabled }}
147 @@ -72,6 +73,8 @@ spec:
148 initialDelaySeconds: 80
152 + {{- if .Values.pod.probes.liveness.nova_scheduler.enabled }}
156 @@ -86,6 +89,7 @@ spec:
157 initialDelaySeconds: 120
162 - /tmp/nova-scheduler.sh
164 diff --git a/nova/templates/deployment-spiceproxy.yaml b/nova/templates/deployment-spiceproxy.yaml
165 index a221656..038c85c 100644
166 --- a/nova/templates/deployment-spiceproxy.yaml
167 +++ b/nova/templates/deployment-spiceproxy.yaml
168 @@ -101,14 +101,18 @@ spec:
169 {{ tuple $envAll "nova_spiceproxy" | include "helm-toolkit.snippets.image" | indent 10 }}
170 {{ tuple $envAll $envAll.Values.pod.resources.spiceproxy | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
171 {{ dict "envAll" $envAll "application" "nova" "container" "nova_spiceproxy" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
172 + {{- if .Values.pod.probes.readiness.nova_spiceproxy.enabled }}
175 port: {{ tuple "compute_spice_proxy" "internal" "spice_proxy" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
176 initialDelaySeconds: 30
178 + {{- if .Values.pod.probes.liveness.nova_spiceproxy.enabled }}
181 port: {{ tuple "compute_spice_proxy" "internal" "spice_proxy" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
182 initialDelaySeconds: 30
185 - /tmp/nova-console-proxy.sh
187 diff --git a/nova/values.yaml b/nova/values.yaml
188 index 97ef1b5..4092329 100644
189 --- a/nova/values.yaml
190 +++ b/nova/values.yaml
191 @@ -2499,6 +2499,34 @@ pod:
225 # TODO(lamt): Need to tighten this ingress for security.