Merge branch 'dspv2' into dspv2-merge

api/v1alpha1/dspipeline_types.go

@@ -45,9 +45,6 @@ type DSPASpec struct {
 	// +kubebuilder:default:={deploy: false}
 	*CRDViewer `json:"crdviewer"`
 	// +kubebuilder:validation:Optional
-	// +kubebuilder:default:={deploy: false}
-	*VisualizationServer `json:"visualizationServer"`
-	// +kubebuilder:validation:Optional
 	// +kubebuilder:default:="v1"
 	DSPVersion string `json:"dspVersion,omitempty"`
 	// WorkflowController is an argo-specific component that manages a DSPA's Workflow objects and handles the orchestration of them with the central Argo server
@@ -295,13 +292,6 @@ type CRDViewer struct {
 	Image  string `json:"image,omitempty"`
 }
 
-type VisualizationServer struct {
-	// +kubebuilder:default:=true
-	// +kubebuilder:validation:Optional
-	Deploy bool   `json:"deploy"`
-	Image  string `json:"image,omitempty"`
-}
-
 type WorkflowController struct {
 	// +kubebuilder:default:=true
 	// +kubebuilder:validation:Optional
@@ -336,6 +326,7 @@ type ExternalStorage struct {
 
 type S3CredentialSecret struct {
 	// +kubebuilder:validation:Required
+	// Note: In V2 this value needs to be mlpipeline-minio-artifact
 	SecretName string `json:"secretName"`
 	// The "Keys" in the k8sSecret key/value pairs. Not to be confused with the values.
 	AccessKey string `json:"accessKey"`

config/base/kustomization.yaml

@@ -98,13 +98,6 @@ vars:
       apiVersion: v1
     fieldref:
       fieldpath: data.IMAGES_CRDVIEWER
-  - name: IMAGES_VISUALIZATIONSERVER
-    objref:
-      kind: ConfigMap
-      name: dspo-parameters
-      apiVersion: v1
-    fieldref:
-      fieldpath: data.IMAGES_VISUALIZATIONSERVER
   - name: IMAGES_DSPO
     objref:
       kind: ConfigMap
@@ -203,20 +196,6 @@ vars:
       apiVersion: v1
     fieldref:
       fieldpath: data.IMAGESV2_ARGO_MLMDGRPC
-  - name: IMAGESV2_ARGO_MLMDWRITER
-    objref:
-      kind: ConfigMap
-      name: dspo-parameters
-      apiVersion: v1
-    fieldref:
-      fieldpath: data.IMAGESV2_ARGO_MLMDWRITER
-  - name: IMAGESV2_ARGO_VISUALIZATIONSERVER
-    objref:
-      kind: ConfigMap
-      name: dspo-parameters
-      apiVersion: v1
-    fieldref:
-      fieldpath: data.IMAGESV2_ARGO_VISUALIZATIONSERVER
   - name: IMAGESV2_ARGO_WORKFLOWCONTROLLER
     objref:
       kind: ConfigMap

config/base/params.env

@@ -11,7 +11,6 @@ IMAGES_MOVERESULTSIMAGE=registry.access.redhat.com/ubi8/ubi-micro:8.8
 IMAGES_MARIADB=registry.redhat.io/rhel8/mariadb-103:1
 IMAGES_OAUTHPROXY=registry.redhat.io/openshift4/ose-oauth-proxy@sha256:ab112105ac37352a2a4916a39d6736f5db6ab4c29bad4467de8d613e80e9bb33
 IMAGES_CRDVIEWER=gcr.io/ml-pipeline/viewer-crd-controller:2.0.0-rc.2
-IMAGES_VISUALIZATIONSERVER=gcr.io/ml-pipeline/visualization-server:2.0.0-rc.2
 IMAGESV2_ARGO_APISERVER=gcr.io/ml-pipeline/api-server:2.0.2
 IMAGESV2_ARGO_ARTIFACT=quay.io/opendatahub/ds-pipelines-artifact-manager:main
 IMAGESV2_ARGO_PERSISTENCEAGENT=gcr.io/ml-pipeline/persistenceagent:2.0.2
@@ -21,7 +20,6 @@ IMAGESV2_ARGO_MLMDGRPC=gcr.io/tfx-oss-public/ml_metadata_store_server:1.14.0
 IMAGESV2_ARGO_MLMDWRITER=gcr.io/ml-pipeline/metadata-writer:2.0.2
 IMAGESV2_ARGO_CACHE=registry.access.redhat.com/ubi8/ubi-minimal:8.7
 IMAGESV2_ARGO_MOVERESULTSIMAGE=registry.access.redhat.com/ubi8/ubi-micro:8.7
-IMAGESV2_ARGO_VISUALIZATIONSERVER=gcr.io/ml-pipeline/visualization-server:2.0.2
 IMAGESV2_ARGO_WORKFLOWCONTROLLER=gcr.io/ml-pipeline/workflow-controller:v3.3.10-license-compliance
 ZAP_LOG_LEVEL=info
 MAX_CONCURRENT_RECONCILES=10

config/configmaps/files/config.yaml

@@ -11,7 +11,6 @@ Images:
   MlmdGRPC: $(IMAGES_MLMDGRPC)
   MlmdWriter: $(IMAGES_MLMDWRITER)
   CRDViewer: $(IMAGES_CRDVIEWER)
-  VisualizationServer: $(IMAGES_VISUALIZATIONSERVER)
 ImagesV2:
   Argo:
     ApiServer: $(IMAGESV2_ARGO_APISERVER)
@@ -22,8 +21,6 @@ ImagesV2:
     ScheduledWorkflow: $(IMAGESV2_ARGO_SCHEDULEDWORKFLOW)
     MlmdEnvoy: $(IMAGESV2_ARGO_MLMDENVOY)
     MlmdGRPC: $(IMAGESV2_ARGO_MLMDGRPC)
-    MlmdWriter: $(IMAGESV2_ARGO_MLMDWRITER)
-    VisualizationServer: $(IMAGES_ARGO_VISUALIZATIONSERVER)
     WorkflowController: $(IMAGESV2_ARGO_WORKFLOWCONTROLLER)
 DSPO:
   HealthCheck:

config/crd/bases/datasciencepipelinesapplications.opendatahub.io_datasciencepipelinesapplications.yaml

@@ -537,6 +537,7 @@ spec:
                           secretKey:
                             type: string
                           secretName:
+                            description: 'Note: In V2 this value needs to be mlpipeline-minio-artifact'
                             type: string
                         required:
                         - accessKey
@@ -631,6 +632,7 @@ spec:
                           secretKey:
                             type: string
                           secretName:
+                            description: 'Note: In V2 this value needs to be mlpipeline-minio-artifact'
                             type: string
                         required:
                         - accessKey
@@ -756,16 +758,6 @@ spec:
                         type: object
                     type: object
                 type: object
-              visualizationServer:
-                default:
-                  deploy: false
-                properties:
-                  deploy:
-                    default: true
-                    type: boolean
-                  image:
-                    type: string
-                type: object
               workflowController:
                 default:
                   deploy: false

config/internal/apiserver/sample-pipeline/sample-pipeline.yaml.tmpl

@@ -238,10 +238,13 @@ data:
         inputDefinitions:
           parameters:
             min_max_scaler:
+              defaultValue: true
               parameterType: BOOLEAN
             neighbors:
+              defaultValue: 3
               parameterType: NUMBER_INTEGER
             standard_scaler:
+              defaultValue: false
               parameterType: BOOLEAN
         outputDefinitions:
           artifacts:

config/manager/manager.yaml

@@ -61,8 +61,6 @@ spec:
             value: $(IMAGES_MLMDWRITER)
           - name: IMAGES_CRDVIEWER
             value: $(IMAGES_CRDVIEWER)
-          - name: IMAGES_VISUALIZATIONSERVER
-            value: $(IMAGES_VISUALIZATIONSERVER)
           - name: IMAGESV2_ARGO_APISERVER
             value: $(IMAGESV2_ARGO_APISERVER)
           - name: IMAGESV2_ARGO_ARTIFACT
@@ -79,10 +77,6 @@ spec:
             value: $(IMAGESV2_ARGO_MLMDENVOY)
           - name: IMAGESV2_ARGO_MLMDGRPC
             value: $(IMAGESV2_ARGO_MLMDGRPC)
-          - name: IMAGESV2_ARGO_MLMDWRITER
-            value: $(IMAGESV2_ARGO_MLMDWRITER)
-          - name: IMAGESV2_ARGO_VISUALIZATIONSERVER
-            value: $(IMAGESV2_ARGO_VISUALIZATIONSERVER)
           - name: IMAGESV2_ARGO_WORKFLOWCONTROLLER
             value: $(IMAGESV2_ARGO_WORKFLOWCONTROLLER)
           - name: ZAP_LOG_LEVEL

config/samples/dspa_simple_v2.yaml

@@ -13,23 +13,17 @@ spec:
   scheduledWorkflow:
     deploy: true
     image: gcr.io/ml-pipeline/scheduledworkflow:2.0.2
-  visualizationServer:
-    deploy: true
-    image: gcr.io/ml-pipeline/visualization-server:2.0.2
   mlmd:
     deploy: true
     grpc:
       image: gcr.io/tfx-oss-public/ml_metadata_store_server:1.14.0
     envoy:
       image: gcr.io/ml-pipeline/metadata-envoy:2.0.2
-    writer:
-      image: gcr.io/ml-pipeline/metadata-writer:2.0.2
   database:
     disableHealthCheck: true
     mariaDB:
       deploy: true
   objectStorage:
-    disableHealthCheck: true
     minio:
       deploy: true
       image: 'quay.io/opendatahub/minio:RELEASE.2019-08-14T20-37-41Z-license-compliance'

controllers/config/defaults.go

@@ -86,7 +86,6 @@ const (
 	ScheduledWorkflowImagePathV2Argo    = "ImagesV2.Argo.ScheduledWorkflow"
 	MlmdEnvoyImagePathV2Argo            = "ImagesV2.Argo.MlmdEnvoy"
 	MlmdGRPCImagePathV2Argo             = "ImagesV2.Argo.MlmdGRPC"
-	MlmdWriterImagePathV2Argo           = "ImagesV2.Argo.MlmdWriter"
 )
 
 // DSPV2-Tekton Image Paths
@@ -101,7 +100,6 @@ const (
 	ScheduledWorkflowImagePathV2Tekton    = "ImagesV2.Tekton.ScheduledWorkflow"
 	MlmdEnvoyImagePathV2Tekton            = "ImagesV2.Tekton.MlmdEnvoy"
 	MlmdGRPCImagePathV2Tekton             = "ImagesV2.Tekton.MlmdGRPC"
-	MlmdWriterImagePathV2Tekton           = "ImagesV2.Tekton.MlmdWriter"
 )
 
 // DSPA Status Condition Types

controllers/dspipeline_controller.go

@@ -292,11 +292,6 @@ func (r *DSPAReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.
 			return ctrl.Result{}, err
 		}
 
-		err = r.ReconcileVisualizationServer(dspa, params)
-		if err != nil {
-			return ctrl.Result{}, err
-		}
-
 		err = r.ReconcileWorkflowController(dspa, params)
 		if err != nil {
 			return ctrl.Result{}, err