Merge "Implemented livenessProbe for different OpenStack api containers"

2018-12-15 09:01:52 +00:00 · 2018-12-15 09:01:52 +00:00 · fbe95c1a6e
commit fbe95c1a6e
parent 8879e6110f 3061ae3896
9 changed files with 45 additions and 0 deletions
--- a/glance/templates/deployment-api.yaml
+++ b/glance/templates/deployment-api.yaml
@ -109,6 +109,10 @@ spec:
          readinessProbe:
            tcpSocket:
              port: {{ tuple "image" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
+          livenessProbe:
+            tcpSocket:
+              port: {{ tuple "image" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
+            initialDelaySeconds: 30
          volumeMounts:
            - name: etcglance
              mountPath: /etc/glance
--- a/glance/templates/deployment-registry.yaml
+++ b/glance/templates/deployment-registry.yaml
@ -74,6 +74,10 @@ spec:
          readinessProbe:
            tcpSocket:
              port: {{ tuple "image_registry" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
+          livenessProbe:
+            tcpSocket:
+              port: {{ tuple "image_registry" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
+            initialDelaySeconds: 30
          volumeMounts:
            - name: etcglance
              mountPath: /etc/glance
--- a/heat/templates/deployment-api.yaml
+++ b/heat/templates/deployment-api.yaml
@ -74,6 +74,10 @@ spec:
          readinessProbe:
            tcpSocket:
              port: {{ tuple "orchestration" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
+          livenessProbe:
+            tcpSocket:
+              port: {{ tuple "orchestration" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
+            initialDelaySeconds: 30
          volumeMounts:
            - name: pod-etc-heat
              mountPath: /etc/heat
--- a/heat/templates/deployment-cfn.yaml
+++ b/heat/templates/deployment-cfn.yaml
@ -74,6 +74,10 @@ spec:
          readinessProbe:
            tcpSocket:
              port: {{ tuple "cloudformation" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
+          livenessProbe:
+            tcpSocket:
+              port: {{ tuple "cloudformation" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
+            initialDelaySeconds: 30
          volumeMounts:
            - name: pod-etc-heat
              mountPath: /etc/heat
--- a/horizon/templates/deployment.yaml
+++ b/horizon/templates/deployment.yaml
@ -78,6 +78,14 @@ spec:
              port: {{ tuple "dashboard" "internal" "web" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
            initialDelaySeconds: 15
            periodSeconds: 10
+          livenessProbe:
+            httpGet:
+              scheme: HTTP
+              path: /
+              port: {{ tuple "dashboard" "internal" "web" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
+            initialDelaySeconds: 180
+            periodSeconds: 60
+            timeoutSeconds: 5
          volumeMounts:
            - name: static-horizon
              mountPath: /var/www/html/
--- a/keystone/templates/deployment-api.yaml
+++ b/keystone/templates/deployment-api.yaml
@ -79,6 +79,14 @@ spec:
              port: {{ $portInt }}
            initialDelaySeconds: 15
            periodSeconds: 10
+          livenessProbe:
+            httpGet:
+              scheme: HTTP
+              path: /
+              port: {{ $portInt }}
+            initialDelaySeconds: 50
+            periodSeconds: 20
+            timeoutSeconds: 5
          volumeMounts:
          - name: etckeystone
            mountPath: /etc/keystone
--- a/nova/templates/deployment-api-metadata.yaml
+++ b/nova/templates/deployment-api-metadata.yaml
@ -91,6 +91,10 @@ spec:
          readinessProbe:
            tcpSocket:
              port: {{ .Values.network.metadata.port }}
+          livenessProbe:
+            tcpSocket:
+              port: {{ .Values.network.metadata.port }}
+            initialDelaySeconds: 30
          volumeMounts:
            - name: nova-bin
              mountPath: /tmp/nova-api-metadata.sh
--- a/nova/templates/deployment-api-osapi.yaml
+++ b/nova/templates/deployment-api-osapi.yaml
@ -74,6 +74,10 @@ spec:
          readinessProbe:
            tcpSocket:
              port: {{ tuple "compute" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
+          livenessProbe:
+            tcpSocket:
+              port: {{ tuple "compute" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
+            initialDelaySeconds: 30
          volumeMounts:
            - name: nova-bin
              mountPath: /tmp/nova-api.sh
--- a/nova/templates/deployment-placement.yaml
+++ b/nova/templates/deployment-placement.yaml
@ -75,6 +75,11 @@ spec:
              port: {{ tuple "placement" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
            initialDelaySeconds: 15
            periodSeconds: 10
+          livenessProbe:
+            tcpSocket:
+              port: {{ tuple "placement" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
+            initialDelaySeconds: 50
+            periodSeconds: 10
          volumeMounts:
            - name: wsgi-nova
              mountPath: /var/www/cgi-bin/nova