airship
/
treasuremap
Code Issues Proposed changes

Switch to StorageCatalogue and delete deprecated cleanup patches 

Change-Id: Icaa9bc2dfef2e52839421dbe2d9888d6ff779440
Signed-off-by: Andrii Ostapenko <andrii.ostapenko@att.com>
This commit is contained in:
Andrii Ostapenko 2021-05-04 01:15:03 -05:00 committed by chinasubbareddy mallavarapu
parent a9ce7514b0
commit 65900053f9
6 changed files with 16 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/function/treasuremap-cleanup/kustomization.yaml
View File

@ -1,3 +1,4 @@
resources:
- ../../../../airshipctl/manifests/function/airshipctl-cleanup/
# place here more treasuremap specific catalogue kinds
# place here more treasuremap specific catalogue kinds
- patch.yaml

12
manifests/function/treasuremap-cleanup/patch.yaml Normal file
View File

@ -0,0 +1,12 @@
apiVersion: builtin
kind: PatchTransformer
metadata:
name: delete-storage-catalogues
target:
kind: StorageCatalogue
patch: |
apiVersion: not-important
kind: not-important
metadata:
name: not-important
$patch: delete

2
manifests/site/test-site/target/catalogues/storage.yaml
View File

@ -2,7 +2,7 @@
# ephemeral cluster, on top of the target cluster networking definition.
# These values can be overridden at the site, type, etc levels as appropriate.
apiVersion: airshipit.org/v1alpha1
kind: VariableCatalogue
kind: StorageCatalogue
metadata:
name: storage
labels:

2
manifests/site/test-site/target/workload/replacements/ceph-nodes.yaml
View File

@ -11,7 +11,7 @@ metadata:
replacements:
- source:
objref:
kind: VariableCatalogue
kind: StorageCatalogue
name: storage
fieldref: "{.spec.storage}"
target:

53
manifests/site/virtual-network-cloud/ephemeral/bootstrap/hostgenerator/patch-delete-catalogues.yaml
View File

@ -1,53 +0,0 @@
apiVersion: builtin
kind: PatchStrategicMergeTransformer
metadata:
name: smp
patches: |-
---
apiVersion: airshipit.org/v1alpha1
kind: VariableCatalogue
metadata:
name: host-catalogue
$patch: delete
---
apiVersion: airshipit.org/v1alpha1
kind: VariableCatalogue
metadata:
name: host-generation-catalogue
$patch: delete
---
apiVersion: airshipit.org/v1alpha1
kind: NetworkCatalogue
metadata:
name: networking
$patch: delete
---
apiVersion: airshipit.org/v1alpha1
kind: VariableCatalogue
metadata:
name: env-vars-catalogue
$patch: delete
---
apiVersion: airshipit.org/v1alpha1
kind: VersionsCatalogue
metadata:
name: versions-airshipctl
$patch: delete
---
apiVersion: airshipit.org/v1alpha1
kind: VersionsCatalogue
metadata:
name: versions-treasuremap
$patch: delete
---
apiVersion: airshipit.org/v1alpha1
kind: VariableCatalogue
metadata:
name: networking-ha
$patch: delete
---
apiVersion: airshipit.org/v1alpha1
kind: StorageCatalogue
metadata:
name: storage
$patch: delete

53
manifests/site/virtual-network-cloud/target/workers/hostgenerator/patch-delete-catalogues.yaml
View File

@ -1,53 +0,0 @@
apiVersion: builtin
kind: PatchStrategicMergeTransformer
metadata:
name: smp
patches: |-
---
apiVersion: airshipit.org/v1alpha1
kind: VariableCatalogue
metadata:
name: host-catalogue
$patch: delete
---
apiVersion: airshipit.org/v1alpha1
kind: VariableCatalogue
metadata:
name: host-generation-catalogue
$patch: delete
---
apiVersion: airshipit.org/v1alpha1
kind: VariableCatalogue
metadata:
name: networking
$patch: delete
---
apiVersion: airshipit.org/v1alpha1
kind: VariableCatalogue
metadata:
name: env-vars-catalogue
$patch: delete
---
apiVersion: airshipit.org/v1alpha1
kind: VersionsCatalogue
metadata:
name: versions-airshipctl
$patch: delete
---
apiVersion: airshipit.org/v1alpha1
kind: VersionsCatalogue
metadata:
name: versions-treasuremap
$patch: delete
---
apiVersion: airshipit.org/v1alpha1
kind: VariableCatalogue
metadata:
name: networking-ha
$patch: delete
---
apiVersion: airshipit.org/v1alpha1
kind: StorageCatalogue
metadata:
name: storage
$patch: delete