Removed VisualizationServer and MLMD Writer

api/v1alpha1/dspipeline_types.go

@@ -46,9 +46,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
@@ -290,13 +287,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

config/base/kustomization.yaml

@@ -99,13 +99,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
@@ -204,20 +197,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

@@ -752,16 +752,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/manager/manager.yaml

@@ -60,8 +60,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
@@ -78,10 +76,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

@@ -4,10 +4,31 @@ metadata:
   name: sample
 spec:
   dspVersion: v2
+  apiServer:
+    deploy: true
+    image: gcr.io/ml-pipeline/api-server:2.0.2
+  persistenceAgent:
+    deploy: true
+    image: gcr.io/ml-pipeline/persistenceagent:2.0.2
+  scheduledWorkflow:
+    deploy: true
+    image: gcr.io/ml-pipeline/scheduledworkflow: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
+  database:
+    disableHealthCheck: true
+    mariaDB:
+      deploy: true
   objectStorage:
     minio:
+      deploy: true
       image: 'quay.io/opendatahub/minio:RELEASE.2019-08-14T20-37-41Z-license-compliance'
   mlpipelineUI:
     image: gcr.io/ml-pipeline/frontend:2.0.2
   workflowController:
     deploy: true
+    image: gcr.io/ml-pipeline/workflow-controller:v3.3.10-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

@@ -283,11 +283,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

controllers/dspipeline_params.go

@@ -56,7 +56,6 @@ type DSPAParams struct {
 	Minio                                *dspa.Minio
 	MLMD                                 *dspa.MLMD
 	CRDViewer                            *dspa.CRDViewer
-	VisualizationServer                  *dspa.VisualizationServer
 	WorkflowController                   *dspa.WorkflowController
 	DBConnection
 	ObjectStorageConnection
@@ -87,6 +86,10 @@ func (p *DSPAParams) UsingV2Pipelines(dsp *dspa.DataSciencePipelinesApplication)
 	return dsp.Spec.DSPVersion == "v2"
 }
 
+func (p *DSPAParams) UsingV1Pipelines(dsp *dspa.DataSciencePipelinesApplication) bool {
+	return !p.UsingV2Pipelines(dsp)
+}
+
 func (p *DSPAParams) UsingArgoEngineDriver(dsp *dspa.DataSciencePipelinesApplication) bool {
 	return p.UsingV2Pipelines(dsp)
 }
@@ -389,11 +392,10 @@ func (p *DSPAParams) SetupObjectParams(ctx context.Context, dsp *dspa.DataScienc
 
 }
 
-func (p *DSPAParams) SetupMLMD(ctx context.Context, dsp *dspa.DataSciencePipelinesApplication, client client.Client, log logr.Logger) error {
+func (p *DSPAParams) SetupMLMD(dsp *dspa.DataSciencePipelinesApplication) error {
 	if p.MLMD != nil {
 		MlmdEnvoyImagePath := p.GetImageForComponent(dsp, config.MlmdEnvoyImagePath, config.MlmdEnvoyImagePathV2Argo, config.MlmdEnvoyImagePathV2Tekton)
 		MlmdGRPCImagePath := p.GetImageForComponent(dsp, config.MlmdGRPCImagePath, config.MlmdGRPCImagePathV2Argo, config.MlmdGRPCImagePathV2Tekton)
-		MlmdWriterImagePath := p.GetImageForComponent(dsp, config.MlmdWriterImagePath, config.MlmdWriterImagePathV2Argo, config.MlmdWriterImagePathV2Tekton)
 
 		if p.MLMD.Envoy == nil {
 			p.MLMD.Envoy = &dspa.Envoy{
@@ -405,25 +407,31 @@ func (p *DSPAParams) SetupMLMD(ctx context.Context, dsp *dspa.DataSciencePipelin
 				Image: config.GetStringConfigWithDefault(MlmdGRPCImagePath, config.DefaultImageValue),
 			}
 		}
-		if p.MLMD.Writer == nil {
-			p.MLMD.Writer = &dspa.Writer{
-				Image: config.GetStringConfigWithDefault(MlmdWriterImagePath, config.DefaultImageValue),
-			}
-		}
 
 		mlmdEnvoyImageFromConfig := config.GetStringConfigWithDefault(MlmdEnvoyImagePath, config.DefaultImageValue)
 		mlmdGRPCImageFromConfig := config.GetStringConfigWithDefault(MlmdGRPCImagePath, config.DefaultImageValue)
-		mlmdWriterImageFromConfig := config.GetStringConfigWithDefault(MlmdWriterImagePath, config.DefaultImageValue)
 
 		setStringDefault(mlmdEnvoyImageFromConfig, &p.MLMD.Envoy.Image)
 		setStringDefault(mlmdGRPCImageFromConfig, &p.MLMD.GRPC.Image)
-		setStringDefault(mlmdWriterImageFromConfig, &p.MLMD.Writer.Image)
 
 		setResourcesDefault(config.MlmdEnvoyResourceRequirements, &p.MLMD.Envoy.Resources)
 		setResourcesDefault(config.MlmdGRPCResourceRequirements, &p.MLMD.GRPC.Resources)
-		setResourcesDefault(config.MlmdWriterResourceRequirements, &p.MLMD.Writer.Resources)
 
 		setStringDefault(config.MlmdGrpcPort, &p.MLMD.GRPC.Port)
+
+		if p.UsingV1Pipelines(dsp) {
+			MlmdWriterImagePath := config.MlmdWriterImagePath
+
+			if p.MLMD.Writer == nil {
+				p.MLMD.Writer = &dspa.Writer{
+					Image: config.GetStringConfigWithDefault(MlmdWriterImagePath, config.DefaultImageValue),
+				}
+			}
+
+			mlmdWriterImageFromConfig := config.GetStringConfigWithDefault(MlmdWriterImagePath, config.DefaultImageValue)
+			setStringDefault(mlmdWriterImageFromConfig, &p.MLMD.Writer.Image)
+			setResourcesDefault(config.MlmdWriterResourceRequirements, &p.MLMD.Writer.Resources)
+		}
 	}
 	return nil
 }
@@ -519,9 +527,9 @@ func (p *DSPAParams) ExtractParams(ctx context.Context, dsp *dspa.DataSciencePip
 		setResourcesDefault(config.MlPipelineUIResourceRequirements, &p.MlPipelineUI.Resources)
 	}
 
-	// TODO (gfrasca): believe we need to set default VisualizationServer and WorkflowController Images here
+	// TODO (gfrasca): believe we need to set default WorkflowController Images here
 
-	err := p.SetupMLMD(ctx, dsp, client, log)
+	err := p.SetupMLMD(dsp)
 	if err != nil {
 		return err
 	}