Merge pull request #176 from hbelmiro/rebase-master

Rebase over kubeflow/pipelines@4c966f7

Author: openshift-merge-bot[bot]

.github/OWNERS

@@ -1,5 +1,6 @@
 approvers:
   - hbelmiro
   - DharmitD
+  - mprahl
 reviewers:
   - rimolive

.github/actions/kfp-cluster/action.yml

@@ -5,10 +5,18 @@ inputs:
   k8s_version:
     description: "The Kubernetes version to use for the Kind cluster"
     required: true
+  pipeline_store:
+    description: "Flag to deploy KFP with K8s Native API"
+    default: 'database'
+    required: false
   proxy:
     description: "If KFP should be deployed with proxy configuration"
     required: false
     default: false
+  cache_enabled:
+    description: "If KFP should be deployed with cache enabled globally"
+    required: false
+    default: 'true'
 
 runs:
   using: "composite"
@@ -23,7 +31,7 @@ runs:
 
     - name: Deploy Squid
       id: deploy-squid
-      if: ${{ (inputs.proxy == 'true' )}}
+      if: ${{ inputs.proxy == 'true' }}
       shell: bash
       run: ./.github/resources/squid/deploy-squid.sh
 
@@ -39,8 +47,14 @@ runs:
     - name: Deploy KFP
       shell: bash
       run: |
+        ARGS=""
+
         if [ "${{ inputs.proxy }}" = "true" ]; then
-          ./.github/resources/scripts/deploy-kfp.sh --proxy
-        else
-          ./.github/resources/scripts/deploy-kfp.sh
+          ARGS="${ARGS} --proxy"
+        elif [ "${{inputs.cache_enabled }}" = "false" ]; then
+          ARGS="${ARGS} --cache-disabled"
+        elif [ "${{inputs.pipeline_store }}" = "kubernetes" ]; then
+          ARGS="${ARGS}  --deploy-k8s-native"
         fi
+        
+        ./.github/resources/scripts/deploy-kfp.sh $ARGS

.github/resources/manifests/argo/overlays/cache-disabled/cache-env.yaml

@@ -0,0 +1,12 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: ml-pipeline
+spec:
+  template:
+    spec:
+      containers:
+        - name: ml-pipeline-api-server
+          env:
+            - name: CACHEENABLED
+              value: "false"

.github/resources/manifests/kubernetes-native/overlays/proxy/kustomization.yaml renamed to .github/resources/manifests/argo/overlays/cache-disabled/kustomization.yaml

@@ -5,7 +5,7 @@ resources:
   - ../no-proxy
 
 patches:
-  - path: proxy-env.yaml
+  - path: cache-env.yaml
     target:
       kind: Deployment
       name: ml-pipeline

.github/resources/manifests/kubernetes-native/overlays/no-proxy/apiserver-env.yaml renamed to .github/resources/manifests/argo/overlays/kubernetes-native/apiserver-env.yaml

@@ -24,47 +24,68 @@ C_DIR="${BASH_SOURCE%/*}"
 if [[ ! -d "$C_DIR" ]]; then C_DIR="$PWD"; fi
 source "${C_DIR}/helper-functions.sh"
 
+TEST_MANIFESTS=".github/resources/manifests/argo"
+PIPELINES_STORE="database"
 USE_PROXY=false
-
-while getopts ":p-:" OPT; do
-    case $OPT in
-        -) [ "$OPTARG" = "proxy" ] && USE_PROXY=true || { echo "Unknown option --$OPTARG"; exit 1; };;
-        \?) echo "Invalid option: -$OPTARG" >&2; exit 1;;
-    esac
+CACHE_DISABLED=false
+
+# Loop over script arguments passed. This uses a single switch-case
+# block with default value in case we want to make alternative deployments
+# in the future.
+while [ "$#" -gt 0 ]; do
+  case "$1" in
+    --deploy-k8s-native)
+      PIPELINES_STORE="kubernetes"
+      shift
+      ;;
+    --proxy)
+      USE_PROXY=true
+      shift
+      ;;
+    --cache-disabled)
+      CACHE_DISABLED=true
+      shift
+      ;;
+  esac
 done
 
-shift $((OPTIND-1))
+if [ "${USE_PROXY}" == "true" && "${PIPELINES_STORE}" == "kubernetes" ]; then
+  echo "ERROR: Kubernetes Pipeline store cannot be deployed with proxy support."
+  exit 1
+fi
 
 kubectl apply -k "manifests/kustomize/cluster-scoped-resources/"
-kubectl apply -k "manifests/kustomize/base/crds"
 kubectl wait crd/applications.app.k8s.io --for condition=established --timeout=60s || EXIT_CODE=$?
 if [[ $EXIT_CODE -ne 0 ]]
 then
   echo "Failed to deploy cluster-scoped resources."
   exit $EXIT_CODE
 fi
 
-#Install cert-manager
-make -C ./backend install-cert-manager || EXIT_CODE=$?
-if [[ $EXIT_CODE -ne 0 ]]
-then
-  echo "Failed to deploy cert-manager."
-  exit $EXIT_CODE
+# If pipelines store is set to 'kubernetes', cert-manager must be deployed
+if [ "${PIPELINES_STORE}" == "kubernetes" ]; then
+  #Install cert-manager
+  make -C ./backend install-cert-manager || EXIT_CODE=$?
+  if [[ $EXIT_CODE -ne 0 ]]
+  then
+    echo "Failed to deploy cert-manager."
+    exit $EXIT_CODE
+  fi
 fi
 
-# Deploy manifest
-TEST_MANIFESTS=".github/resources/manifests/argo"
-
-if [[ "$PIPELINE_STORE" == "kubernetes" ]]; then
-  TEST_MANIFESTS=".github/resources/manifests/kubernetes-native"
-fi
-
-if $USE_PROXY; then
+# Manifests will be deployed according to the flag provided
+if $CACHE_DISABLED; then
+  TEST_MANIFESTS="${TEST_MANIFESTS}/overlays/cache-disabled"
+elif $USE_PROXY; then
   TEST_MANIFESTS="${TEST_MANIFESTS}/overlays/proxy"
+elif [ "${PIPELINES_STORE}" == "kubernetes" ]; then
+  TEST_MANIFESTS="${TEST_MANIFESTS}/overlays/kubernetes-native"
 else
   TEST_MANIFESTS="${TEST_MANIFESTS}/overlays/no-proxy"
 fi
 
+echo "Deploying ${TEST_MANIFESTS}..."
+
 kubectl apply -k "${TEST_MANIFESTS}" || EXIT_CODE=$?
 if [[ $EXIT_CODE -ne 0 ]]
 then
@@ -83,4 +104,3 @@ fi
 collect_artifacts kubeflow
 
 echo "Finished KFP deployment."
-