Update sapor readiness probes and fix cleanup job (#189) (#190)

OpsMx · Sep 7, 2021 · ffac159 · ffac159
1 parent 0a49387
commit ffac159
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/charts/oes/Chart.yaml b/charts/oes/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: oes
-version: 3.9.2
+version: 3.9.3
 appVersion: 3.9.1.2
 description: OES is a non-forked version of OSS spinnaker
 icon: https://raw.githubusercontent.com/OpsMx/enterprise-spinnaker/master/img/opsmx.png

diff --git a/charts/oes/templates/deployments/oes-sapor-deployment.yaml b/charts/oes/templates/deployments/oes-sapor-deployment.yaml
@@ -70,14 +70,16 @@ spec:
         readinessProbe:
           tcpSocket:
             port: 8085
-          initialDelaySeconds: 120
-          periodSeconds: 30
+          initialDelaySeconds: 60
+          periodSeconds: 10
+          failureThreshold: 10
         livenessProbe:
           httpGet:
             path: /mgmt/health
             port: 8085
-          initialDelaySeconds: 180
-          periodSeconds: 60
+          initialDelaySeconds: 60
+          periodSeconds: 10
+          failureThreshold: 10
       imagePullSecrets:
       - name: {{ .Values.imagePullSecret }}
       {{- if .Values.sapor.nodeSelector }}

diff --git a/charts/oes/templates/hooks/cleanup.yaml b/charts/oes/templates/hooks/cleanup.yaml
@@ -20,8 +20,8 @@ spec:
         image: {{ .Values.spinnaker.halyard.image.repository }}:{{ .Values.spinnaker.halyard.image.tag }}
         command: ["/bin/bash","-c"]
 {{- if .Values.global.certManager.installed }}
-        args: ["kubectl delete issuer letsencrypt-{{ .Release.Namespace }}-spin; kubectl delete ingress oes-gate-ingress oes-ui-ingress {{ template "spinnaker.fullname" . }}-deck {{ template "spinnaker.fullname" . }}-gate; kubectl delete secret ca-secret deck-authtls demo-authtls gate-authtls jwt-secret oes-cacerts oes-control-secret oes-gate-authtls oes-ui-authtls"]
+        args: ["kubectl delete issuer letsencrypt-{{ .Release.Namespace }}-spin; kubectl delete ingress oes-gate-ingress oes-ui-ingress {{ template "spinnaker.fullname" . }}-deck; kubectl delete secret ca-secret deck-authtls demo-authtls jwt-secret oes-cacerts oes-control-secret oes-gate-authtls oes-ui-authtls"]
 {{- else }}
-        args: ["kubectl delete ingress oes-gate-ingress oes-ui-ingress {{ template "spinnaker.fullname" . }}-deck {{ template "spinnaker.fullname" . }}-gate; kubectl delete secret ca-secret jwt-secret oes-cacerts oes-control-secret"]
+        args: ["kubectl delete ingress oes-gate-ingress oes-ui-ingress {{ template "spinnaker.fullname" . }}-deck; kubectl delete secret ca-secret jwt-secret oes-cacerts oes-control-secret"]
 {{- end }}
 {{- end }}