Fix CAPD deployment using phase plan

This PS introduces phase plan for CAPD provider
 * Adds phase to merge kubeconfig
 * Patches type/gating plan to use capd phase plan
 * Patches cluster_map and executor to work with "default" namespace
 * Fixes CAPD zuul failures

Relates-To: #564
Relates-To: #580
Relates-To: #587
Change-Id: I5007970c907bc87dccf6dd9fcb052afc1b5c13f7

manifests/function/capd/v0.3.11/data/kustomization.yaml

@@ -0,0 +1,2 @@
+resources:
+  - metadata.yaml

manifests/function/capd/v0.3.11/data/metadata.yaml

@@ -0,0 +1,11 @@
+---
+apiVersion: clusterctl.cluster.x-k8s.io/v1alpha3
+kind: Metadata
+metadata:
+  name: repository-metadata
+  labels:
+    airshipit.org/deploy-k8s: "false"
+releaseSeries:
+- major: 0
+  minor: 3
+  contract: v1alpha3

manifests/function/capd/v0.3.11/kustomization.yaml

@@ -5,5 +5,6 @@ commonLabels:
 
 resources:
 - crd
+- data
 - default
 - webhook

manifests/function/phase-helpers/kustomization.yaml

@@ -13,3 +13,4 @@ resources:
 - wait_bmh
 - wait_label_node
 - check_ingress_ctrl
+- merge_kubeconfig

tools/deployment/provider_common/34_deploy_worker_node.sh → manifests/function/phase-helpers/merge_kubeconfig/kubectl_merge_kubeconfig.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,16 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set -xe
+set -ex
 
-export KUBECONFIG=${KUBECONFIG:-"$HOME/.airship/kubeconfig"}
-export KUBECONFIG_TARGET_CONTEXT=${KUBECONFIG_TARGET_CONTEXT:-"target-cluster"}
+KUBECONFIG=${KUBECONFIG}:${TGT_KUBECONFIG} kubectl config view --flatten > /tmp/kubeconfig-trans
 
-echo "Stop/Delete ephemeral node"
-kind delete cluster --name "ephemeral-cluster"
+cat /tmp/kubeconfig-trans > ${TGT_KUBECONFIG}
 
-echo "Deploy worker node"
-airshipctl phase run  workers-target --debug
-
-#Wait till node is created
-kubectl wait --for=condition=ready node --all --timeout=1000s --context $KUBECONFIG_TARGET_CONTEXT --kubeconfig $KUBECONFIG -A

manifests/function/phase-helpers/merge_kubeconfig/kustomization.yaml

@@ -0,0 +1,6 @@
+configMapGenerator:
+- name: merge-kubeconfig
+  options:
+    disableNameSuffixHash: true
+  files:
+  - script=kubectl_merge_kubeconfig.sh

manifests/phases/executors.yaml

@@ -563,3 +563,25 @@ spec:
   type: krm
   image: localhost/clusterctl:latest
   hostNetwork: true
+---
+apiVersion: airshipit.org/v1alpha1
+kind: GenericContainer
+metadata:
+  name: merge-kubeconfig
+  labels:
+    airshipit.org/deploy-k8s: "false"
+spec:
+  type: krm
+  image: quay.io/airshipit/toolbox:latest
+  hostNetwork: true
+  envVars:
+    - TGT_KUBECONFIG=/tmp-kubeconfig
+  mounts:
+  - type: bind
+    src: ~/.airship/kubeconfig
+    dst: /tmp-kubeconfig
+    rw: true
+configRef:
+  kind: ConfigMap
+  name: merge-kubeconfig
+  apiVersion: v1

manifests/phases/phases.yaml

@@ -488,3 +488,14 @@ config:
     apiVersion: airshipit.org/v1alpha1
     kind: GenericContainer
     name: kubectl-check-ingress-ctrl
+---
+apiVersion: airshipit.org/v1alpha1
+kind: Phase
+metadata:
+  name: kubectl-merge-kubeconfig
+  clusterName: target-cluster
+config:
+  executorRef:
+    apiVersion: airshipit.org/v1alpha1
+    kind: GenericContainer
+    name: merge-kubeconfig

manifests/site/docker-test-site/kustomization.yaml

@@ -0,0 +1,2 @@
+resources:
+  - metadata.yaml

manifests/site/docker-test-site/phases/cluster_map_patch.yaml

@@ -0,0 +1,22 @@
+apiVersion: airshipit.org/v1alpha1
+kind: ClusterMap
+metadata:
+  labels:
+    airshipit.org/deploy-k8s: "false"
+  name: main-map
+map:
+  target-cluster:
+    parent: ephemeral-cluster
+    kubeconfigSources:
+      - type: "filesystem"
+        filesystem:
+          path: ~/.airship/kubeconfig
+          contextName: target-cluster
+      - type: "bundle"
+        bundle:
+          contextName: target-cluster
+      - type: "clusterAPI"
+        clusterAPI:
+          clusterNamespacedName:
+            name: target-cluster
+            namespace: default

manifests/site/docker-test-site/phases/executor_patch.yaml

@@ -0,0 +1,7 @@
+apiVersion: airshipit.org/v1alpha1
+kind: Clusterctl
+metadata:
+  name: clusterctl_move
+move-options:
+  namespace: default
+action: move

manifests/site/docker-test-site/phases/infrastructure-providers.json

@@ -1,18 +1,15 @@
 [{
     "op": "replace",
     "path": "/init-options/infrastructure-providers",
-    "value": ["docker:v0.3.11"]
+    "value": "docker:v0.3.11"
  },
  {
     "op": "replace",
     "path": "/providers/0",
     "value": {
         "name": "docker",
         "type": "InfrastructureProvider",
-        "variable-substitution": true,
-        "versions": {
-            "v0.3.11": "airshipctl/manifests/function/capd/v0.3.11"
-        }
+        "url": "airshipctl/manifests/function/capd/v0.3.11"
     }
  }
 ]

manifests/site/docker-test-site/phases/kustomization.yaml

@@ -1,14 +1,17 @@
 resources:
   - ../../../phases
   - ../../../function/airshipctl-base-catalogues
-  - plan.yaml
 patchesJson6902:
   - target:
       group: airshipit.org
       version: v1alpha1
       kind: Clusterctl
       name: "clusterctl_init"
     path: infrastructure-providers.json
+patchesStrategicMerge:
+  - plan_patch.yaml
+  - cluster_map_patch.yaml
+  - executor_patch.yaml
 transformers:
   - ../../../function/clusterctl/replacements
   - ../../../phases/replacements

manifests/site/docker-test-site/phases/plan_patch.yaml

@@ -0,0 +1,20 @@
+apiVersion: airshipit.org/v1alpha1
+kind: PhasePlan
+metadata:
+  name: deploy-gating
+description: "Phase plan for docker-test-site deployment"
+phases:
+  - name: clusterctl-init-ephemeral
+  - name: kubectl-wait-deploy-ephemeral
+  - name: kubectl-get-pods-ephemeral
+  - name: controlplane-ephemeral
+  - name: kubectl-merge-kubeconfig
+  - name: kubectl-get-node-target
+  - name: kubectl-get-pods-target
+  - name: initinfra-networking-target
+  - name: kubectl-wait-tigera-target
+  - name: kubectl-get-pods-target
+  - name: clusterctl-init-target
+  - name: kubectl-wait-pods-any-ephemeral
+  - name: clusterctl-move
+  - name: workers-target

tools/deployment/kind/start_kind.sh

@@ -39,7 +39,9 @@ set -xe
 : ${KUBECONFIG:="${HOME}/.airship/kubeconfig"}
 : ${TIMEOUT:=3600}
 : ${KIND_CONFIG:=""}
+
 export KIND_EXPERIMENTAL_DOCKER_NETWORK=bridge
+export KUBECONFIG_TARGET_CONTEXT=${KUBECONFIG_TARGET_CONTEXT:-"target-cluster"}
 
 echo "cluster name: $CLUSTER";
 
@@ -58,5 +60,8 @@ kubectl wait --for=condition=ready node --all --timeout=1000s --kubeconfig $KUBE
 # By default, kind creates context kind-<cluster_name>
 kubectl config set-context ${CLUSTER} --cluster kind-${CLUSTER} --user kind-${CLUSTER} --kubeconfig $KUBECONFIG
 
+# Add context for target-cluster
+kubectl config set-context ${KUBECONFIG_TARGET_CONTEXT} --user target-cluster-admin --cluster ${KUBECONFIG_TARGET_CONTEXT} --kubeconfig  $KUBECONFIG
+
 echo "This cluster can be deleted via:"
 echo "${KIND} delete cluster --name ${CLUSTER}"