Merge "docker-test-site for docker provider (capd)"

2020-11-11 02:47:30 +00:00 · 2020-11-11 02:47:30 +00:00 · f6ed45adfd
parent 3e17bbf439 a3aeb6cd00
commit f6ed45adfd
4 changed files with 3 additions and 6 deletions
--- a/manifests/site/docker-test-site/ephemeral/controlplane/kustomization.yaml
+++ b/manifests/site/docker-test-site/ephemeral/controlplane/kustomization.yaml
--- a/manifests/site/docker-test-site/ephemeral/controlplane/machine_count.json
+++ b/manifests/site/docker-test-site/ephemeral/controlplane/machine_count.json
--- a/manifests/site/docker-test-site/phases/plan.yaml
+++ b/manifests/site/docker-test-site/phases/plan.yaml
@ -6,6 +6,7 @@ phaseGroups:
  - name: group1
    phases:
      - name: clusterctl-init-ephemeral
-      - name: controlplane-target
-      - name: workers-target
+      - name: controlplane-ephemeral
      - name: clusterctl-init-target
+      - name: clusterctl-move
+      - name: workers-target
--- a/manifests/site/docker-test-site/target/initinfra/kustomization.yaml
+++ b/manifests/site/docker-test-site/target/initinfra/kustomization.yaml
@ -1,4 +0,0 @@
-resources:
-  - ../../shared/clusterctl
-commonLabels:
-  airshipit.org/stage: initinfra