Prepare to upgrade to the next DSP Release

This will include all the changes from the kfp 2.2.0 release Signed-off-by: Ricardo M. Oliveira <rmartine@redhat.com>
opendatahub-io · Aug 12, 2024 · 1bd1e19 · 1bd1e19
1 parent 2fb7450
commit 1bd1e19
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 6 deletions.
diff --git a/config/argo/deployment.workflow-controller.yaml b/config/argo/deployment.workflow-controller.yaml
@@ -18,7 +18,7 @@ spec:
         - --configmap
         - workflow-controller-configmap
         - --executor-image
-        - gcr.io/ml-pipeline/argoexec:v3.3.10-license-compliance
+        - gcr.io/ml-pipeline/argoexec:v3.4.16-license-compliance
         - --namespaced
         command:
         - workflow-controller
@@ -29,7 +29,7 @@ spec:
               apiVersion: v1
               fieldPath: metadata.name
         # image: quay.io/argoproj/workflow-controller:v3.4.12
-        image: gcr.io/ml-pipeline/workflow-controller:v3.3.10-license-compliance
+        image: gcr.io/ml-pipeline/workflow-controller:v3.4.16-license-compliance
         livenessProbe:
           failureThreshold: 3
           httpGet:

diff --git a/config/base/params.env b/config/base/params.env
@@ -11,8 +11,8 @@ 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_WORKFLOWCONTROLLER=quay.io/opendatahub/ds-pipelines-argo-workflowcontroller:v3.4.16-upstream
+IMAGESV2_ARGO_ARGOEXEC=quay.io/opendatahub/ds-pipelines-argo-argoexec:v3.4.16-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_MARIADB=registry.redhat.io/rhel8/mariadb-103@sha256:3d30992e60774f887c4e7959c81b0c41b0d82d042250b3b56f05ab67fd4cdee1

diff --git a/config/internal/workflow-controller/configmap.yaml.tmpl b/config/internal/workflow-controller/configmap.yaml.tmpl
@@ -36,6 +36,5 @@ data:
       secretKeySecret:
         name: "{{.ObjectStorageConnection.CredentialsSecret.SecretName}}"
         key: "{{.ObjectStorageConnection.CredentialsSecret.SecretKey}}"
-  containerRuntimeExecutor: emissary  # TODO
   executor: |
     imagePullPolicy: IfNotPresent  # TODO
diff --git a/config/internal/workflow-controller/role.yaml.tmpl b/config/internal/workflow-controller/role.yaml.tmpl
@@ -57,6 +57,8 @@ rules:
   - workflows/finalizers
   - workflowtasksets
   - workflowtasksets/finalizers
+  - workflowartifactgctasks
+  - workflowartifactgctasks/finalizers
   verbs:
   - get
   - list

diff --git a/config/rbac/argo_role.yaml b/config/rbac/argo_role.yaml
@@ -51,6 +51,8 @@ rules:
   - workflows/finalizers
   - workflowtasksets
   - workflowtasksets/finalizers
+  - workflowartifactgctasks
+  - workflowartifactgctasks/finalizers
   verbs:
   - get
   - list

diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -39,6 +39,13 @@ rules:
   - replicasets
   verbs:
   - '*'
+- apiGroups:
+  - argoproj.io
+  resources:
+  - workflowartifactgctasks
+  verbs:
+  - create
+  - patch
 - apiGroups:
   - argoproj.io
   resources:

diff --git a/...ig/samples/v2/custom-workflow-controller-config/custom-workflow-controller-configmap.yaml b/...ig/samples/v2/custom-workflow-controller-config/custom-workflow-controller-configmap.yaml
@@ -25,7 +25,6 @@ data:
       secretKeySecret:
         name: "ds-pipeline-s3-sample"
         key: "secretkey"
-  containerRuntimeExecutor: emissary
   executor: |
     imagePullPolicy: IfNotPresent  # TODO
 kind: ConfigMap

diff --git a/controllers/dspipeline_controller.go b/controllers/dspipeline_controller.go
@@ -152,6 +152,7 @@ func (r *DSPAReconciler) DeleteResourceIfItExists(ctx context.Context, obj clien
 //+kubebuilder:rbac:groups=snapshot.storage.k8s.io,resources=volumesnapshots,verbs=create;delete;get
 //+kubebuilder:rbac:groups=argoproj.io,resources=workflows,verbs=*
 //+kubebuilder:rbac:groups=argoproj.io,resources=workflowtaskresults,verbs=create;patch
+//+kubebuilder:rbac:groups=argoproj.io,resources=workflowartifactgctasks,verbs=create;patch
 //+kubebuilder:rbac:groups=core,resources=pods;pods/exec;pods/log;services,verbs=*
 //+kubebuilder:rbac:groups=core;apps;extensions,resources=deployments;replicasets,verbs=*
 //+kubebuilder:rbac:groups=kubeflow.org,resources=*,verbs=*