From 07bc6cf5c8278a3c90bf70d89aad6d0bb58252c5 Mon Sep 17 00:00:00 2001
From: "Sphicas, Phil (ps3910)" <ps3910@att.com>
Date: Sat, 6 Jul 2019 21:12:39 -0700
Subject: [PATCH] Neutron: remove readiness probe from init container
Remove the readiness probe from the neutron-sriov-agent-init init
container of the neutron-sriov-agent DaemonSet, and use the probe
template for the neutron-sriov-agent container.
Change-Id: Iaa1fbca0b2d5ba1b0c15b82b6e8927c2b7be9f52
---
neutron/templates/daemonset-sriov-agent.yaml | 14 +-------------
1 file changed, 1 insertion(+), 13 deletions(-)
diff --git a/neutron/templates/daemonset-sriov-agent.yaml b/neutron/templates/daemonset-sriov-agent.yaml
index c622cfdbf4..73f760910e 100644
--- a/neutron/templates/daemonset-sriov-agent.yaml
+++ b/neutron/templates/daemonset-sriov-agent.yaml
@@ -75,7 +75,6 @@ spec:
{{ tuple $envAll "neutron_sriov_agent_init" | include "helm-toolkit.snippets.image" | indent 10 }}
{{ tuple $envAll $envAll.Values.pod.resources.agent.sriov | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
{{ dict "envAll" $envAll "application" "neutron_sriov_agent" "container" "neutron_sriov_agent_init" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
-{{ dict "envAll" $envAll "component" "sriov_agent" "container" "sriov_agent" "type" "readiness" "probeTemplate" (include "sriovAgentReadinessProbeTemplate" $envAll | fromYaml) | include "helm-toolkit.snippets.kubernetes_probe" | indent 10 }}
command:
- /tmp/neutron-sriov-agent-init.sh
volumeMounts:
@@ -138,20 +137,9 @@ spec:
{{ tuple $envAll "neutron_sriov_agent" | include "helm-toolkit.snippets.image" | indent 10 }}
{{ tuple $envAll $envAll.Values.pod.resources.agent.sriov | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
{{ dict "envAll" $envAll "application" "neutron_sriov_agent" "container" "neutron_sriov_agent" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
+{{ dict "envAll" $envAll "component" "sriov_agent" "container" "sriov_agent" "type" "readiness" "probeTemplate" (include "sriovAgentReadinessProbeTemplate" $envAll | fromYaml) | include "helm-toolkit.snippets.kubernetes_probe" | indent 10 }}
command:
- /tmp/neutron-sriov-agent.sh
- readinessProbe:
- exec:
- command:
- - python
- - /tmp/health-probe.py
- - --config-file
- - /etc/neutron/neutron.conf
- - --config-file
- - /etc/neutron/sriov_agent.ini
- initialDelaySeconds: 30
- periodSeconds: 15
- timeoutSeconds: 10
volumeMounts:
- name: pod-tmp
mountPath: /tmp