Merge pull request #585 from hbelmiro/RHOAIENG-1720

Fixed the custom-configs sample to not require a secret named mlpipeline-minio-artifact
opendatahub-io · Mar 7, 2024 · a35ad21 · a35ad21
2 parents e6ad27d + 114b60e
commit a35ad21
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 43 deletions.
diff --git a/api/v1alpha1/dspipeline_types.go b/api/v1alpha1/dspipeline_types.go
@@ -330,7 +330,7 @@ type ExternalStorage struct {
 
 type S3CredentialSecret struct {
 	// +kubebuilder:validation:Required
-	// Note: In V2 this value needs to be mlpipeline-minio-artifact
+	// The name of the Secret where the AccessKey and SecretKey are defined.
 	SecretName string `json:"secretName"`
 	// The "Keys" in the k8sSecret key/value pairs. Not to be confused with the values.
 	AccessKey string `json:"accessKey"`

diff --git a/...ses/datasciencepipelinesapplications.opendatahub.io_datasciencepipelinesapplications.yaml b/...ses/datasciencepipelinesapplications.opendatahub.io_datasciencepipelinesapplications.yaml
@@ -541,7 +541,8 @@ spec:
                           secretKey:
                             type: string
                           secretName:
-                            description: 'Note: In V2 this value needs to be mlpipeline-minio-artifact'
+                            description: The name of the Secret where the AccessKey
+                              and SecretKey are defined.
                             type: string
                         required:
                         - accessKey
@@ -636,7 +637,8 @@ spec:
                           secretKey:
                             type: string
                           secretName:
-                            description: 'Note: In V2 this value needs to be mlpipeline-minio-artifact'
+                            description: The name of the Secret where the AccessKey
+                              and SecretKey are defined.
                             type: string
                         required:
                         - accessKey

diff --git a/config/samples/v1/custom-configs/dspa.yaml b/config/samples/v1/custom-configs/dspa.yaml
@@ -5,10 +5,8 @@ metadata:
 spec:
   apiServer:
     deploy: true
-    image: quay.io/modh/odh-ml-pipelines-api-server-container:v1.18.0-8
     applyTektonCustomResource: true
     archiveLogs: false
-    artifactImage: quay.io/modh/odh-ml-pipelines-artifact-manager-container:v1.18.0-8
     cacheImage: registry.access.redhat.com/ubi8/ubi-minimal
     moveResultsImage: busybox
     injectDefaultScript: true
@@ -30,7 +28,6 @@ spec:
         memory: 1Gi
   persistenceAgent:
     deploy: true
-    image: quay.io/modh/odh-ml-pipelines-persistenceagent-container:v1.18.0-8
     numWorkers: 2
     resources:
       requests:
@@ -41,7 +38,6 @@ spec:
         memory: 1Gi
   scheduledWorkflow:
     deploy: true
-    image: quay.io/modh/odh-ml-pipelines-scheduledworkflow-container:v1.18.0-8
     cronScheduleTimezone: UTC
     resources:
       requests:

diff --git a/config/samples/v1/custom-configs/kustomization.yaml b/config/samples/v1/custom-configs/kustomization.yaml
@@ -1,8 +1,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  # mlpipeline-minio-artifact.yaml is required due to https://issues.redhat.com/browse/RHOAIENG-1720
-  - mlpipeline-minio-artifact.yaml
   - dspa.yaml
   - db-creds.yaml
   - artifact_script.yaml

diff --git a/config/samples/v1/custom-configs/mlpipeline-minio-artifact.yaml b/config/samples/v1/custom-configs/mlpipeline-minio-artifact.yaml
diff --git a/config/samples/v2/custom-configs/dspa.yaml b/config/samples/v2/custom-configs/dspa.yaml
@@ -6,7 +6,6 @@ spec:
   dspVersion: v2
   apiServer:
     deploy: true
-    image: gcr.io/ml-pipeline/api-server:2.0.2
     stripEOF: true
     terminateStatus: Cancelled
     trackArtifacts: true
@@ -22,7 +21,6 @@ spec:
         memory: 1Gi
   persistenceAgent:
     deploy: true
-    image: gcr.io/ml-pipeline/persistenceagent:2.0.2
     numWorkers: 2
     resources:
       requests:
@@ -33,7 +31,6 @@ spec:
         memory: 1Gi
   scheduledWorkflow:
     deploy: true
-    image: gcr.io/ml-pipeline/scheduledworkflow:2.0.2
     cronScheduleTimezone: UTC
     resources:
       requests:
@@ -44,7 +41,8 @@ spec:
         memory: 250Mi
   mlpipelineUI:
     deploy: true
-    image: gcr.io/ml-pipeline/frontend:2.0.2
+    # image is required
+    image: quay.io/opendatahub/ds-pipelines-frontend:latest
     resources:
       limits:
         cpu: 100m
@@ -84,6 +82,6 @@ spec:
           cpu: 250m
           memory: 1Gi
       s3CredentialsSecret:
-        secretName: mlpipeline-minio-artifact
+        secretName: teststoragesecret
         accessKey: AWS_ACCESS_KEY_ID
         secretKey: AWS_SECRET_ACCESS_KEY
diff --git a/config/samples/v2/custom-configs/storage-creds.yaml b/config/samples/v2/custom-configs/storage-creds.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: mlpipeline-minio-artifact
+  name: teststoragesecret
   labels:
     opendatahub.io/dashboard: 'true'
     opendatahub.io/managed: 'true'

diff --git a/controllers/dspipeline_params.go b/controllers/dspipeline_params.go
@@ -383,11 +383,6 @@ func (p *DSPAParams) SetupObjectParams(ctx context.Context, dsp *dspa.DataScienc
 			}
 		}
 
-		// TODO: Remove once v2launcher minio secret is parameterized during artifact passing
-		if p.UsingV2Pipelines(dsp) {
-			p.ObjectStorageConnection.CredentialsSecret.SecretName = "mlpipeline-minio-artifact"
-		}
-
 		accessKey, secretKey, err := p.RetrieveOrCreateObjectStoreSecret(ctx, client, p.ObjectStorageConnection.CredentialsSecret, log)
 		if err != nil {
 			return err

diff --git a/controllers/testdata/declarative/case_7/expected/created/apiserver_deployment.yaml b/controllers/testdata/declarative/case_7/expected/created/apiserver_deployment.yaml
@@ -46,7 +46,7 @@ spec:
             - name: ML_PIPELINE_VISUALIZATIONSERVER_SERVICE_PORT
               value: "8888"
             - name: OBJECTSTORECONFIG_CREDENTIALSSECRET
-              value: "mlpipeline-minio-artifact"
+              value: "ds-pipeline-s3-testdsp7"
             - name: OBJECTSTORECONFIG_CREDENTIALSACCESSKEYKEY
               value: "accesskey"
             - name: OBJECTSTORECONFIG_CREDENTIALSSECRETKEYKEY
@@ -59,12 +59,12 @@ spec:
               valueFrom:
                 secretKeyRef:
                   key: "accesskey"
-                  name: "mlpipeline-minio-artifact"
+                  name: "ds-pipeline-s3-testdsp7"
             - name: OBJECTSTORECONFIG_SECRETACCESSKEY
               valueFrom:
                 secretKeyRef:
                   key: "secretkey"
-                  name: "mlpipeline-minio-artifact"
+                  name: "ds-pipeline-s3-testdsp7"
             - name: OBJECTSTORECONFIG_SECURE
               value: "false"
             - name: MINIO_SERVICE_SERVICE_HOST

diff --git a/controllers/testdata/declarative/case_7/expected/created/minio_deployment.yaml b/controllers/testdata/declarative/case_7/expected/created/minio_deployment.yaml
@@ -31,12 +31,12 @@ spec:
               valueFrom:
                 secretKeyRef:
                   key: "accesskey"
-                  name: "mlpipeline-minio-artifact"
+                  name: "ds-pipeline-s3-testdsp7"
             - name: MINIO_SECRET_KEY
               valueFrom:
                 secretKeyRef:
                   key: "secretkey"
-                  name: "mlpipeline-minio-artifact"
+                  name: "ds-pipeline-s3-testdsp7"
           image: minio:test7
           name: minio
           ports:

diff --git a/controllers/testdata/declarative/case_7/expected/created/mlpipelines-ui_deployment.yaml b/controllers/testdata/declarative/case_7/expected/created/mlpipelines-ui_deployment.yaml
@@ -35,12 +35,12 @@ spec:
               valueFrom:
                 secretKeyRef:
                   key: "accesskey"
-                  name: "mlpipeline-minio-artifact"
+                  name: "ds-pipeline-s3-testdsp7"
             - name: MINIO_SECRET_KEY
               valueFrom:
                 secretKeyRef:
                   key: "secretkey"
-                  name: "mlpipeline-minio-artifact"
+                  name: "ds-pipeline-s3-testdsp7"
             - name: ALLOW_CUSTOM_VISUALIZATIONS
               value: "true"
             - name: ARGO_ARCHIVE_LOGS
@@ -57,12 +57,12 @@ spec:
               valueFrom:
                 secretKeyRef:
                   key: "accesskey"
-                  name: "mlpipeline-minio-artifact"
+                  name: "ds-pipeline-s3-testdsp7"
             - name: AWS_SECRET_ACCESS_KEY
               valueFrom:
                 secretKeyRef:
                   key: "secretkey"
-                  name: "mlpipeline-minio-artifact"
+                  name: "ds-pipeline-s3-testdsp7"
             - name: AWS_REGION
               value: "minio"
             - name: AWS_S3_ENDPOINT