diff --git a/tests/e2e/sample-applications/mysql-persistent/mysql-persistent-csi.yaml b/tests/e2e/sample-applications/mysql-persistent/mysql-persistent-csi.yaml index 08cbf922f1..5eec6b92d5 100644 --- a/tests/e2e/sample-applications/mysql-persistent/mysql-persistent-csi.yaml +++ b/tests/e2e/sample-applications/mysql-persistent/mysql-persistent-csi.yaml @@ -104,12 +104,40 @@ items: volumeMounts: - name: mysql-data mountPath: /var/lib/mysql + readinessProbe: + exec: + command: + - /usr/bin/timeout + - 1s + - /usr/bin/mysql + - $(MYSQL_DATABASE) + - -h + - 127.0.0.1 + - -u$(MYSQL_USER) + - -p$(MYSQL_PASSWORD) + - -e + - SELECT 1 + initialDelaySeconds: 10 + periodSeconds: 5 + timeoutSeconds: 2 + failureThreshold: 3 livenessProbe: - tcpSocket: - port: mysql + exec: + command: + - /usr/bin/timeout + - 1s + - /usr/bin/mysql + - $(MYSQL_DATABASE) + - -h + - 127.0.0.1 + - -u$(MYSQL_USER) + - -p$(MYSQL_PASSWORD) + - -e + - SELECT 1 initialDelaySeconds: 30 periodSeconds: 10 timeoutSeconds: 5 + failureThreshold: 3 startupProbe: exec: command: @@ -183,6 +211,18 @@ items: ports: - containerPort: 8000 protocol: TCP + livenessProbe: + httpGet: + path: / + port: 8000 + initialDelaySeconds: 30 + periodSeconds: 10 + readinessProbe: + httpGet: + path: / + port: 8000 + initialDelaySeconds: 10 + periodSeconds: 5 initContainers: - name: init-myservice image: docker.io/curlimages/curl:8.5.0 diff --git a/tests/e2e/sample-applications/mysql-persistent/mysql-persistent-twovol-csi.yaml b/tests/e2e/sample-applications/mysql-persistent/mysql-persistent-twovol-csi.yaml index e7b758e271..ee734b7858 100644 --- a/tests/e2e/sample-applications/mysql-persistent/mysql-persistent-twovol-csi.yaml +++ b/tests/e2e/sample-applications/mysql-persistent/mysql-persistent-twovol-csi.yaml @@ -96,12 +96,40 @@ items: volumeMounts: - name: mysql-data mountPath: /var/lib/mysql + readinessProbe: + exec: + command: + - /usr/bin/timeout + - 1s + - /usr/bin/mysql + - $(MYSQL_DATABASE) + - -h + - 127.0.0.1 + - -u$(MYSQL_USER) + - -p$(MYSQL_PASSWORD) + - -e + - SELECT 1 + initialDelaySeconds: 10 + periodSeconds: 5 + timeoutSeconds: 2 + failureThreshold: 3 livenessProbe: - tcpSocket: - port: mysql + exec: + command: + - /usr/bin/timeout + - 1s + - /usr/bin/mysql + - $(MYSQL_DATABASE) + - -h + - 127.0.0.1 + - -u$(MYSQL_USER) + - -p$(MYSQL_PASSWORD) + - -e + - SELECT 1 initialDelaySeconds: 30 periodSeconds: 10 timeoutSeconds: 5 + failureThreshold: 3 startupProbe: exec: command: @@ -174,6 +202,18 @@ items: ports: - containerPort: 8000 protocol: TCP + livenessProbe: + httpGet: + path: / + port: 8000 + initialDelaySeconds: 30 + periodSeconds: 10 + readinessProbe: + httpGet: + path: / + port: 8000 + initialDelaySeconds: 10 + periodSeconds: 5 volumeMounts: - name: applog mountPath: /tmp/log/todoapp/ diff --git a/tests/e2e/sample-applications/mysql-persistent/mysql-persistent.yaml b/tests/e2e/sample-applications/mysql-persistent/mysql-persistent.yaml index d658c9e082..1859efa6ea 100644 --- a/tests/e2e/sample-applications/mysql-persistent/mysql-persistent.yaml +++ b/tests/e2e/sample-applications/mysql-persistent/mysql-persistent.yaml @@ -117,12 +117,40 @@ items: volumeMounts: - name: mysql-data mountPath: /var/lib/mysql - livenessProbe: - tcpSocket: - port: mysql + readinessProbe: + exec: + command: + - /usr/bin/timeout + - 1s + - /usr/bin/mysql + - $(MYSQL_DATABASE) + - -h + - 127.0.0.1 + - -u$(MYSQL_USER) + - -p$(MYSQL_PASSWORD) + - -e + - SELECT 1 initialDelaySeconds: 10 + periodSeconds: 5 + timeoutSeconds: 2 + failureThreshold: 3 + livenessProbe: + exec: + command: + - /usr/bin/timeout + - 1s + - /usr/bin/mysql + - $(MYSQL_DATABASE) + - -h + - 127.0.0.1 + - -u$(MYSQL_USER) + - -p$(MYSQL_PASSWORD) + - -e + - SELECT 1 + initialDelaySeconds: 30 periodSeconds: 10 timeoutSeconds: 5 + failureThreshold: 3 startupProbe: exec: command: @@ -196,6 +224,18 @@ items: ports: - containerPort: 8000 protocol: TCP + livenessProbe: + httpGet: + path: / + port: 8000 + initialDelaySeconds: 30 + periodSeconds: 10 + readinessProbe: + httpGet: + path: / + port: 8000 + initialDelaySeconds: 10 + periodSeconds: 5 initContainers: - name: init-myservice image: docker.io/curlimages/curl:8.5.0