Merge "Bump timeout for controlplane phases"

manifests/phases/executors.yaml

@@ -11,6 +11,18 @@ config:
   pruneOptions:
     prune: false
 ---
+apiVersion: airshipit.org/v1alpha1
+kind: KubernetesApply
+metadata:
+  labels:
+    airshipit.org/deploy-k8s: "false"
+  name: kubernetes-apply-controlplane
+config:
+  waitOptions:
+    timeout: 3600
+  pruneOptions:
+    prune: false
+---
 # This is added to support phase with no-wait
 # When there is a wait, then it does status-check and fails
 # if the resource status(condition) is not met.

manifests/phases/phases.yaml

@@ -31,7 +31,7 @@ config:
   executorRef:
     apiVersion: airshipit.org/v1alpha1
     kind: KubernetesApply
-    name: kubernetes-apply
+    name: kubernetes-apply-controlplane
   documentEntryPoint: ephemeral/controlplane
 ---
 apiVersion: airshipit.org/v1alpha1
@@ -69,7 +69,7 @@ config:
   executorRef:
     apiVersion: airshipit.org/v1alpha1
     kind: KubernetesApply
-    name: kubernetes-apply
+    name: kubernetes-apply-controlplane
   documentEntryPoint: target/controlplane
 ---
 apiVersion: airshipit.org/v1alpha1

tools/deployment/30_deploy_controlplane.sh

@@ -32,7 +32,7 @@ if type "virsh" > /dev/null; then
 fi
 
 echo "Create target k8s cluster resources"
-airshipctl phase run controlplane-ephemeral --debug
+time airshipctl phase run controlplane-ephemeral --debug
 
 echo "List all nodes in target cluster"
 kubectl \