From ee11f9eb63c0a301c6fc0c42972e27d3aac5ecb9 Mon Sep 17 00:00:00 2001
From: Gabriele Santomaggio <G.santomaggio@gmail.com>
Date: Tue, 4 Aug 2020 04:24:18 +0200
Subject: [PATCH] feat(deployment): Add env/platform-agnostic-pns standalone
 deployment option (#4278)

Add containerRuntimeExecutor explicit type on the configMap
configuration. Set `docker` as default.
Add platform-agnostic type configuration needed by Kind, K3s and
Minikube.
Part of https://github.com/kubeflow/pipelines/issues/4256
---
 .../argo/workflow-controller-configmap.yaml   |  1 +
 manifests/kustomize/base/kustomization.yaml   |  7 +++++++
 manifests/kustomize/base/params.env           |  7 +++++++
 .../platform-agnostic-pns/kustomization.yaml  | 21 +++++++++++++++++++
 .../env/platform-agnostic-pns/params.env      |  1 +
 5 files changed, 37 insertions(+)
 create mode 100644 manifests/kustomize/env/platform-agnostic-pns/kustomization.yaml
 create mode 100644 manifests/kustomize/env/platform-agnostic-pns/params.env

diff --git a/manifests/kustomize/base/argo/workflow-controller-configmap.yaml b/manifests/kustomize/base/argo/workflow-controller-configmap.yaml
index ffb01c5fbdf..d31ef54d728 100644
--- a/manifests/kustomize/base/argo/workflow-controller-configmap.yaml
+++ b/manifests/kustomize/base/argo/workflow-controller-configmap.yaml
@@ -7,6 +7,7 @@ data:
     {
     namespace: $(kfp-namespace),
     executorImage: gcr.io/ml-pipeline/argoexec:v2.7.5-license-compliance,
+    containerRuntimeExecutor: $(kfp-container-runtime-executor),
     artifactRepository:
     {
         s3: {
diff --git a/manifests/kustomize/base/kustomization.yaml b/manifests/kustomize/base/kustomization.yaml
index 717f4e6cf75..b960ddef8c1 100644
--- a/manifests/kustomize/base/kustomization.yaml
+++ b/manifests/kustomize/base/kustomization.yaml
@@ -46,5 +46,12 @@ vars:
     apiVersion: v1
   fieldref:
     fieldpath: data.bucketName
+- name: kfp-container-runtime-executor
+  objref:
+    kind: ConfigMap
+    name: pipeline-install-config
+    apiVersion: v1
+  fieldref:
+    fieldpath: data.containerRuntimeExecutor
 configurations:
 - params.yaml
diff --git a/manifests/kustomize/base/params.env b/manifests/kustomize/base/params.env
index a274506fc75..944992b9121 100644
--- a/manifests/kustomize/base/params.env
+++ b/manifests/kustomize/base/params.env
@@ -6,3 +6,10 @@ mlmdDb=metadb
 cacheDb=cachedb
 pipelineDb=mlpipeline
 bucketName=mlpipeline
+
+
+## containerRuntimeExecutor: A workflow executor is a process
+## that allows Argo to perform certain actions like monitoring pod logs,
+## artifacts, container lifecycles, etc..
+## Doc: https://github.com/argoproj/argo/blob/master/docs/workflow-executors.md
+containerRuntimeExecutor=docker
diff --git a/manifests/kustomize/env/platform-agnostic-pns/kustomization.yaml b/manifests/kustomize/env/platform-agnostic-pns/kustomization.yaml
new file mode 100644
index 00000000000..cca7b5ee4c7
--- /dev/null
+++ b/manifests/kustomize/env/platform-agnostic-pns/kustomization.yaml
@@ -0,0 +1,21 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+bases:
+  - ../platform-agnostic
+
+# Identifier for application manager to apply ownerReference.
+# The ownerReference ensures the resources get garbage collected
+# when application is deleted.
+commonLabels:
+  application-crd-id: kubeflow-pipelines
+
+# !!! If you want to customize the namespace,
+# please refer sample/cluster-scoped-resources to update the namespace for cluster-scoped-resources
+namespace: kubeflow
+
+# Used by Kustomize
+configMapGenerator:
+  - name: pipeline-install-config
+    env: params.env
+    behavior: merge
diff --git a/manifests/kustomize/env/platform-agnostic-pns/params.env b/manifests/kustomize/env/platform-agnostic-pns/params.env
new file mode 100644
index 00000000000..e7936cd5baa
--- /dev/null
+++ b/manifests/kustomize/env/platform-agnostic-pns/params.env
@@ -0,0 +1 @@
+containerRuntimeExecutor=pns