airship/treasuremap
Code Issues Proposed changes

Switching to the approach with cleanup by selector

Browse Source 
Changes to reflect [1] in treasuremap
Fixed issue in /tools/deployment/35_deploy_worker_node.sh
Aligned the tag of replacement pluging everywhere

[1]
https://review.opendev.org/c/airship/airshipctl/+/779829

Relates-To: #125
Change-Id: I24e3228e73714a14d42f28743b20f89d860f950e
This commit is contained in:
Alexey Odinokov
2021-04-20 18:03:38 +00:00
parent 3e5795c0d1
commit e3caf14b0d
29 changed files with 19 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/site/virtual-network-cloud/ephemeral/bootstrap/hostgenerator/kustomization.yaml
View File

@@ -7,6 +7,4 @@ resources:
transformers:
- ../../../../../../../airshipctl/manifests/function/hostgenerator-m3/replacements
- ../../../../../../../airshipctl/manifests/function/hostgenerator-m3/cleanup
- ../../catalogues/cleanup
# - ../../../../../../../airshipctl/manifests/function/hardwareprofile-example/cleanup
- ../../../../../function/treasuremap-cleanup

3
manifests/site/virtual-network-cloud/ephemeral/catalogues/cleanup/kustomization.yaml
View File

@@ -1,3 +0,0 @@
resources:
- smp.yaml
- ../../../target/generator/results/cleanup/

47
manifests/site/virtual-network-cloud/ephemeral/catalogues/cleanup/smp.yaml
View File

@@ -1,47 +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: 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: VariableCatalogue
metadata:
name: versions-treasuremap
$patch: delete
---
apiVersion: airshipit.org/v1alpha1
kind: VariableCatalogue
metadata:
name: networking-ha
$patch: delete
---
apiVersion: airshipit.org/v1alpha1
kind: VariableCatalogue
metadata:
name: subcluster-networking
$patch: delete

3
manifests/site/virtual-network-cloud/ephemeral/controlplane/hostgenerator/kustomization.yaml
View File

@@ -7,5 +7,4 @@ resources:
transformers:
- ../../../../../../../airshipctl/manifests/function/hostgenerator-m3/replacements
- ../../../../../../../airshipctl/manifests/function/hostgenerator-m3/cleanup
- ../../catalogues/cleanup
- ../../../../../function/treasuremap-cleanup

3
manifests/site/virtual-network-cloud/target/catalogues/cleanup/kustomization.yaml
View File

@@ -1,3 +0,0 @@
resources:
- smp.yaml
- ../../generator/results/cleanup/

48
manifests/site/virtual-network-cloud/target/catalogues/cleanup/smp.yaml
View File

@@ -1,48 +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: 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: VariableCatalogue
metadata:
name: versions-treasuremap
$patch: delete
---
apiVersion: airshipit.org/v1alpha1
kind: VariableCatalogue
metadata:
name: networking-ha
$patch: delete
---
apiVersion: airshipit.org/v1alpha1
kind: VariableCatalogue
metadata:
name: subcluster-networking
$patch: delete

2
manifests/site/virtual-network-cloud/target/generator/results/cleanup/kustomization.yaml
View File

@@ -1,2 +0,0 @@
resources:
- override

2
manifests/site/virtual-network-cloud/target/generator/results/cleanup/override/kustomization.yaml
View File

@@ -1,2 +0,0 @@
resources:
- ../../../../../../../type/airship-core/target/generator/cleanup/

4
manifests/site/virtual-network-cloud/target/workers/hostgenerator/kustomization.yaml
View File

@@ -7,6 +7,4 @@ resources:
transformers:
- ../../../../../../../airshipctl/manifests/function/hostgenerator-m3/replacements
- ../../../../../../../airshipctl/manifests/function/hostgenerator-m3/cleanup
- ../../catalogues/cleanup
- ../../../../../function/treasuremap-cleanup