[shipa-2326] add heathcheks into deployment (#226)

theketchio · Jan 18, 2022 · 99a7f1c · 99a7f1c
1 parent 0e675c0
commit 99a7f1c
Show file tree

Hide file tree

Showing 9 changed files with 133 additions and 1 deletion.
diff --git a/internal/chart/application_chart_test.go b/internal/chart/application_chart_test.go
@@ -108,6 +108,19 @@ func TestNewApplicationChart(t *testing.T) {
 						{Name: "registry-secret"},
 						{Name: "private-registry-secret"},
 					},
+					KetchYaml: &ketchv1.KetchYamlData{
+						Healthcheck: &ketchv1.KetchYamlHealthcheck{
+							Path:            "/actuator/health/liveness",
+							Method:          "GET",
+							Scheme:          "http",
+							Match:           ".*UP.*",
+							UseInRouter:     true,
+							ForceRestart:    false,
+							AllowedFailures: 0,
+							IntervalSeconds: 0,
+							TimeoutSeconds:  0,
+						},
+					},
 				},
 				{
 					Image:   "shipasoftware/go-app:v2",
@@ -331,7 +344,6 @@ func TestNewApplicationChart(t *testing.T) {
 			}
 
 			client := HelmClient{cfg: &action.Configuration{KubeClient: &fake.PrintingKubeClient{}, Releases: storage.Init(driver.NewMemory())}, namespace: tt.framework.Spec.NamespaceName, c: clientfake.NewClientBuilder().Build()}
-
 			release, err := client.UpdateChart(*got, chartConfig, func(install *action.Install) {
 				install.DryRun = true
 				install.ClientOnly = true

diff --git a/internal/chart/testdata/charts/dashboard-istio-cluster-issuer.yaml b/internal/chart/testdata/charts/dashboard-istio-cluster-issuer.yaml
@@ -179,6 +179,14 @@ spec:
             requests:
               cpu: 5Gi
               memory: 5300m
+          readinessProbe:
+            failureThreshold: 3
+            httpGet:
+              path: /actuator/health/liveness
+              port: 9090
+              scheme: HTTP
+            periodSeconds: 10
+            timeoutSeconds: 60
       imagePullSecrets:
             - name: registry-secret
             - name: private-registry-secret
@@ -235,6 +243,14 @@ spec:
           image: shipasoftware/go-app:v1
           ports:
           - containerPort: 9090
+          readinessProbe:
+            failureThreshold: 3
+            httpGet:
+              path: /actuator/health/liveness
+              port: 9090
+              scheme: HTTP
+            periodSeconds: 10
+            timeoutSeconds: 60
       imagePullSecrets:
             - name: registry-secret
             - name: private-registry-secret

diff --git a/internal/chart/testdata/charts/dashboard-istio.yaml b/internal/chart/testdata/charts/dashboard-istio.yaml
@@ -179,6 +179,14 @@ spec:
             requests:
               cpu: 5Gi
               memory: 5300m
+          readinessProbe:
+            failureThreshold: 3
+            httpGet:
+              path: /actuator/health/liveness
+              port: 9090
+              scheme: HTTP
+            periodSeconds: 10
+            timeoutSeconds: 60
       imagePullSecrets:
             - name: registry-secret
             - name: private-registry-secret
@@ -235,6 +243,14 @@ spec:
           image: shipasoftware/go-app:v1
           ports:
           - containerPort: 9090
+          readinessProbe:
+            failureThreshold: 3
+            httpGet:
+              path: /actuator/health/liveness
+              port: 9090
+              scheme: HTTP
+            periodSeconds: 10
+            timeoutSeconds: 60
       imagePullSecrets:
             - name: registry-secret
             - name: private-registry-secret

diff --git a/internal/chart/testdata/charts/dashboard-nginx-cluster-issuer.yaml b/internal/chart/testdata/charts/dashboard-nginx-cluster-issuer.yaml
@@ -179,6 +179,14 @@ spec:
             requests:
               cpu: 5Gi
               memory: 5300m
+          readinessProbe:
+            failureThreshold: 3
+            httpGet:
+              path: /actuator/health/liveness
+              port: 9090
+              scheme: HTTP
+            periodSeconds: 10
+            timeoutSeconds: 60
       imagePullSecrets:
             - name: registry-secret
             - name: private-registry-secret
@@ -235,6 +243,14 @@ spec:
           image: shipasoftware/go-app:v1
           ports:
           - containerPort: 9090
+          readinessProbe:
+            failureThreshold: 3
+            httpGet:
+              path: /actuator/health/liveness
+              port: 9090
+              scheme: HTTP
+            periodSeconds: 10
+            timeoutSeconds: 60
       imagePullSecrets:
             - name: registry-secret
             - name: private-registry-secret

diff --git a/internal/chart/testdata/charts/dashboard-nginx.yaml b/internal/chart/testdata/charts/dashboard-nginx.yaml
@@ -180,6 +180,14 @@ spec:
             requests:
               cpu: 5Gi
               memory: 5300m
+          readinessProbe:
+            failureThreshold: 3
+            httpGet:
+              path: /actuator/health/liveness
+              port: 9090
+              scheme: HTTP
+            periodSeconds: 10
+            timeoutSeconds: 60
       imagePullSecrets:
             - name: registry-secret
             - name: private-registry-secret
@@ -237,6 +245,14 @@ spec:
           image: shipasoftware/go-app:v1
           ports:
           - containerPort: 9090
+          readinessProbe:
+            failureThreshold: 3
+            httpGet:
+              path: /actuator/health/liveness
+              port: 9090
+              scheme: HTTP
+            periodSeconds: 10
+            timeoutSeconds: 60
       imagePullSecrets:
             - name: registry-secret
             - name: private-registry-secret

diff --git a/internal/chart/testdata/charts/dashboard-traefik-cluster-issuer-shipa.yaml b/internal/chart/testdata/charts/dashboard-traefik-cluster-issuer-shipa.yaml
@@ -179,6 +179,14 @@ spec:
             requests:
               cpu: 5Gi
               memory: 5300m
+          readinessProbe:
+            failureThreshold: 3
+            httpGet:
+              path: /actuator/health/liveness
+              port: 9090
+              scheme: HTTP
+            periodSeconds: 10
+            timeoutSeconds: 60
       imagePullSecrets:
             - name: registry-secret
             - name: private-registry-secret
@@ -235,6 +243,14 @@ spec:
           image: shipasoftware/go-app:v1
           ports:
           - containerPort: 9090
+          readinessProbe:
+            failureThreshold: 3
+            httpGet:
+              path: /actuator/health/liveness
+              port: 9090
+              scheme: HTTP
+            periodSeconds: 10
+            timeoutSeconds: 60
       imagePullSecrets:
             - name: registry-secret
             - name: private-registry-secret

diff --git a/internal/chart/testdata/charts/dashboard-traefik-cluster-issuer.yaml b/internal/chart/testdata/charts/dashboard-traefik-cluster-issuer.yaml
@@ -179,6 +179,14 @@ spec:
             requests:
               cpu: 5Gi
               memory: 5300m
+          readinessProbe:
+            failureThreshold: 3
+            httpGet:
+              path: /actuator/health/liveness
+              port: 9090
+              scheme: HTTP
+            periodSeconds: 10
+            timeoutSeconds: 60
       imagePullSecrets:
             - name: registry-secret
             - name: private-registry-secret
@@ -235,6 +243,14 @@ spec:
           image: shipasoftware/go-app:v1
           ports:
           - containerPort: 9090
+          readinessProbe:
+            failureThreshold: 3
+            httpGet:
+              path: /actuator/health/liveness
+              port: 9090
+              scheme: HTTP
+            periodSeconds: 10
+            timeoutSeconds: 60
       imagePullSecrets:
             - name: registry-secret
             - name: private-registry-secret

diff --git a/internal/chart/testdata/charts/dashboard-traefik.yaml b/internal/chart/testdata/charts/dashboard-traefik.yaml
@@ -179,6 +179,14 @@ spec:
             requests:
               cpu: 5Gi
               memory: 5300m
+          readinessProbe:
+            failureThreshold: 3
+            httpGet:
+              path: /actuator/health/liveness
+              port: 9090
+              scheme: HTTP
+            periodSeconds: 10
+            timeoutSeconds: 60
       imagePullSecrets:
             - name: registry-secret
             - name: private-registry-secret
@@ -235,6 +243,14 @@ spec:
           image: shipasoftware/go-app:v1
           ports:
           - containerPort: 9090
+          readinessProbe:
+            failureThreshold: 3
+            httpGet:
+              path: /actuator/health/liveness
+              port: 9090
+              scheme: HTTP
+            periodSeconds: 10
+            timeoutSeconds: 60
       imagePullSecrets:
             - name: registry-secret
             - name: private-registry-secret

diff --git a/internal/templates/common/yamls/deployment.yaml b/internal/templates/common/yamls/deployment.yaml
@@ -84,6 +84,14 @@ spec:
           securityContext:
 {{ $process.securityContext | toYaml | indent 12 }}
           {{- end }}
+          {{- if $process.readinessProbe }}
+          readinessProbe:
+{{ $process.readinessProbe | toYaml | indent 12 }}
+          {{- end }}
+          {{- if $process.livenessProbe }}
+          livenessProbe:
+{{ $process.livenessProbe | toYaml | indent 12 }}
+          {{- end }}
       {{- if $deployment.imagePullSecrets }}
       imagePullSecrets:
 {{ $deployment.imagePullSecrets | toYaml | indent 12}}