From 3eb5187a3849bc2c965f696feb73d3a77adf71ce Mon Sep 17 00:00:00 2001 From: Giulio Frasca Date: Tue, 5 Sep 2023 17:14:22 -0400 Subject: [PATCH] Fix Functional Tests to handle Secret Creation Behavior changes --- .../case_0/expected/created/apiserver_deployment.yaml | 4 ++-- .../case_2/expected/created/apiserver_deployment.yaml | 4 ++-- .../declarative/case_2/expected/created/minio_deployment.yaml | 4 ++-- .../case_2/expected/created/mlpipelines-ui_deployment.yaml | 4 ++-- .../case_3/expected/not_created/storage_secret.yaml | 2 +- .../case_4/expected/created/apiserver_deployment.yaml | 4 ++-- .../declarative/case_4/expected/created/minio_deployment.yaml | 4 ++-- .../case_4/expected/created/mlpipelines-ui_deployment.yaml | 4 ++-- .../case_5/expected/created/apiserver_deployment.yaml | 4 ++-- .../case_5/expected/created/mlpipelines-ui_deployment.yaml | 4 ++-- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/controllers/testdata/declarative/case_0/expected/created/apiserver_deployment.yaml b/controllers/testdata/declarative/case_0/expected/created/apiserver_deployment.yaml index fa277a796..dfa69e0b1 100644 --- a/controllers/testdata/declarative/case_0/expected/created/apiserver_deployment.yaml +++ b/controllers/testdata/declarative/case_0/expected/created/apiserver_deployment.yaml @@ -78,12 +78,12 @@ spec: valueFrom: secretKeyRef: key: "accesskey" - name: "mlpipeline-minio-artifact" + name: "ds-pipeline-s3-testdsp0" - name: OBJECTSTORECONFIG_SECRETACCESSKEY valueFrom: secretKeyRef: key: "secretkey" - name: "mlpipeline-minio-artifact" + name: "ds-pipeline-s3-testdsp0" - name: OBJECTSTORECONFIG_SECURE value: "false" - name: MINIO_SERVICE_SERVICE_HOST diff --git a/controllers/testdata/declarative/case_2/expected/created/apiserver_deployment.yaml b/controllers/testdata/declarative/case_2/expected/created/apiserver_deployment.yaml index 5c1263828..95aa95cec 100644 --- a/controllers/testdata/declarative/case_2/expected/created/apiserver_deployment.yaml +++ b/controllers/testdata/declarative/case_2/expected/created/apiserver_deployment.yaml @@ -78,12 +78,12 @@ spec: valueFrom: secretKeyRef: key: "accesskey" - name: "mlpipeline-minio-artifact" + name: "ds-pipeline-s3-testdsp2" - name: OBJECTSTORECONFIG_SECRETACCESSKEY valueFrom: secretKeyRef: key: "secretkey" - name: "mlpipeline-minio-artifact" + name: "ds-pipeline-s3-testdsp2" - name: OBJECTSTORECONFIG_SECURE value: "false" - name: MINIO_SERVICE_SERVICE_HOST diff --git a/controllers/testdata/declarative/case_2/expected/created/minio_deployment.yaml b/controllers/testdata/declarative/case_2/expected/created/minio_deployment.yaml index 8bf87f744..c31501585 100644 --- a/controllers/testdata/declarative/case_2/expected/created/minio_deployment.yaml +++ b/controllers/testdata/declarative/case_2/expected/created/minio_deployment.yaml @@ -31,12 +31,12 @@ spec: valueFrom: secretKeyRef: key: "accesskey" - name: "mlpipeline-minio-artifact" + name: "ds-pipeline-s3-testdsp2" - name: MINIO_SECRET_KEY valueFrom: secretKeyRef: key: "secretkey" - name: "mlpipeline-minio-artifact" + name: "ds-pipeline-s3-testdsp2" image: minio:test2 name: minio ports: diff --git a/controllers/testdata/declarative/case_2/expected/created/mlpipelines-ui_deployment.yaml b/controllers/testdata/declarative/case_2/expected/created/mlpipelines-ui_deployment.yaml index 4430c6509..2b3e5d1cb 100644 --- a/controllers/testdata/declarative/case_2/expected/created/mlpipelines-ui_deployment.yaml +++ b/controllers/testdata/declarative/case_2/expected/created/mlpipelines-ui_deployment.yaml @@ -35,12 +35,12 @@ spec: valueFrom: secretKeyRef: key: "accesskey" - name: "mlpipeline-minio-artifact" + name: "ds-pipeline-s3-testdsp2" - name: MINIO_SECRET_KEY valueFrom: secretKeyRef: key: "secretkey" - name: "mlpipeline-minio-artifact" + name: "ds-pipeline-s3-testdsp2" - name: ALLOW_CUSTOM_VISUALIZATIONS value: "true" - name: ARGO_ARCHIVE_LOGS diff --git a/controllers/testdata/declarative/case_3/expected/not_created/storage_secret.yaml b/controllers/testdata/declarative/case_3/expected/not_created/storage_secret.yaml index a1baf725b..6cc5af7a5 100644 --- a/controllers/testdata/declarative/case_3/expected/not_created/storage_secret.yaml +++ b/controllers/testdata/declarative/case_3/expected/not_created/storage_secret.yaml @@ -2,7 +2,7 @@ kind: Secret apiVersion: v1 metadata: # todo: remove todo- this should actually be checked for but causes failures because previous tests don't clean up properly - name: todo-mlpipeline-minio-artifact + name: todo-ds-pipeline-s3-testdsp3 namespace: namespace3 labels: app: minio-extrenal-storage diff --git a/controllers/testdata/declarative/case_4/expected/created/apiserver_deployment.yaml b/controllers/testdata/declarative/case_4/expected/created/apiserver_deployment.yaml index 94524294c..f91af974c 100644 --- a/controllers/testdata/declarative/case_4/expected/created/apiserver_deployment.yaml +++ b/controllers/testdata/declarative/case_4/expected/created/apiserver_deployment.yaml @@ -78,12 +78,12 @@ spec: valueFrom: secretKeyRef: key: "accesskey" - name: "mlpipeline-minio-artifact" + name: "ds-pipeline-s3-testdsp4" - name: OBJECTSTORECONFIG_SECRETACCESSKEY valueFrom: secretKeyRef: key: "secretkey" - name: "mlpipeline-minio-artifact" + name: "ds-pipeline-s3-testdsp4" - name: OBJECTSTORECONFIG_SECURE value: "false" - name: MINIO_SERVICE_SERVICE_HOST diff --git a/controllers/testdata/declarative/case_4/expected/created/minio_deployment.yaml b/controllers/testdata/declarative/case_4/expected/created/minio_deployment.yaml index df5699578..0ea9304b2 100644 --- a/controllers/testdata/declarative/case_4/expected/created/minio_deployment.yaml +++ b/controllers/testdata/declarative/case_4/expected/created/minio_deployment.yaml @@ -31,12 +31,12 @@ spec: valueFrom: secretKeyRef: key: "accesskey" - name: "mlpipeline-minio-artifact" + name: "ds-pipeline-s3-testdsp4" - name: MINIO_SECRET_KEY valueFrom: secretKeyRef: key: "secretkey" - name: "mlpipeline-minio-artifact" + name: "ds-pipeline-s3-testdsp4" image: this-minio-image-from-cr-should-be-used:test4 name: minio ports: diff --git a/controllers/testdata/declarative/case_4/expected/created/mlpipelines-ui_deployment.yaml b/controllers/testdata/declarative/case_4/expected/created/mlpipelines-ui_deployment.yaml index 131b3cca3..15a5bdb5f 100644 --- a/controllers/testdata/declarative/case_4/expected/created/mlpipelines-ui_deployment.yaml +++ b/controllers/testdata/declarative/case_4/expected/created/mlpipelines-ui_deployment.yaml @@ -35,12 +35,12 @@ spec: valueFrom: secretKeyRef: key: "accesskey" - name: "mlpipeline-minio-artifact" + name: "ds-pipeline-s3-testdsp4" - name: MINIO_SECRET_KEY valueFrom: secretKeyRef: key: "secretkey" - name: "mlpipeline-minio-artifact" + name: "ds-pipeline-s3-testdsp4" - name: ALLOW_CUSTOM_VISUALIZATIONS value: "true" - name: ARGO_ARCHIVE_LOGS diff --git a/controllers/testdata/declarative/case_5/expected/created/apiserver_deployment.yaml b/controllers/testdata/declarative/case_5/expected/created/apiserver_deployment.yaml index 92f6ac5b9..a34471f70 100644 --- a/controllers/testdata/declarative/case_5/expected/created/apiserver_deployment.yaml +++ b/controllers/testdata/declarative/case_5/expected/created/apiserver_deployment.yaml @@ -78,12 +78,12 @@ spec: valueFrom: secretKeyRef: key: "accesskey" - name: "mlpipeline-minio-artifact" + name: "ds-pipeline-s3-testdsp5" - name: OBJECTSTORECONFIG_SECRETACCESSKEY valueFrom: secretKeyRef: key: "secretkey" - name: "mlpipeline-minio-artifact" + name: "ds-pipeline-s3-testdsp5" - name: OBJECTSTORECONFIG_SECURE value: "false" - name: MINIO_SERVICE_SERVICE_HOST diff --git a/controllers/testdata/declarative/case_5/expected/created/mlpipelines-ui_deployment.yaml b/controllers/testdata/declarative/case_5/expected/created/mlpipelines-ui_deployment.yaml index da6900631..5d8c14e0a 100644 --- a/controllers/testdata/declarative/case_5/expected/created/mlpipelines-ui_deployment.yaml +++ b/controllers/testdata/declarative/case_5/expected/created/mlpipelines-ui_deployment.yaml @@ -35,12 +35,12 @@ spec: valueFrom: secretKeyRef: key: "accesskey" - name: "mlpipeline-minio-artifact" + name: "ds-pipeline-s3-testdsp5" - name: MINIO_SECRET_KEY valueFrom: secretKeyRef: key: "secretkey" - name: "mlpipeline-minio-artifact" + name: "ds-pipeline-s3-testdsp5" - name: ALLOW_CUSTOM_VISUALIZATIONS value: "true" - name: ARGO_ARCHIVE_LOGS