remove v1

Signed-off-by: Humair Khan <HumairAK@users.noreply.github.com>
opendatahub-io · Oct 1, 2024 · 441fd55 · 441fd55
1 parent c41fcd9
commit 441fd55
Show file tree

Hide file tree

Showing 154 changed files with 771 additions and 5,935 deletions.
diff --git a/api/v1alpha1/dspipeline_types.go b/api/v1alpha1/dspipeline_types.go
@@ -42,7 +42,7 @@ type DSPASpec struct {
 	*ObjectStorage `json:"objectStorage"`
 	*MLMD          `json:"mlmd,omitempty"`
 	// +kubebuilder:validation:Optional
-	// +kubebuilder:default:="v1"
+	// +kubebuilder:default:="v2"
 	DSPVersion string `json:"dspVersion,omitempty"`
 
 	// PodToPodTLS Set to "true" or "false" to enable or disable TLS communication between DSPA components (pods). Defaults to "true" to enable TLS between all pods. Only supported in DSP V2 on OpenShift.
@@ -99,59 +99,6 @@ type APIServer struct {
 	// +kubebuilder:validation:Optional
 	CustomKfpLauncherConfigMap string `json:"customKfpLauncherConfigMap,omitempty"`
 
-	// Default: true
-	// Deprecated: DSP V1 only, will be removed in the future.
-	// +kubebuilder:default:=true
-	// +kubebuilder:validation:Optional
-	ApplyTektonCustomResource bool `json:"applyTektonCustomResource"`
-	// Default: false
-	// Deprecated: DSP V1 only, will be removed in the future.
-	// +kubebuilder:default:=false
-	// +kubebuilder:validation:Optional
-	ArchiveLogs bool `json:"archiveLogs"`
-	// Deprecated: DSP V1 only, will be removed in the future.
-	ArtifactImage string `json:"artifactImage,omitempty"`
-	// Deprecated: DSP V1 only, will be removed in the future.
-	CacheImage string `json:"cacheImage,omitempty"`
-	// Image used for internal artifact passing handling within Tekton taskruns. This field specifies the image used in the 'move-all-results-to-tekton-home' step.
-	// Deprecated: DSP V1 only, will be removed in the future.
-	MoveResultsImage string `json:"moveResultsImage,omitempty"`
-	// Deprecated: DSP V1 only, will be removed in the future.
-	ArtifactScriptConfigMap *ScriptConfigMap `json:"artifactScriptConfigMap,omitempty"`
-	// Inject the archive step script. Default: true
-	// Deprecated: DSP V1 only, will be removed in the future.
-	// +kubebuilder:default:=true
-	// +kubebuilder:validation:Optional
-	InjectDefaultScript bool `json:"injectDefaultScript"`
-	// Default: true
-	// Deprecated: DSP V1 only, will be removed in the future.
-	// +kubebuilder:default:=true
-	// +kubebuilder:validation:Optional
-	StripEOF bool `json:"stripEOF"`
-	// Default: "Cancelled" - Allowed Values: "Cancelled", "StoppedRunFinally", "CancelledRunFinally"
-	// Deprecated: DSP V1 only, will be removed in the future.
-	// +kubebuilder:validation:Enum=Cancelled;StoppedRunFinally;CancelledRunFinally
-	// +kubebuilder:default:=Cancelled
-	TerminateStatus string `json:"terminateStatus,omitempty"`
-	// Default: true
-	// Deprecated: DSP V1 only, will be removed in the future.
-	// +kubebuilder:default:=true
-	// +kubebuilder:validation:Optional
-	TrackArtifacts bool `json:"trackArtifacts"`
-	// Default: 120
-	// Deprecated: DSP V1 only, will be removed in the future.
-	// +kubebuilder:default:=120
-	DBConfigConMaxLifetimeSec int `json:"dbConfigConMaxLifetimeSec,omitempty"`
-	// Default: true
-	// Deprecated: DSP V1 only, will be removed in the future.
-	// +kubebuilder:default:=true
-	// +kubebuilder:validation:Optional
-	CollectMetrics bool `json:"collectMetrics"`
-	// Default: true
-	// Deprecated: DSP V1 only, will be removed in the future.
-	// +kubebuilder:default:=true
-	// +kubebuilder:validation:Optional
-	AutoUpdatePipelineDefaultVersion bool `json:"autoUpdatePipelineDefaultVersion"`
 	// This is the path where the ca bundle will be mounted in the
 	// pipeline server and user executor pods
 	// +kubebuilder:validation:Optional
@@ -325,8 +272,6 @@ type MLMD struct {
 	Deploy bool `json:"deploy"`
 	*Envoy `json:"envoy,omitempty"`
 	*GRPC  `json:"grpc,omitempty"`
-	// Deprecated: DSP V1 only, will be removed in the future.
-	*Writer `json:"writer,omitempty"`
 }
 
 type Envoy struct {

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/config/base/kustomization.yaml b/config/base/kustomization.yaml
@@ -17,90 +17,93 @@ configMapGenerator:
     envs:
       - params.env
 vars:
-  - name: IMAGES_APISERVER
+  # Images
+  - name: IMAGES_DSPO
     objref:
       kind: ConfigMap
       name: dspo-parameters
       apiVersion: v1
     fieldref:
-      fieldpath: data.IMAGES_APISERVER
-  - name: IMAGES_ARTIFACT
+      fieldpath: data.IMAGES_DSPO
+  - name: IMAGES_APISERVER
     objref:
       kind: ConfigMap
       name: dspo-parameters
       apiVersion: v1
     fieldref:
-      fieldpath: data.IMAGES_ARTIFACT
+      fieldpath: data.IMAGES_APISERVER
   - name: IMAGES_OAUTHPROXY
     objref:
       kind: ConfigMap
       name: dspo-parameters
       apiVersion: v1
     fieldref:
       fieldpath: data.IMAGES_OAUTHPROXY
-  - name: IMAGES_PERSISTENTAGENT
+  - name: IMAGES_PERSISTENCEAGENT
     objref:
       kind: ConfigMap
       name: dspo-parameters
       apiVersion: v1
     fieldref:
-      fieldpath: data.IMAGES_PERSISTENTAGENT
+      fieldpath: data.IMAGES_PERSISTENCEAGENT
   - name: IMAGES_SCHEDULEDWORKFLOW
     objref:
       kind: ConfigMap
       name: dspo-parameters
       apiVersion: v1
     fieldref:
       fieldpath: data.IMAGES_SCHEDULEDWORKFLOW
-  - name: IMAGES_CACHE
+  - name: IMAGES_MARIADB
     objref:
       kind: ConfigMap
       name: dspo-parameters
       apiVersion: v1
     fieldref:
-      fieldpath: data.IMAGES_CACHE
-  - name: IMAGES_MOVERESULTSIMAGE
+      fieldpath: data.IMAGES_MARIADB
+  - name: IMAGES_MLMDENVOY
     objref:
       kind: ConfigMap
       name: dspo-parameters
       apiVersion: v1
     fieldref:
-      fieldpath: data.IMAGES_MOVERESULTSIMAGE
-  - name: IMAGES_MARIADB
+      fieldpath: data.IMAGES_MLMDENVOY
+  - name: IMAGES_MLMDGRPC
     objref:
       kind: ConfigMap
       name: dspo-parameters
       apiVersion: v1
     fieldref:
-      fieldpath: data.IMAGES_MARIADB
-  - name: IMAGES_MLMDENVOY
+      fieldpath: data.IMAGES_MLMDGRPC
+  - name: IMAGES_LAUNCHER
     objref:
       kind: ConfigMap
       name: dspo-parameters
       apiVersion: v1
     fieldref:
-      fieldpath: data.IMAGES_MLMDENVOY
-  - name: IMAGES_MLMDGRPC
+      fieldpath: data.IMAGES_LAUNCHER
+  - name: IMAGES_DRIVER
     objref:
       kind: ConfigMap
       name: dspo-parameters
       apiVersion: v1
     fieldref:
-      fieldpath: data.IMAGES_MLMDGRPC
-  - name: IMAGES_MLMDWRITER
+      fieldpath: data.IMAGES_DRIVER
+  - name: IMAGES_ARGO_EXEC
     objref:
       kind: ConfigMap
       name: dspo-parameters
       apiVersion: v1
     fieldref:
-      fieldpath: data.IMAGES_MLMDWRITER
-  - name: IMAGES_DSPO
+      fieldpath: data.IMAGES_ARGO_EXEC
+  - name: IMAGES_ARGO_WORKFLOWCONTROLLER
     objref:
       kind: ConfigMap
       name: dspo-parameters
       apiVersion: v1
     fieldref:
-      fieldpath: data.IMAGES_DSPO
+      fieldpath: data.IMAGES_ARGO_WORKFLOWCONTROLLER
+
+  # DSPO level configs
   - name: ZAP_LOG_LEVEL
     objref:
       kind: ConfigMap
@@ -136,69 +139,6 @@ vars:
       apiVersion: v1
     fieldref:
       fieldpath: data.DSPO_HEALTHCHECK_OBJECTSTORE_CONNECTIONTIMEOUT
-  - name: IMAGESV2_ARGO_APISERVER
-    objref:
-      kind: ConfigMap
-      name: dspo-parameters
-      apiVersion: v1
-    fieldref:
-      fieldpath: data.IMAGESV2_ARGO_APISERVER
-  - name: IMAGESV2_ARGO_PERSISTENCEAGENT
-    objref:
-      kind: ConfigMap
-      name: dspo-parameters
-      apiVersion: v1
-    fieldref:
-      fieldpath: data.IMAGESV2_ARGO_PERSISTENCEAGENT
-  - name: IMAGESV2_ARGO_SCHEDULEDWORKFLOW
-    objref:
-      kind: ConfigMap
-      name: dspo-parameters
-      apiVersion: v1
-    fieldref:
-      fieldpath: data.IMAGESV2_ARGO_SCHEDULEDWORKFLOW
-  - name: IMAGESV2_ARGO_MLMDENVOY
-    objref:
-      kind: ConfigMap
-      name: dspo-parameters
-      apiVersion: v1
-    fieldref:
-      fieldpath: data.IMAGESV2_ARGO_MLMDENVOY
-  - name: IMAGESV2_ARGO_MLMDGRPC
-    objref:
-      kind: ConfigMap
-      name: dspo-parameters
-      apiVersion: v1
-    fieldref:
-      fieldpath: data.IMAGESV2_ARGO_MLMDGRPC
-  - name: IMAGESV2_ARGO_ARGOEXEC
-    objref:
-      kind: ConfigMap
-      name: dspo-parameters
-      apiVersion: v1
-    fieldref:
-      fieldpath: data.IMAGESV2_ARGO_ARGOEXEC
-  - name: IMAGESV2_ARGO_WORKFLOWCONTROLLER
-    objref:
-      kind: ConfigMap
-      name: dspo-parameters
-      apiVersion: v1
-    fieldref:
-      fieldpath: data.IMAGESV2_ARGO_WORKFLOWCONTROLLER
-  - name: V2_LAUNCHER_IMAGE
-    objref:
-      kind: ConfigMap
-      name: dspo-parameters
-      apiVersion: v1
-    fieldref:
-      fieldpath: data.V2_LAUNCHER_IMAGE
-  - name: V2_DRIVER_IMAGE
-    objref:
-      kind: ConfigMap
-      name: dspo-parameters
-      apiVersion: v1
-    fieldref:
-      fieldpath: data.V2_DRIVER_IMAGE
   - name: DSPO_APISERVER_INCLUDE_OWNERREFERENCE
     objref:
       kind: ConfigMap

diff --git a/config/base/params.env b/config/base/params.env
@@ -1,24 +1,15 @@
-IMAGES_APISERVER=quay.io/opendatahub/ds-pipelines-api-server:v1.6.3
-IMAGES_ARTIFACT=quay.io/opendatahub/ds-pipelines-artifact-manager:v1.6.3
-IMAGES_PERSISTENTAGENT=quay.io/opendatahub/ds-pipelines-persistenceagent:v1.6.3
-IMAGES_SCHEDULEDWORKFLOW=quay.io/opendatahub/ds-pipelines-scheduledworkflow:v1.6.3
-IMAGES_MLMDENVOY=quay.io/opendatahub/ds-pipelines-metadata-envoy:v1.6.3
-IMAGES_MLMDGRPC=quay.io/opendatahub/ds-pipelines-metadata-grpc:v1.6.3
-IMAGES_MLMDWRITER=quay.io/opendatahub/ds-pipelines-metadata-writer:v1.6.3
 IMAGES_DSPO=quay.io/opendatahub/data-science-pipelines-operator:latest
-V2_LAUNCHER_IMAGE=quay.io/opendatahub/ds-pipelines-launcher:latest
-V2_DRIVER_IMAGE=quay.io/opendatahub/ds-pipelines-driver:latest
-IMAGESV2_ARGO_APISERVER=quay.io/opendatahub/ds-pipelines-api-server:latest
-IMAGESV2_ARGO_PERSISTENCEAGENT=quay.io/opendatahub/ds-pipelines-persistenceagent:latest
-IMAGESV2_ARGO_SCHEDULEDWORKFLOW=quay.io/opendatahub/ds-pipelines-scheduledworkflow:latest
-IMAGESV2_ARGO_WORKFLOWCONTROLLER=quay.io/opendatahub/ds-pipelines-argo-workflowcontroller:3.3.10-upstream
-IMAGESV2_ARGO_ARGOEXEC=quay.io/opendatahub/ds-pipelines-argo-argoexec:3.3.10-upstream
-IMAGESV2_ARGO_MLMDGRPC=quay.io/opendatahub/mlmd-grpc-server:latest
-IMAGESV2_ARGO_MLMDENVOY=registry.redhat.io/openshift-service-mesh/proxyv2-rhel8@sha256:a744c1b386fd5e4f94e43543e829df1bfdd1b564137917372a11da06872f4bcb
+IMAGES_APISERVER=quay.io/opendatahub/ds-pipelines-api-server:latest
+IMAGES_PERSISTENCEAGENT=quay.io/opendatahub/ds-pipelines-persistenceagent:latest
+IMAGES_SCHEDULEDWORKFLOW=quay.io/opendatahub/ds-pipelines-scheduledworkflow:latest
+IMAGES_ARGO_EXEC=quay.io/opendatahub/ds-pipelines-argo-argoexec:3.3.10-upstream
+IMAGES_ARGO_WORKFLOWCONTROLLER=quay.io/opendatahub/ds-pipelines-argo-workflowcontroller:3.3.10-upstream
+IMAGES_LAUNCHER=quay.io/opendatahub/ds-pipelines-launcher:latest
+IMAGES_DRIVER=quay.io/opendatahub/ds-pipelines-driver:latest
+IMAGES_MLMDGRPC=quay.io/opendatahub/mlmd-grpc-server:latest
+IMAGES_MLMDENVOY=registry.redhat.io/openshift-service-mesh/proxyv2-rhel8@sha256:a744c1b386fd5e4f94e43543e829df1bfdd1b564137917372a11da06872f4bcb
 IMAGES_MARIADB=registry.redhat.io/rhel8/mariadb-103@sha256:3d30992e60774f887c4e7959c81b0c41b0d82d042250b3b56f05ab67fd4cdee1
 IMAGES_OAUTHPROXY=registry.redhat.io/openshift4/ose-oauth-proxy@sha256:ab112105ac37352a2a4916a39d6736f5db6ab4c29bad4467de8d613e80e9bb33
-IMAGES_CACHE=registry.redhat.io/ubi8/ubi-minimal@sha256:5d2d4d4dbec470f8ffb679915e2a8ae25ad754cd9193fa966deee1ecb7b3ee00
-IMAGES_MOVERESULTSIMAGE=registry.redhat.io/ubi8/ubi-micro@sha256:396baed3d689157d96aa7d8988fdfea7eb36684c8335eb391cf1952573e689c1
 ZAP_LOG_LEVEL=info
 MAX_CONCURRENT_RECONCILES=10
 DSPO_HEALTHCHECK_DATABASE_CONNECTIONTIMEOUT=15s

diff --git a/config/configmaps/files/config.yaml b/config/configmaps/files/config.yaml
@@ -1,26 +1,15 @@
 Images:
   ApiServer: $(IMAGES_APISERVER)
-  Artifact: $(IMAGES_ARTIFACT)
-  OAuthProxy: $(IMAGES_OAUTHPROXY)
-  PersistentAgent: $(IMAGES_PERSISTENTAGENT)
+  PersistentAgent: $(IMAGES_PERSISTENCEAGENT)
   ScheduledWorkflow: $(IMAGES_SCHEDULEDWORKFLOW)
-  Cache: $(IMAGES_CACHE)
-  MoveResultsImage: $(IMAGES_MOVERESULTSIMAGE)
-  MariaDB: $(IMAGES_MARIADB)
   MlmdEnvoy: $(IMAGES_MLMDENVOY)
   MlmdGRPC: $(IMAGES_MLMDGRPC)
-  MlmdWriter: $(IMAGES_MLMDWRITER)
-ImagesV2:
-  Argo:
-    ApiServer: $(IMAGESV2_ARGO_APISERVER)
-    PersistentAgent: $(IMAGESV2_ARGO_PERSISTENCEAGENT)
-    ScheduledWorkflow: $(IMAGESV2_ARGO_SCHEDULEDWORKFLOW)
-    MlmdEnvoy: $(IMAGESV2_ARGO_MLMDENVOY)
-    MlmdGRPC: $(IMAGESV2_ARGO_MLMDGRPC)
-    WorkflowController: $(IMAGESV2_ARGO_WORKFLOWCONTROLLER)
-    ArgoExecImage: $(IMAGESV2_ARGO_ARGOEXEC)
-    ArgoLauncherImage: $(V2_LAUNCHER_IMAGE)
-    ArgoDriverImage: $(V2_DRIVER_IMAGE)
+  ArgoExecImage: $(IMAGES_ARGO_EXEC)
+  ArgoWorkflowController: $(IMAGES_ARGO_WORKFLOWCONTROLLER)
+  LauncherImage: $(IMAGES_LAUNCHER)
+  DriverImage: $(IMAGES_DRIVER)
+  OAuthProxy: $(IMAGES_OAUTHPROXY)
+  MariaDB: $(IMAGES_MARIADB)
 DSPO:
   HealthCheck:
     Database: