diff --git a/manifests/site/test-site/metadata.yaml b/manifests/site/test-site/metadata.yaml index a9b0fbabb..bc8863087 100644 --- a/manifests/site/test-site/metadata.yaml +++ b/manifests/site/test-site/metadata.yaml @@ -1,2 +1,3 @@ phase: + docEntryPointPrefix: manifests/site/test-site path: manifests/site/test-site/phases diff --git a/manifests/site/test-site/phases/kustomization.yaml b/manifests/site/test-site/phases/kustomization.yaml index 532c428e3..b0c2dcbd5 100644 --- a/manifests/site/test-site/phases/kustomization.yaml +++ b/manifests/site/test-site/phases/kustomization.yaml @@ -1,5 +1,2 @@ resources: - ../../../type/airship-core/phases - -patchesStrategicMerge: - - patch-entrypoints.yaml diff --git a/manifests/site/test-site/phases/patch-entrypoints.yaml b/manifests/site/test-site/phases/patch-entrypoints.yaml deleted file mode 100644 index 60fb0af7e..000000000 --- a/manifests/site/test-site/phases/patch-entrypoints.yaml +++ /dev/null @@ -1,32 +0,0 @@ ---- -apiVersion: airshipit.org/v1alpha1 -kind: Phase -metadata: - name: initinfra-ephemeral - clusterName: ephemeral-cluster -config: - documentEntryPoint: manifests/site/test-site/ephemeral/initinfra ---- -apiVersion: airshipit.org/v1alpha1 -kind: Phase -metadata: - name: controlplane-ephemeral - clusterName: ephemeral-cluster -config: - documentEntryPoint: manifests/site/test-site/ephemeral/controlplane ---- -apiVersion: airshipit.org/v1alpha1 -kind: Phase -metadata: - name: initinfra-target - clusterName: target-cluster -config: - documentEntryPoint: manifests/site/test-site/target/initinfra ---- -apiVersion: airshipit.org/v1alpha1 -kind: Phase -metadata: - name: workers-target - clusterName: target-cluster -config: - documentEntryPoint: manifests/site/test-site/target/workers diff --git a/manifests/site/virtual-network-cloud/metadata.yaml b/manifests/site/virtual-network-cloud/metadata.yaml new file mode 100644 index 000000000..5b4d8c13c --- /dev/null +++ b/manifests/site/virtual-network-cloud/metadata.yaml @@ -0,0 +1,3 @@ +phase: + docEntryPointPrefix: manifests/site/virtual-network-cloud + path: manifests/site/virtual-network-cloud/phases diff --git a/manifests/site/virtual-network-cloud/phases/kustomization.yaml b/manifests/site/virtual-network-cloud/phases/kustomization.yaml new file mode 100644 index 000000000..a920750e6 --- /dev/null +++ b/manifests/site/virtual-network-cloud/phases/kustomization.yaml @@ -0,0 +1,2 @@ +resources: + - ../../../type/network-cloud/phases diff --git a/manifests/type/airship-core/metadata.yaml b/manifests/type/airship-core/metadata.yaml index a36983d94..3b68feea4 100644 --- a/manifests/type/airship-core/metadata.yaml +++ b/manifests/type/airship-core/metadata.yaml @@ -1,2 +1,3 @@ phase: + docEntryPointPrefix: manifests/type/airship-core path: manifests/type/airship-core/phases diff --git a/manifests/type/airship-core/phases/phases.yaml b/manifests/type/airship-core/phases/phases.yaml index 3166906bd..ab58eeeb3 100644 --- a/manifests/type/airship-core/phases/phases.yaml +++ b/manifests/type/airship-core/phases/phases.yaml @@ -8,7 +8,7 @@ config: apiVersion: airshipit.org/v1alpha1 kind: ImageConfiguration name: isogen - documentEntryPoint: manifests/site/test-site/ephemeral/bootstrap + documentEntryPoint: ephemeral/bootstrap --- apiVersion: airshipit.org/v1alpha1 kind: Phase @@ -20,7 +20,7 @@ config: apiVersion: airshipit.org/v1alpha1 kind: KubernetesApply name: kubernetes-apply - documentEntryPoint: manifests/site/test-site/ephemeral/initinfra + documentEntryPoint: ephemeral/initinfra --- apiVersion: airshipit.org/v1alpha1 kind: Phase @@ -32,7 +32,7 @@ config: apiVersion: airshipit.org/v1alpha1 kind: KubernetesApply name: kubernetes-apply - documentEntryPoint: manifests/site/test-site/ephemeral/controlplane + documentEntryPoint: ephemeral/controlplane --- apiVersion: airshipit.org/v1alpha1 kind: Phase @@ -45,7 +45,7 @@ config: apiVersion: airshipit.org/v1alpha1 kind: KubernetesApply name: kubernetes-apply - documentEntryPoint: manifests/site/test-site/target/initinfra + documentEntryPoint: target/initinfra --- apiVersion: airshipit.org/v1alpha1 kind: Phase @@ -58,7 +58,7 @@ config: apiVersion: airshipit.org/v1alpha1 kind: KubernetesApply name: kubernetes-apply - documentEntryPoint: manifests/site/test-site/target/workers + documentEntryPoint: target/workers --- apiVersion: airshipit.org/v1alpha1 kind: Phase @@ -103,4 +103,4 @@ config: apiVersion: airshipit.org/v1alpha1 kind: KubernetesApply name: kubernetes-apply - documentEntryPoint: manifests/site/test-site/target/workload + documentEntryPoint: target/workload diff --git a/manifests/type/network-cloud/metadata.yaml b/manifests/type/network-cloud/metadata.yaml index 63de6e5c8..a5a8d180f 100644 --- a/manifests/type/network-cloud/metadata.yaml +++ b/manifests/type/network-cloud/metadata.yaml @@ -1,2 +1,3 @@ phase: + docEntryPointPrefix: manifests/type/network-cloud path: manifests/type/network-cloud/phases