From 393a02bcdecb43a02f5450925ef91a89fb59c221 Mon Sep 17 00:00:00 2001 From: Wesley Hayutin Date: Mon, 18 Mar 2024 11:19:27 -0600 Subject: [PATCH 1/2] update mysql/mongo for 4.15 error on restartPolicy Error: `The Deployment "mysql" is invalid: spec.template.spec.containers[0].restartPolicy: Forbidden: may not be set for non-init containers` --- .../e2e/sample-applications/deprecated/parks-app/manifest.yaml | 1 - .../sample-applications/deprecated/parks-app/manifest4.8.yaml | 3 +-- .../mongo-persistent/mongo-persistent-block.yaml | 1 - .../mongo-persistent/mongo-persistent-csi.yaml | 1 - .../sample-applications/mongo-persistent/mongo-persistent.yaml | 1 - .../mysql-persistent/mysql-persistent-csi.yaml | 1 - .../mysql-persistent/mysql-persistent-twovol-csi.yaml | 1 - .../sample-applications/mysql-persistent/mysql-persistent.yaml | 1 - 8 files changed, 1 insertion(+), 9 deletions(-) diff --git a/tests/e2e/sample-applications/deprecated/parks-app/manifest.yaml b/tests/e2e/sample-applications/deprecated/parks-app/manifest.yaml index 4eb95456241..0409e84ae36 100644 --- a/tests/e2e/sample-applications/deprecated/parks-app/manifest.yaml +++ b/tests/e2e/sample-applications/deprecated/parks-app/manifest.yaml @@ -197,7 +197,6 @@ items: - name: mongodb-data persistentVolumeClaim: claimName: mongodb-data-claim - restartPolicy: Always - kind: Service apiVersion: v1 diff --git a/tests/e2e/sample-applications/deprecated/parks-app/manifest4.8.yaml b/tests/e2e/sample-applications/deprecated/parks-app/manifest4.8.yaml index 9321408d098..4a0b64ed7be 100644 --- a/tests/e2e/sample-applications/deprecated/parks-app/manifest4.8.yaml +++ b/tests/e2e/sample-applications/deprecated/parks-app/manifest4.8.yaml @@ -188,8 +188,7 @@ items: - name: mongodb-data persistentVolumeClaim: claimName: mongodb-data-claim - restartPolicy: Always - + - kind: Service apiVersion: v1 metadata: diff --git a/tests/e2e/sample-applications/mongo-persistent/mongo-persistent-block.yaml b/tests/e2e/sample-applications/mongo-persistent/mongo-persistent-block.yaml index b69d4c66f2b..778b86c69a7 100644 --- a/tests/e2e/sample-applications/mongo-persistent/mongo-persistent-block.yaml +++ b/tests/e2e/sample-applications/mongo-persistent/mongo-persistent-block.yaml @@ -148,7 +148,6 @@ items: timeoutSeconds: 2 successThreshold: 1 failureThreshold: 40 # 40x30sec before restart pod - restartPolicy: Always - image: docker.io/curlimages/curl:8.5.0 name: curl-tool command: ["/bin/sleep", "infinity"] diff --git a/tests/e2e/sample-applications/mongo-persistent/mongo-persistent-csi.yaml b/tests/e2e/sample-applications/mongo-persistent/mongo-persistent-csi.yaml index a4a562ab756..d6e68de7f5f 100644 --- a/tests/e2e/sample-applications/mongo-persistent/mongo-persistent-csi.yaml +++ b/tests/e2e/sample-applications/mongo-persistent/mongo-persistent-csi.yaml @@ -105,7 +105,6 @@ items: timeoutSeconds: 2 successThreshold: 1 failureThreshold: 40 # 40x30sec before restart pod - restartPolicy: Always - image: docker.io/curlimages/curl:8.5.0 name: curl-tool command: ["/bin/sleep", "infinity"] diff --git a/tests/e2e/sample-applications/mongo-persistent/mongo-persistent.yaml b/tests/e2e/sample-applications/mongo-persistent/mongo-persistent.yaml index 6f757a4e07a..758a4d3d747 100644 --- a/tests/e2e/sample-applications/mongo-persistent/mongo-persistent.yaml +++ b/tests/e2e/sample-applications/mongo-persistent/mongo-persistent.yaml @@ -118,7 +118,6 @@ items: timeoutSeconds: 2 successThreshold: 1 failureThreshold: 40 # 40x30sec before restart pod - restartPolicy: Always - image: docker.io/curlimages/curl:8.5.0 name: curl-tool command: ["/bin/sleep", "infinity"] 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 d0eaf9bcc44..08cbf922f15 100644 --- a/tests/e2e/sample-applications/mysql-persistent/mysql-persistent-csi.yaml +++ b/tests/e2e/sample-applications/mysql-persistent/mysql-persistent-csi.yaml @@ -127,7 +127,6 @@ items: timeoutSeconds: 2 successThreshold: 1 failureThreshold: 40 # 40x30sec before restart pod - restartPolicy: Always - image: docker.io/curlimages/curl:8.5.0 name: curl-tool command: ["/bin/sleep", "infinity"] 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 a28062a519d..e7b758e2711 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 @@ -119,7 +119,6 @@ items: timeoutSeconds: 2 successThreshold: 1 failureThreshold: 40 # 40x30sec before restart pod - restartPolicy: Always - image: docker.io/curlimages/curl:8.5.0 name: curl-tool command: ["/bin/sleep", "infinity"] diff --git a/tests/e2e/sample-applications/mysql-persistent/mysql-persistent.yaml b/tests/e2e/sample-applications/mysql-persistent/mysql-persistent.yaml index 755a03aace4..d658c9e0823 100644 --- a/tests/e2e/sample-applications/mysql-persistent/mysql-persistent.yaml +++ b/tests/e2e/sample-applications/mysql-persistent/mysql-persistent.yaml @@ -140,7 +140,6 @@ items: timeoutSeconds: 2 successThreshold: 1 failureThreshold: 40 # 40x30sec before restart pod - restartPolicy: Always - image: docker.io/curlimages/curl:8.5.0 name: curl-tool command: ["/bin/sleep", "infinity"] From b56a044c21423f37723c13c53848ce1f2605e06b Mon Sep 17 00:00:00 2001 From: Wesley Hayutin Date: Mon, 18 Mar 2024 13:00:49 -0600 Subject: [PATCH 2/2] don't change deprecated files --- .../e2e/sample-applications/deprecated/parks-app/manifest.yaml | 1 + .../sample-applications/deprecated/parks-app/manifest4.8.yaml | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/e2e/sample-applications/deprecated/parks-app/manifest.yaml b/tests/e2e/sample-applications/deprecated/parks-app/manifest.yaml index 0409e84ae36..4eb95456241 100644 --- a/tests/e2e/sample-applications/deprecated/parks-app/manifest.yaml +++ b/tests/e2e/sample-applications/deprecated/parks-app/manifest.yaml @@ -197,6 +197,7 @@ items: - name: mongodb-data persistentVolumeClaim: claimName: mongodb-data-claim + restartPolicy: Always - kind: Service apiVersion: v1 diff --git a/tests/e2e/sample-applications/deprecated/parks-app/manifest4.8.yaml b/tests/e2e/sample-applications/deprecated/parks-app/manifest4.8.yaml index 4a0b64ed7be..9321408d098 100644 --- a/tests/e2e/sample-applications/deprecated/parks-app/manifest4.8.yaml +++ b/tests/e2e/sample-applications/deprecated/parks-app/manifest4.8.yaml @@ -188,7 +188,8 @@ items: - name: mongodb-data persistentVolumeClaim: claimName: mongodb-data-claim - + restartPolicy: Always + - kind: Service apiVersion: v1 metadata: