From 64e7694ebb6b81d38d4b2fe617365e46ba3d49e0 Mon Sep 17 00:00:00 2001 From: Vladimir Kozhukalov Date: Wed, 7 Oct 2020 16:58:08 +0300 Subject: [PATCH] Kubeconfig should be site specific * Move kubeconfig from manifests/phases to the manifests/site directory. * Create site specific phases entry point that inherits global phases bundle Change-Id: I0f2893928221760e46a05630de051dd4c46c7448 Relates-To: #356 --- manifests/metadata.yaml | 2 +- manifests/phases/kustomization.yaml | 1 - .../{phases => site/test-site/kubeconfig}/kubeconfig.yaml | 0 manifests/site/test-site/kubeconfig/kustomization.yaml | 2 ++ manifests/site/test-site/phases/kustomization.yaml | 3 +++ 5 files changed, 6 insertions(+), 2 deletions(-) rename manifests/{phases => site/test-site/kubeconfig}/kubeconfig.yaml (100%) create mode 100644 manifests/site/test-site/kubeconfig/kustomization.yaml create mode 100644 manifests/site/test-site/phases/kustomization.yaml diff --git a/manifests/metadata.yaml b/manifests/metadata.yaml index fd45c77dc..5d03d5c8f 100644 --- a/manifests/metadata.yaml +++ b/manifests/metadata.yaml @@ -1,3 +1,3 @@ phase: - path: manifests/phases + path: manifests/site/test-site/phases docEntryPointPrefix: manifests/site/test-site diff --git a/manifests/phases/kustomization.yaml b/manifests/phases/kustomization.yaml index bb5cb9adb..009ee732f 100644 --- a/manifests/phases/kustomization.yaml +++ b/manifests/phases/kustomization.yaml @@ -3,7 +3,6 @@ resources: - plan.yaml - executors.yaml - cluster-map.yaml - - kubeconfig.yaml - ../function/clusterctl patchesStrategicMerge: - clusterctl_init_options.yaml diff --git a/manifests/phases/kubeconfig.yaml b/manifests/site/test-site/kubeconfig/kubeconfig.yaml similarity index 100% rename from manifests/phases/kubeconfig.yaml rename to manifests/site/test-site/kubeconfig/kubeconfig.yaml diff --git a/manifests/site/test-site/kubeconfig/kustomization.yaml b/manifests/site/test-site/kubeconfig/kustomization.yaml new file mode 100644 index 000000000..d48a7b893 --- /dev/null +++ b/manifests/site/test-site/kubeconfig/kustomization.yaml @@ -0,0 +1,2 @@ +resources: + - kubeconfig.yaml diff --git a/manifests/site/test-site/phases/kustomization.yaml b/manifests/site/test-site/phases/kustomization.yaml new file mode 100644 index 000000000..81d4793b1 --- /dev/null +++ b/manifests/site/test-site/phases/kustomization.yaml @@ -0,0 +1,3 @@ +resources: + - ../kubeconfig + - ../../../phases