Add docEntryPointPrefix to site and type metadata

DocumentEntryPoints in Treasuremap are coupled to site names since the
documents have not been updated to leverage the docEntryPointPrefix
feature. This change enables the feature in order to de-couple phase
documentEntryPoints from site paths, improving downstream consumption of
these documents.

Closes #49

Change-Id: I38b844a22772f9119118d903375c839cd8c84aca
Signed-off-by: Drew Walters <andrew.walters@att.com>
This commit is contained in:
Drew Walters 2020-11-18 16:04:00 +00:00
parent 39a6036ca8
commit 57c840341b
8 changed files with 14 additions and 41 deletions

View File

@ -1,2 +1,3 @@
phase:
docEntryPointPrefix: manifests/site/test-site
path: manifests/site/test-site/phases

View File

@ -1,5 +1,2 @@
resources:
- ../../../type/airship-core/phases
patchesStrategicMerge:
- patch-entrypoints.yaml

View File

@ -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

View File

@ -0,0 +1,3 @@
phase:
docEntryPointPrefix: manifests/site/virtual-network-cloud
path: manifests/site/virtual-network-cloud/phases

View File

@ -0,0 +1,2 @@
resources:
- ../../../type/network-cloud/phases

View File

@ -1,2 +1,3 @@
phase:
docEntryPointPrefix: manifests/type/airship-core
path: manifests/type/airship-core/phases

View File

@ -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

View File

@ -1,2 +1,3 @@
phase:
docEntryPointPrefix: manifests/type/network-cloud
path: manifests/type/network-cloud/phases