Decouple catalogues from phases

Current implementation does not allow to avoid inheriting from
airhipctl-base-catalogues in phases. This commit decouples phases
from catalogues allowing to declare cataloues down the stream.

Change-Id: Iffa064f196f2bd7fb8aaaa951adb521abfa541b5
Signed-off-by: Andrii Ostapenko <andrii.ostapenko@att.com>
This commit is contained in:
Andrii Ostapenko 2021-05-06 22:05:05 -05:00 committed by Andrii Ostapenko
parent 0d588c83b1
commit 5fa88cae45
6 changed files with 15 additions and 3 deletions

View File

@ -4,13 +4,11 @@ resources:
- executors.yaml
- cluster-map.yaml
- ../function/clusterctl
- ../function/airshipctl-base-catalogues
# Scripts for generic containers
- ../function/phase-helpers
patchesStrategicMerge:
- clusterctl_init_options.yaml
transformers:
- ../function/clusterctl/replacements
# NOTE(aostapenko) Consume AIRSHIPCTL_EPHEMERAL_ISO_URL here that will
# have precedence over phase catalogue isoURL value
- ../function/bootstrap

View File

@ -1,5 +1,6 @@
resources:
- ../../../phases
- ../../function/airshipctl-base-catalogues
patchesStrategicMerge:
- plan.yaml
patchesJson6902:
@ -9,3 +10,5 @@ patchesJson6902:
kind: Clusterctl
name: "clusterctl_init"
path: infrastructure-providers.json
transformers:
- ../../../function/clusterctl/replacements

View File

@ -1,5 +1,6 @@
resources:
- ../../../phases
- ../../function/airshipctl-base-catalogues
patchesStrategicMerge:
- plan.yaml
patchesJson6902:
@ -9,3 +10,5 @@ patchesJson6902:
kind: Clusterctl
name: "clusterctl_init"
path: infrastructure-providers.json
transformers:
- ../../../function/clusterctl/replacements

View File

@ -1,5 +1,6 @@
resources:
- ../../../phases
- ../../function/airshipctl-base-catalogues
patchesStrategicMerge:
- plan.yaml
patchesJson6902:
@ -9,3 +10,5 @@ patchesJson6902:
kind: Clusterctl
name: "clusterctl_init"
path: infrastructure-providers.json
transformers:
- ../../../function/clusterctl/replacements

View File

@ -1,5 +1,6 @@
resources:
- ../../../phases
- ../../function/airshipctl-base-catalogues
patchesStrategicMerge:
- plan.yaml
patchesJson6902:
@ -8,4 +9,6 @@ patchesJson6902:
version: v1alpha1
kind: Clusterctl
name: "clusterctl_init"
path: infrastructure-providers.json
path: infrastructure-providers.json
transformers:
- ../../../function/clusterctl/replacements

View File

@ -1,8 +1,10 @@
resources:
- ../kubeconfig
- ../../../phases
- ../target/catalogues
- catalogue.yaml
- validation-config.yaml
transformers:
- ../../../function/clusterctl/replacements
- ../../../function/bootstrap/replacements
- ../../../function/validator