From 817de8f1b0577a1d5a747d538c48a8d939e87cae Mon Sep 17 00:00:00 2001
From: Waqar Ahmed <waqarahmedjoyia@live.com>
Date: Sat, 5 Dec 2020 19:26:28 +0500
Subject: [PATCH] Remove liveness/readiness probes

---
 test/nextcloud/2.3.2/questions.yaml           | 22 ---------------
 .../nextcloud/2.3.2/templates/deployment.yaml | 28 -------------------
 test/nextcloud/2.3.2/values.yaml              | 20 +------------
 3 files changed, 1 insertion(+), 69 deletions(-)

diff --git a/test/nextcloud/2.3.2/questions.yaml b/test/nextcloud/2.3.2/questions.yaml
index 979029b6261..ff3cc82e765 100644
--- a/test/nextcloud/2.3.2/questions.yaml
+++ b/test/nextcloud/2.3.2/questions.yaml
@@ -157,14 +157,6 @@ questions:
           schema:
             type: hostpath
 
-  - variable: lifecycle
-    label: "Define container Lifecycle"
-    group: "Container Configuration"
-    schema:
-      type: dict
-      additional_attrs: true
-      attrs: []
-
   - variable: internalDatabase
     label: "REMOVEME"
     schema:
@@ -231,17 +223,3 @@ questions:
       type: dict
       additional_attrs: true
       attrs: []
-
-  - variable: livenessProbe
-    label: "REMOVEME"
-    schema:
-      type: dict
-      additional_attrs: true
-      attrs: []
-
-  - variable: readinessProbe
-    label: "REMOVEME"
-    schema:
-      type: dict
-      additional_attrs: true
-      attrs: []
diff --git a/test/nextcloud/2.3.2/templates/deployment.yaml b/test/nextcloud/2.3.2/templates/deployment.yaml
index 4930131aeb8..e0f1dde442b 100644
--- a/test/nextcloud/2.3.2/templates/deployment.yaml
+++ b/test/nextcloud/2.3.2/templates/deployment.yaml
@@ -82,34 +82,6 @@ spec:
         - name: http
           containerPort: 80
           protocol: TCP
-        {{- if .Values.livenessProbe.enabled }}
-        livenessProbe:
-          httpGet:
-            path: /status.php
-            port: http
-            httpHeaders:
-            - name: Host
-              value: {{ .Values.nextcloud.host | quote }}
-          initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
-          periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
-          timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
-          successThreshold: {{ .Values.livenessProbe.successThreshold }}
-          failureThreshold: {{ .Values.livenessProbe.failureThreshold }}
-        {{- end }}
-        {{- if .Values.readinessProbe.enabled}}
-        readinessProbe:
-          httpGet:
-            path: /status.php
-            port: http
-            httpHeaders:
-            - name: Host
-              value: {{ .Values.nextcloud.host | quote }}
-          initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
-          periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
-          timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
-          successThreshold: {{ .Values.readinessProbe.successThreshold }}
-          failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
-        {{- end }}
         volumeMounts:
         - name: nextcloud-data
           mountPath: /var/www/
diff --git a/test/nextcloud/2.3.2/values.yaml b/test/nextcloud/2.3.2/values.yaml
index 43a7344ef65..73a3d448814 100644
--- a/test/nextcloud/2.3.2/values.yaml
+++ b/test/nextcloud/2.3.2/values.yaml
@@ -168,22 +168,4 @@ cronjob:
   # affinity: {}
 
 service:
-  nodePort: 9000
-
-## Liveness and readiness probe values
-## Ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes
-##
-livenessProbe:
-  enabled: true
-  initialDelaySeconds: 30
-  periodSeconds: 15
-  timeoutSeconds: 5
-  failureThreshold: 3
-  successThreshold: 1
-readinessProbe:
-  enabled: true
-  initialDelaySeconds: 30
-  periodSeconds: 15
-  timeoutSeconds: 5
-  failureThreshold: 3
-  successThreshold: 1
+  nodePort: 9000
\ No newline at end of file