X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=meta-starlingx%2Fmeta-stx-flock%2Fstx-openstack-armada-app%2Fopenstack-helm%2F0005-Nova-Add-support-for-disabling-Readiness-Liveness-pr.patch;fp=meta-starlingx%2Fmeta-stx-flock%2Fstx-openstack-armada-app%2Fopenstack-helm%2F0005-Nova-Add-support-for-disabling-Readiness-Liveness-pr.patch;h=0000000000000000000000000000000000000000;hb=6fc6934434f70595536a387ece31bc30141cafb5;hp=2d89230e59e0e7de23d09456ae3d1d0eedd9b0f4;hpb=eb1e26510491ba49de693ab3b0498edcb06be6c5;p=pti%2Frtp.git diff --git a/meta-starlingx/meta-stx-flock/stx-openstack-armada-app/openstack-helm/0005-Nova-Add-support-for-disabling-Readiness-Liveness-pr.patch b/meta-starlingx/meta-stx-flock/stx-openstack-armada-app/openstack-helm/0005-Nova-Add-support-for-disabling-Readiness-Liveness-pr.patch deleted file mode 100644 index 2d89230..0000000 --- a/meta-starlingx/meta-stx-flock/stx-openstack-armada-app/openstack-helm/0005-Nova-Add-support-for-disabling-Readiness-Liveness-pr.patch +++ /dev/null @@ -1,228 +0,0 @@ -From af94c98eee44769a2c1e8f211029f8346a13ebc2 Mon Sep 17 00:00:00 2001 -From: Robert Church -Date: Fri, 22 Mar 2019 03:42:08 -0400 -Subject: [PATCH 05] Nova: Add support for disabling Readiness/Liveness - probes - -With the introduction of Readiness/Liveness probes in -Ib8e4b93486588320fd2d562c3bc90b65844e52e5, some probes are failing and -preventing successful armada manifest applies. - -Add support to disable the probes. - -Change-Id: Iebe7327055f58fa78ce3fcac968c1fa617c30c2f -Signed-off-by: Robert Church ---- - nova/templates/daemonset-compute.yaml | 4 ++++ - nova/templates/deployment-conductor.yaml | 4 ++++ - nova/templates/deployment-consoleauth.yaml | 4 ++++ - nova/templates/deployment-novncproxy.yaml | 4 ++++ - nova/templates/deployment-scheduler.yaml | 4 ++++ - nova/templates/deployment-spiceproxy.yaml | 4 ++++ - nova/values.yaml | 28 ++++++++++++++++++++++++++++ - 7 files changed, 52 insertions(+) - -diff --git a/nova/templates/daemonset-compute.yaml b/nova/templates/daemonset-compute.yaml -index feea6ab..86dc2b9 100644 ---- a/nova/templates/daemonset-compute.yaml -+++ b/nova/templates/daemonset-compute.yaml -@@ -190,6 +190,7 @@ spec: - - name: LIBVIRT_CEPH_SECRET_UUID - value: "{{ .Values.conf.ceph.secret_uuid }}" - {{ end }} -+ {{- if .Values.pod.probes.readiness.nova_compute.enabled }} - readinessProbe: - exec: - command: -@@ -202,6 +203,8 @@ spec: - initialDelaySeconds: 80 - periodSeconds: 90 - timeoutSeconds: 70 -+ {{- end }} -+ {{- if .Values.pod.probes.liveness.nova_compute.enabled }} - livenessProbe: - exec: - command: -@@ -215,6 +218,7 @@ spec: - initialDelaySeconds: 120 - periodSeconds: 90 - timeoutSeconds: 70 -+ {{- end }} - command: - - /tmp/nova-compute.sh - volumeMounts: -diff --git a/nova/templates/deployment-conductor.yaml b/nova/templates/deployment-conductor.yaml -index f927afa..0caa006 100644 ---- a/nova/templates/deployment-conductor.yaml -+++ b/nova/templates/deployment-conductor.yaml -@@ -59,6 +59,7 @@ spec: - {{ tuple $envAll "nova_conductor" | include "helm-toolkit.snippets.image" | indent 10 }} - {{ tuple $envAll $envAll.Values.pod.resources.conductor | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} - {{ dict "envAll" $envAll "application" "nova" "container" "nova_conductor" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }} -+ {{- if .Values.pod.probes.readiness.nova_conductor.enabled }} - readinessProbe: - exec: - command: -@@ -71,6 +72,8 @@ spec: - initialDelaySeconds: 80 - periodSeconds: 90 - timeoutSeconds: 70 -+ {{- end }} -+ {{- if .Values.pod.probes.liveness.nova_conductor.enabled }} - livenessProbe: - exec: - command: -@@ -84,6 +87,7 @@ spec: - initialDelaySeconds: 120 - periodSeconds: 90 - timeoutSeconds: 70 -+ {{- end }} - command: - - /tmp/nova-conductor.sh - volumeMounts: -diff --git a/nova/templates/deployment-consoleauth.yaml b/nova/templates/deployment-consoleauth.yaml -index b9cb717..0f590e0 100644 ---- a/nova/templates/deployment-consoleauth.yaml -+++ b/nova/templates/deployment-consoleauth.yaml -@@ -59,6 +59,7 @@ spec: - {{ tuple $envAll "nova_consoleauth" | include "helm-toolkit.snippets.image" | indent 10 }} - {{ tuple $envAll $envAll.Values.pod.resources.consoleauth | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} - {{ dict "envAll" $envAll "application" "nova" "container" "nova_consoleauth" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }} -+ {{- if .Values.pod.probes.readiness.nova_consoleauth.enabled }} - readinessProbe: - exec: - command: -@@ -71,6 +72,8 @@ spec: - initialDelaySeconds: 80 - periodSeconds: 90 - timeoutSeconds: 70 -+ {{- end }} -+ {{- if .Values.pod.probes.liveness.nova_consoleauth.enabled }} - livenessProbe: - exec: - command: -@@ -84,6 +87,7 @@ spec: - initialDelaySeconds: 120 - periodSeconds: 90 - timeoutSeconds: 70 -+ {{- end }} - command: - - /tmp/nova-consoleauth.sh - volumeMounts: -diff --git a/nova/templates/deployment-novncproxy.yaml b/nova/templates/deployment-novncproxy.yaml -index 42a52af..495c1ac 100644 ---- a/nova/templates/deployment-novncproxy.yaml -+++ b/nova/templates/deployment-novncproxy.yaml -@@ -103,14 +103,18 @@ spec: - {{ tuple $envAll "nova_novncproxy" | include "helm-toolkit.snippets.image" | indent 10 }} - {{ tuple $envAll $envAll.Values.pod.resources.novncproxy | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} - {{ dict "envAll" $envAll "application" "nova" "container" "nova_novncproxy" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }} -+ {{- if .Values.pod.probes.readiness.nova_novcnproxy.enabled }} - readinessProbe: - tcpSocket: - port: {{ tuple "compute_novnc_proxy" "internal" "novnc_proxy" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} - initialDelaySeconds: 30 -+ {{- end }} -+ {{- if .Values.pod.probes.liveness.nova_novcnproxy.enabled }} - livenessProbe: - tcpSocket: - port: {{ tuple "compute_novnc_proxy" "internal" "novnc_proxy" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} - initialDelaySeconds: 30 -+ {{- end }} - command: - - /tmp/nova-console-proxy.sh - ports: -diff --git a/nova/templates/deployment-scheduler.yaml b/nova/templates/deployment-scheduler.yaml -index 05ee949..9a30fa6 100644 ---- a/nova/templates/deployment-scheduler.yaml -+++ b/nova/templates/deployment-scheduler.yaml -@@ -59,6 +59,7 @@ spec: - {{ tuple $envAll "nova_scheduler" | include "helm-toolkit.snippets.image" | indent 10 }} - {{ tuple $envAll $envAll.Values.pod.resources.scheduler | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} - {{ dict "envAll" $envAll "application" "nova" "container" "nova_scheduler" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }} -+ {{- if .Values.pod.probes.readiness.nova_scheduler.enabled }} - readinessProbe: - exec: - command: -@@ -72,6 +73,8 @@ spec: - initialDelaySeconds: 80 - periodSeconds: 90 - timeoutSeconds: 70 -+ {{- end }} -+ {{- if .Values.pod.probes.liveness.nova_scheduler.enabled }} - livenessProbe: - exec: - command: -@@ -86,6 +89,7 @@ spec: - initialDelaySeconds: 120 - periodSeconds: 90 - timeoutSeconds: 70 -+ {{- end }} - command: - - /tmp/nova-scheduler.sh - volumeMounts: -diff --git a/nova/templates/deployment-spiceproxy.yaml b/nova/templates/deployment-spiceproxy.yaml -index a221656..038c85c 100644 ---- a/nova/templates/deployment-spiceproxy.yaml -+++ b/nova/templates/deployment-spiceproxy.yaml -@@ -101,14 +101,18 @@ spec: - {{ tuple $envAll "nova_spiceproxy" | include "helm-toolkit.snippets.image" | indent 10 }} - {{ tuple $envAll $envAll.Values.pod.resources.spiceproxy | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} - {{ dict "envAll" $envAll "application" "nova" "container" "nova_spiceproxy" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }} -+ {{- if .Values.pod.probes.readiness.nova_spiceproxy.enabled }} - readinessProbe: - tcpSocket: - port: {{ tuple "compute_spice_proxy" "internal" "spice_proxy" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} - initialDelaySeconds: 30 -+ {{- end }} -+ {{- if .Values.pod.probes.liveness.nova_spiceproxy.enabled }} - livenessProbe: - tcpSocket: - port: {{ tuple "compute_spice_proxy" "internal" "spice_proxy" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} - initialDelaySeconds: 30 -+ {{- end }} - command: - - /tmp/nova-console-proxy.sh - ports: -diff --git a/nova/values.yaml b/nova/values.yaml -index 97ef1b5..4092329 100644 ---- a/nova/values.yaml -+++ b/nova/values.yaml -@@ -2499,6 +2499,34 @@ pod: - limits: - memory: "1024Mi" - cpu: "2000m" -+ probes: -+ readiness: -+ nova_compute: -+ enabled: true -+ nova_conductor: -+ enabled: true -+ nova_consoleauth: -+ enabled: true -+ nova_novcnproxy: -+ enabled: true -+ nova_scheduler: -+ enabled: true -+ nova_spiceproxy: -+ enabled: true -+ liveness: -+ nova_compute: -+ enabled: true -+ nova_conductor: -+ enabled: true -+ nova_consoleauth: -+ enabled: true -+ nova_novcnproxy: -+ enabled: true -+ nova_scheduler: -+ enabled: true -+ nova_spiceproxy: -+ enabled: true -+ - network_policy: - nova: - # TODO(lamt): Need to tighten this ingress for security. --- -2.7.4 -