revert: "feat!: use argo emissary executor by default. Fixes #5718" (#…

…6230) This reverts commit 0c4129c.
kubeflow · Aug 4, 2021 · e6df7db · e6df7db
1 parent 0b82ef9
commit e6df7db
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/manifests/gcp_marketplace/chart/kubeflow-pipelines/templates/argo.yaml b/manifests/gcp_marketplace/chart/kubeflow-pipelines/templates/argo.yaml
@@ -345,7 +345,7 @@ data:
   # * https://github.com/argoproj/argo-workflows/blob/v3.1.2/docs/workflow-controller-configmap.md
   # * https://github.com/argoproj/argo-workflows/blob/v3.1.2/docs/workflow-controller-configmap.yaml
 
-  containerRuntimeExecutor: emissary
+  containerRuntimeExecutor: docker
 
   # Note, {{ `some-string-{{without}}-template-interpretation` }} is a way to avoid some brackets interpreted as template.
   # Reference: https://github.com/helm/helm/issues/2798#issuecomment-467319526

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
@@ -9,7 +9,7 @@ data:
   # * https://github.com/argoproj/argo-workflows/blob/v3.1.2/docs/workflow-controller-configmap.yaml
 
   # emissary executor is a more portable default, see https://github.com/kubeflow/pipelines/issues/1654.
-  containerRuntimeExecutor: emissary
+  containerRuntimeExecutor: docker
 
   # In artifactRepository.s3.endpoint, $(kfp-namespace) is needed, because in multi-user mode, pipelines may run in other namespaces.
   artifactRepository: |