Fix ingress replacements and catalogue inheritance

The ingress function replacements are applied at the type level in
Treasuremap, against common conventions. This has created inheritance
challenges because its replacements are from the airshipctl versions
catalogue.

This change moves the application of the ingress replacements to the
site level and fixes the version catalogue inheritance.

Signed-off-by: Drew Walters <andrew.walters@att.com>
Change-Id: I24254fb36c5a9e2b2116edd0d67ac7f11725a65f
This commit is contained in:
Drew Walters 2021-03-11 15:40:51 +00:00
parent 3561c823bb
commit ed15da7b3b
12 changed files with 51 additions and 7 deletions

View File

@ -27,3 +27,9 @@ patches: |-
metadata:
name: versions-airshipctl
$patch: delete
---
apiVersion: airshipit.org/v1alpha1
kind: VersionsCatalogue
metadata:
name: versions-treasuremap
$patch: delete

View File

@ -27,3 +27,9 @@ patches: |-
metadata:
name: versions-airshipctl
$patch: delete
---
apiVersion: airshipit.org/v1alpha1
kind: VersionsCatalogue
metadata:
name: versions-treasuremap
$patch: delete

View File

@ -1,2 +1,5 @@
resources:
- ../../../../type/airship-core/target/workload
- ../catalogues
transformers:
- ../../../../../../airshipctl/manifests/type/gating/target/workload/ingress/replacements

View File

@ -33,3 +33,9 @@ patches: |-
metadata:
name: versions-airshipctl
$patch: delete
---
apiVersion: airshipit.org/v1alpha1
kind: VersionsCatalogue
metadata:
name: versions-treasuremap
$patch: delete

View File

@ -27,3 +27,9 @@ patches: |-
metadata:
name: versions-airshipctl
$patch: delete
---
apiVersion: airshipit.org/v1alpha1
kind: VersionsCatalogue
metadata:
name: versions-treasuremap
$patch: delete

View File

@ -33,3 +33,9 @@ patches: |-
metadata:
name: versions-airshipctl
$patch: delete
---
apiVersion: airshipit.org/v1alpha1
kind: VersionsCatalogue
metadata:
name: versions-treasuremap
$patch: delete

View File

@ -27,3 +27,9 @@ patches: |-
metadata:
name: versions-airshipctl
$patch: delete
---
apiVersion: airshipit.org/v1alpha1
kind: VersionsCatalogue
metadata:
name: versions-treasuremap
$patch: delete

View File

@ -29,7 +29,13 @@ patches: |-
$patch: delete
---
apiVersion: airshipit.org/v1alpha1
kind: VariableCatalogue
kind: VersionsCatalogue
metadata:
name: versions-airshipctl
$patch: delete
---
apiVersion: airshipit.org/v1alpha1
kind: VersionsCatalogue
metadata:
name: versions-treasuremap
$patch: delete

View File

@ -1,2 +1,5 @@
resources:
- ../../../../type/airship-core/target/workload
- ../../../../type/multi-tenant/target/workload
- ../catalogues
transformers:
- ../../../../../../airshipctl/manifests/type/gating/target/workload/ingress/replacements

View File

@ -2,6 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- ../../../../../../airshipctl/manifests/function/airshipctl-base-catalogues
- ../../../../function/treasuremap-base-catalogues
patchesStrategicMerge:
- networking.yaml
# Uncomment to patch versions catalogue once needed

View File

@ -1,6 +1,2 @@
resources:
- ../../../../../../airshipctl/manifests/function/airshipctl-base-catalogues
- ../../../../../../airshipctl/manifests/type/gating/target/workload
transformers:
- ../../../../../../airshipctl/manifests/type/gating/target/workload/ingress/replacements

View File

@ -9,4 +9,3 @@ resources:
# Uncomment to patch versions catalogue once needed
# patchesStrategicMerge:
# - versions.yaml