remove containerRuntimeExecutor which is deprecated in Argo v3.4

kubeflow · May 4, 2023 · fb6c430 · fb6c430
1 parent 6e15f4e
commit fb6c430
Show file tree

Hide file tree

Showing 16 changed files with 0 additions and 91 deletions.
diff --git a/manifests/gcp_marketplace/chart/kubeflow-pipelines/templates/argo.yaml b/manifests/gcp_marketplace/chart/kubeflow-pipelines/templates/argo.yaml
@@ -833,7 +833,6 @@ data:
   # * https://github.com/argoproj/argo-workflows/blob/v3.4.7/docs/workflow-controller-configmap.yaml
 
   # Choice of an executor is deprecated in favor of emissary executor
-  containerRuntimeExecutor: emissary
   executor: |
     imagePullPolicy: IfNotPresent
     resources:

diff --git a/manifests/gcp_marketplace/test/snapshot-base.yaml b/manifests/gcp_marketplace/test/snapshot-base.yaml
@@ -152,7 +152,6 @@ data:
   # * https://github.com/argoproj/argo-workflows/blob/v3.4.7/docs/workflow-controller-configmap.yaml
 
   # Choice of an executor is deprecated in favor of emissary executor
-  containerRuntimeExecutor: emissary
   executor: |
     imagePullPolicy: IfNotPresent
     resources:

diff --git a/manifests/gcp_marketplace/test/snapshot-emissary.yaml b/manifests/gcp_marketplace/test/snapshot-emissary.yaml
@@ -152,7 +152,6 @@ data:
   # * https://github.com/argoproj/argo-workflows/blob/v3.4.7/docs/workflow-controller-configmap.yaml
 
   # Choice of an executor is deprecated in favor of emissary executor
-  containerRuntimeExecutor: emissary
   executor: |
     imagePullPolicy: IfNotPresent
     resources:

diff --git a/manifests/gcp_marketplace/test/snapshot-managed-storage-with-db-prefix.yaml b/manifests/gcp_marketplace/test/snapshot-managed-storage-with-db-prefix.yaml
@@ -168,7 +168,6 @@ data:
   # * https://github.com/argoproj/argo-workflows/blob/v3.4.7/docs/workflow-controller-configmap.yaml
 
   # Choice of an executor is deprecated in favor of emissary executor
-  containerRuntimeExecutor: emissary
   executor: |
     imagePullPolicy: IfNotPresent
     resources:

diff --git a/manifests/gcp_marketplace/test/snapshot-managed-storage.yaml b/manifests/gcp_marketplace/test/snapshot-managed-storage.yaml
@@ -168,7 +168,6 @@ data:
   # * https://github.com/argoproj/argo-workflows/blob/v3.4.7/docs/workflow-controller-configmap.yaml
 
   # Choice of an executor is deprecated in favor of emissary executor
-  containerRuntimeExecutor: emissary
   executor: |
     imagePullPolicy: IfNotPresent
     resources:

diff --git a/manifests/kustomize/README.md b/manifests/kustomize/README.md
@@ -27,15 +27,6 @@ kubectl port-forward -n kubeflow svc/ml-pipeline-ui 8080:80
 
 Now you can access Kubeflow Pipelines UI in your browser by <http://localhost:8080>.
 
-Customize:
-
-There are two variations for platform-agnostic that uses different [argo workflow executors](https://argoproj.github.io/argo-workflows/workflow-executors/):
-
-* env/platform-agnostic-emissary
-* env/platform-agnostic-pns
-
-You can install them by changing `KFP_ENV` in above instructions to the variation you want.
-
 Data:
 
 Application data are persisted in in-cluster PersistentVolumeClaim storage.

diff --git a/manifests/kustomize/env/platform-agnostic-emissary/kustomization.yaml b/manifests/kustomize/env/platform-agnostic-emissary/kustomization.yaml
diff --git a/manifests/kustomize/env/platform-agnostic-emissary/workflow-controller-configmap-patch.yaml b/manifests/kustomize/env/platform-agnostic-emissary/workflow-controller-configmap-patch.yaml
diff --git a/manifests/kustomize/env/platform-agnostic-multi-user-emissary/kustomization.yaml b/manifests/kustomize/env/platform-agnostic-multi-user-emissary/kustomization.yaml
diff --git a/...tomize/env/platform-agnostic-multi-user-emissary/workflow-controller-configmap-patch.yaml b/...tomize/env/platform-agnostic-multi-user-emissary/workflow-controller-configmap-patch.yaml
diff --git a/manifests/kustomize/env/platform-agnostic-pns/kustomization.yaml b/manifests/kustomize/env/platform-agnostic-pns/kustomization.yaml
diff --git a/manifests/kustomize/env/platform-agnostic-pns/workflow-controller-configmap-patch.yaml b/manifests/kustomize/env/platform-agnostic-pns/workflow-controller-configmap-patch.yaml
diff --git a/manifests/kustomize/hack/test.sh b/manifests/kustomize/hack/test.sh
@@ -34,8 +34,6 @@ kustomization_yamls=(
   "env/dev"
   "env/gcp"
   "env/platform-agnostic"
-  "env/platform-agnostic-pns"
-  "env/platform-agnostic-emissary"
   "env/aws"
   "env/azure"
 )
@@ -48,8 +46,6 @@ done
 kustomization_yamls_v3=(
   "base/installs/multi-user"
   "env/platform-agnostic-multi-user"
-  "env/platform-agnostic-multi-user-pns"
-  "env/platform-agnostic-multi-user-emissary"
 )
 for path in "${kustomization_yamls_v3[@]}"
 do

diff --git a/manifests/kustomize/third-party/argo/base/workflow-controller-configmap-patch.yaml b/manifests/kustomize/third-party/argo/base/workflow-controller-configmap-patch.yaml
@@ -8,9 +8,6 @@ data:
   # * https://github.com/argoproj/argo-workflows/blob/v3.4.7/docs/workflow-controller-configmap.md
   # * https://github.com/argoproj/argo-workflows/blob/v3.4.7/docs/workflow-controller-configmap.yaml
 
-  # emissary executor is a more portable default, see https://github.com/kubeflow/pipelines/issues/1654.
-  containerRuntimeExecutor: emissary
-
   # In artifactRepository.s3.endpoint, $(kfp-namespace) is needed, because in multi-user mode, pipelines may run in other namespaces.
   artifactRepository: |
     archiveLogs: true

diff --git a/test/manifests/dev/kustomization.yaml b/test/manifests/dev/kustomization.yaml
@@ -7,7 +7,6 @@ bases:
 - ../../../manifests/kustomize/env/dev
 patchesStrategicMerge:
 - proxy-agent-patch.yaml
-- workflow-controller-configmap-patch.yaml
 
 # Used by Kustomize.
 configMapGenerator:

diff --git a/test/manifests/dev/workflow-controller-configmap-patch.yaml b/test/manifests/dev/workflow-controller-configmap-patch.yaml