Remove PNS Executor manifests and containerRuntimeExecutor ConfigMap Key

- PNS Executor was removed in Argo v3.4, so manifests no longer valid - WorkflowController will fail to start if `containerRuntimeExecutor` provided as input parameter, so remove from WC ConfigMap and CM patches Signed-off-by: Giulio Frasca <[email protected]>
kubeflow · Mar 14, 2024 · dd939f3 · dd939f3
1 parent 321d54f
commit dd939f3
Show file tree

Hide file tree

Showing 14 changed files with 1 addition and 87 deletions.
diff --git a/manifests/gcp_marketplace/chart/kubeflow-pipelines/templates/argo.yaml b/manifests/gcp_marketplace/chart/kubeflow-pipelines/templates/argo.yaml
@@ -832,9 +832,7 @@ data:
   # * https://github.com/argoproj/argo-workflows/blob/v3.4.16/docs/workflow-controller-configmap.md
   # * https://github.com/argoproj/argo-workflows/blob/v3.4.16/docs/workflow-controller-configmap.yaml
 
-  # TODO(gfrasca): remove?  Unused in v3.4
   # 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
@@ -151,9 +151,7 @@ data:
   # * https://github.com/argoproj/argo-workflows/blob/v3.4.16/docs/workflow-controller-configmap.md
   # * https://github.com/argoproj/argo-workflows/blob/v3.4.16/docs/workflow-controller-configmap.yaml
 
-  # TODO(gfrasca): remove?  Unused in v3.4
   # 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
@@ -151,9 +151,7 @@ data:
   # * https://github.com/argoproj/argo-workflows/blob/v3.4.16/docs/workflow-controller-configmap.md
   # * https://github.com/argoproj/argo-workflows/blob/v3.4.16/docs/workflow-controller-configmap.yaml
 
-  # TODO(gfrasca): remove?  Unused in v3.4
   # 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
@@ -167,9 +167,7 @@ data:
   # * https://github.com/argoproj/argo-workflows/blob/v3.4.16/docs/workflow-controller-configmap.md
   # * https://github.com/argoproj/argo-workflows/blob/v3.4.16/docs/workflow-controller-configmap.yaml
 
-  # TODO(gfrasca): remove?  Unused in v3.4
   # 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
@@ -167,9 +167,7 @@ data:
   # * https://github.com/argoproj/argo-workflows/blob/v3.4.16/docs/workflow-controller-configmap.md
   # * https://github.com/argoproj/argo-workflows/blob/v3.4.16/docs/workflow-controller-configmap.yaml
 
-  # TODO(gfrasca): remove?  Unused in v3.4
   # Choice of an executor is deprecated in favor of emissary executor
-  containerRuntimeExecutor: emissary
   executor: |
     imagePullPolicy: IfNotPresent
     resources:

diff --git a/manifests/kustomize/env/platform-agnostic-emissary/kustomization.yaml b/manifests/kustomize/env/platform-agnostic-emissary/kustomization.yaml
@@ -1,7 +1,4 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 bases:
-- ../platform-agnostic
-
-patchesStrategicMerge:
-- workflow-controller-configmap-patch.yaml
+- ../platform-agnostic
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
@@ -2,6 +2,3 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 bases:
 - ../platform-agnostic-multi-user
-
-patchesStrategicMerge:
-- workflow-controller-configmap-patch.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-multi-user-pns/kustomization.yaml b/manifests/kustomize/env/platform-agnostic-multi-user-pns/kustomization.yaml
diff --git a/...s/kustomize/env/platform-agnostic-multi-user-pns/workflow-controller-configmap-patch.yaml b/...s/kustomize/env/platform-agnostic-multi-user-pns/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,7 +34,6 @@ kustomization_yamls=(
   "env/dev"
   "env/gcp"
   "env/platform-agnostic"
-  "env/platform-agnostic-pns"
   "env/platform-agnostic-emissary"
   "env/aws"
   "env/azure"
@@ -48,7 +47,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[@]}"