make some changes for best practices (#843)

* add terminationMessagePolicy, set to FallbackToLogsOnError * probes
kiali · Nov 12, 2024 · a0a43e1 · a0a43e1
1 parent b5a3fe1
commit a0a43e1
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 0 deletions.
diff --git a/manifests/kiali-ossm/manifests/kiali.clusterserviceversion.yaml b/manifests/kiali-ossm/manifests/kiali.clusterserviceversion.yaml
@@ -260,6 +260,25 @@ spec:
                 - "--zap-log-level=info"
                 - "--leader-election-id=kiali-operator"
                 - "--watches-file=./$(WATCHES_FILE)"
+                - "--health-probe-bind-address=:6789"
+                terminationMessagePolicy: FallbackToLogsOnError
+                readinessProbe:
+                  httpGet:
+                    path: /readyz
+                    port: 6789
+                  periodSeconds: 30
+                livenessProbe:
+                  httpGet:
+                    path: /healthz
+                    port: 6789
+                  periodSeconds: 30
+                startupProbe:
+                  httpGet:
+                    path: /healthz
+                    port: 6789
+                  initialDelaySeconds: 30
+                  periodSeconds: 10
+                  failureThreshold: 6
                 securityContext:
                   allowPrivilegeEscalation: false
                   privileged: false

diff --git a/manifests/kiali-upstream/2.2.0/manifests/kiali.v2.2.0.clusterserviceversion.yaml b/manifests/kiali-upstream/2.2.0/manifests/kiali.v2.2.0.clusterserviceversion.yaml
@@ -201,6 +201,25 @@ spec:
                 - "--zap-log-level=info"
                 - "--leader-election-id=kiali-operator"
                 - "--watches-file=./$(WATCHES_FILE)"
+                - "--health-probe-bind-address=:6789"
+                terminationMessagePolicy: FallbackToLogsOnError
+                readinessProbe:
+                  httpGet:
+                    path: /readyz
+                    port: 6789
+                  periodSeconds: 30
+                livenessProbe:
+                  httpGet:
+                    path: /healthz
+                    port: 6789
+                  periodSeconds: 30
+                startupProbe:
+                  httpGet:
+                    path: /healthz
+                    port: 6789
+                  initialDelaySeconds: 30
+                  periodSeconds: 10
+                  failureThreshold: 6
                 securityContext:
                   allowPrivilegeEscalation: false
                   privileged: false

diff --git a/roles/default/kiali-deploy/templates/kubernetes/deployment.yaml b/roles/default/kiali-deploy/templates/kubernetes/deployment.yaml
@@ -66,6 +66,7 @@ spec:
         - "/opt/kiali/kiali"
         - "-config"
         - "/kiali-configuration/config.yaml"
+        terminationMessagePolicy: FallbackToLogsOnError
         securityContext:
 {% if kiali_vars.deployment.security_context|length > 0 %}
           {{ kiali_vars.deployment.security_context | to_nice_yaml(indent=0) | trim | indent(10) }}
@@ -100,6 +101,14 @@ spec:
             scheme:  {{ 'HTTP' if kiali_vars.identity.cert_file == "" else 'HTTPS' }}
           initialDelaySeconds: 5
           periodSeconds: 30
+        startupProbe:
+          httpGet:
+            path: {{ kiali_vars.server.web_root | regex_replace('\\/$', '') }}/healthz
+            port: api-port
+            scheme:  {{ 'HTTP' if kiali_vars.identity.cert_file == "" else 'HTTPS' }}
+          initialDelaySeconds: 30
+          periodSeconds: 10
+          failureThreshold: 6
         env:
         - name: ACTIVE_NAMESPACE
           valueFrom:

diff --git a/roles/default/kiali-deploy/templates/openshift/deployment.yaml b/roles/default/kiali-deploy/templates/openshift/deployment.yaml
@@ -66,6 +66,7 @@ spec:
         - "/opt/kiali/kiali"
         - "-config"
         - "/kiali-configuration/config.yaml"
+        terminationMessagePolicy: FallbackToLogsOnError
         securityContext:
 {% if kiali_vars.deployment.security_context|length > 0 %}
           {{ kiali_vars.deployment.security_context | to_nice_yaml(indent=0) | trim | indent(10) }}
@@ -100,6 +101,14 @@ spec:
             scheme:  {{ 'HTTP' if kiali_vars.identity.cert_file == "" else 'HTTPS' }}
           initialDelaySeconds: 5
           periodSeconds: 30
+        startupProbe:
+          httpGet:
+            path: {{ kiali_vars.server.web_root | regex_replace('\\/$', '') }}/healthz
+            port: api-port
+            scheme:  {{ 'HTTP' if kiali_vars.identity.cert_file == "" else 'HTTPS' }}
+          initialDelaySeconds: 30
+          periodSeconds: 10
+          failureThreshold: 6
         env:
         - name: ACTIVE_NAMESPACE
           valueFrom: