Merge pull request opendatahub-io#105 from rimolive/rmartine

Remove ViewerCRD deployment

Author: openshift-merge-robot

README.md

@@ -195,7 +195,6 @@ When a `DataSciencePipelinesApplication` is deployed, the following components a
 * APIServer 
 * Persistence Agent
 * Scheduled Workflow controller
-* Viewer CRD controller
 * MLPipelines UI
 
 If specified in the `DataSciencePipelinesApplication` resource, the following components may also be additionally deployed: 

api/v1alpha1/dspipeline_types.go

@@ -29,8 +29,6 @@ type DSPASpec struct {
 	*PersistenceAgent `json:"persistenceAgent,omitempty"`
 	// +kubebuilder:default:={deploy: true}
 	*ScheduledWorkflow `json:"scheduledWorkflow,omitempty"`
-	// +kubebuilder:default:={deploy: false}
-	*ViewerCRD `json:"viewerCRD,omitempty"`
 	// +kubebuilder:default:={mariaDB: {deploy: true}}
 	*Database `json:"database,omitempty"`
 	// +kubebuilder:validation:Optional
@@ -108,16 +106,6 @@ type ScheduledWorkflow struct {
 	Resources            *ResourceRequirements `json:"resources,omitempty"`
 }
 
-type ViewerCRD struct {
-	// +kubebuilder:default:=false
-	// +kubebuilder:validation:Optional
-	Deploy bool   `json:"deploy"`
-	Image  string `json:"image,omitempty"`
-	// +kubebuilder:default:=50
-	MaxNumViewer int                   `json:"maxNumViewer,omitempty"`
-	Resources    *ResourceRequirements `json:"resources,omitempty"`
-}
-
 type MlPipelineUI struct {
 	// +kubebuilder:default:=true
 	// +kubebuilder:validation:Optional

api/v1alpha1/zz_generated.deepcopy.go

@@ -43,13 +43,6 @@ vars:
       apiVersion: v1
     fieldref:
       fieldpath: data.IMAGES_SCHEDULEDWORKFLOW
-  - name: IMAGES_VIEWERCRD
-    objref:
-      kind: ConfigMap
-      name: dspo-parameters
-      apiVersion: v1
-    fieldref:
-      fieldpath: data.IMAGES_VIEWERCRD
   - name: IMAGES_CACHE
     objref:
       kind: ConfigMap

config/base/kustomization.yaml

@@ -2,7 +2,6 @@ IMAGES_APISERVER=quay.io/opendatahub/ds-pipelines-api-server:main-0e8a011
 IMAGES_ARTIFACT=quay.io/opendatahub/ds-pipelines-artifact-manager:main-0e8a011
 IMAGES_PERSISTENTAGENT=quay.io/opendatahub/ds-pipelines-persistenceagent:main-0e8a011
 IMAGES_SCHEDULEDWORKFLOW=quay.io/opendatahub/ds-pipelines-scheduledworkflow:main-0e8a011
-IMAGES_VIEWERCRD=quay.io/opendatahub/ds-pipelines-viewercontroller:main-0e8a011
 IMAGES_CACHE=registry.access.redhat.com/ubi8/ubi-minimal
 IMAGES_MOVERESULTSIMAGE=registry.access.redhat.com/ubi8/ubi-micro
 IMAGES_MARIADB=registry.redhat.io/rhel8/mariadb-103:1-188

config/base/params.env

@@ -3,7 +3,6 @@ Images:
   Artifact: $(IMAGES_ARTIFACT)
   PersistentAgent: $(IMAGES_PERSISTENTAGENT)
   ScheduledWorkflow: $(IMAGES_SCHEDULEDWORKFLOW)
-  ViewerCRD: $(IMAGES_VIEWERCRD)
   Cache: $(IMAGES_CACHE)
   MoveResultsImage: $(IMAGES_MOVERESULTSIMAGE)
   MariaDB: $(IMAGES_MARIADB)

config/configmaps/files/config.yaml

@@ -494,56 +494,6 @@ spec:
                         type: object
                     type: object
                 type: object
-              viewerCRD:
-                default:
-                  deploy: false
-                properties:
-                  deploy:
-                    default: false
-                    type: boolean
-                  image:
-                    type: string
-                  maxNumViewer:
-                    default: 50
-                    type: integer
-                  resources:
-                    description: ResourceRequirements structures compute resource
-                      requirements. Replaces ResourceRequirements from corev1 which
-                      also includes optional storage field. We handle storage field
-                      separately, and should not include it as a subfield for Resources.
-                    properties:
-                      limits:
-                        properties:
-                          cpu:
-                            anyOf:
-                            - type: integer
-                            - type: string
-                            pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                            x-kubernetes-int-or-string: true
-                          memory:
-                            anyOf:
-                            - type: integer
-                            - type: string
-                            pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                            x-kubernetes-int-or-string: true
-                        type: object
-                      requests:
-                        properties:
-                          cpu:
-                            anyOf:
-                            - type: integer
-                            - type: string
-                            pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                            x-kubernetes-int-or-string: true
-                          memory:
-                            anyOf:
-                            - type: integer
-                            - type: string
-                            pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                            x-kubernetes-int-or-string: true
-                        type: object
-                    type: object
-                type: object
             required:
             - objectStorage
             type: object

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

@@ -2,7 +2,6 @@ resources:
 - bases/datasciencepipelinesapplications.opendatahub.io_datasciencepipelinesapplications.yaml
 # +kubebuilder:scaffold:crdkustomizeresource
 - bases/scheduledworkflows.yaml
-- bases/viewers.yaml
 
 configurations:
 - kustomizeconfig.yaml

config/crd/bases/viewers.yaml

@@ -45,10 +45,6 @@ spec:
             matchLabels:
               app: ds-pipeline-scheduledworkflow-{{.Name}}
               component: data-science-pipelines
-        - podSelector:
-            matchLabels:
-              app: ds-pipeline-viewer-crd-{{.Name}}
-              component: data-science-pipelines
       ports:
         - protocol: TCP
           port: 8888