airship
/
treasuremap
Code Issues Proposed changes

Merge "Switching to the approach with cleanup by selector"

This commit is contained in:
Zuul 2021-04-21 20:12:36 +00:00 committed by Gerrit Code Review
parent 1db18e72c9 e3caf14b0d
commit 409276c04a
29 changed files with 19 additions and 238 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/function/hostconfig-operator/replacements/ssh-key-replacement.yaml
View File

@ -6,7 +6,7 @@ metadata:
annotations:
config.kubernetes.io/function: |-
container:
image: quay.io/airshipit/replacement-transformer:v2.0.2
image: quay.io/airshipit/replacement-transformer:v2
replacements:
- source:
objref:

2
manifests/function/synclabeller/replacements/versions.yaml
View File

@ -5,7 +5,7 @@ metadata:
annotations:
config.kubernetes.io/function: |-
container:
image: quay.io/airshipit/replacement-transformer:latest
image: quay.io/airshipit/replacement-transformer:v2
replacements:
- source:
objref:

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

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

4
manifests/site/test-site/ephemeral/bootstrap/hostgenerator/kustomization.yaml
View File

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

3
manifests/site/test-site/ephemeral/catalogues/cleanup/kustomization.yaml
View File

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

41
manifests/site/test-site/ephemeral/catalogues/cleanup/smp.yaml
View File

@ -1,41 +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

4
manifests/site/test-site/ephemeral/controlplane/hostgenerator/kustomization.yaml
View File

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

3
manifests/site/test-site/host-inventory/hostgenerator/kustomization.yaml
View File

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

2
manifests/site/test-site/kubeconfig/kustomization.yaml
View File

@ -4,4 +4,4 @@ resources:
transformers:
- update-target.yaml
- ../target/catalogues/cleanup
- ../../../function/treasuremap-cleanup

3
manifests/site/test-site/target/catalogues/cleanup/kustomization.yaml
View File

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

41
manifests/site/test-site/target/catalogues/cleanup/smp.yaml
View File

@ -1,41 +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

2
manifests/site/test-site/target/generator/results/cleanup/kustomization.yaml
View File

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

2
manifests/site/test-site/target/generator/results/cleanup/override/kustomization.yaml
View File

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

4
manifests/site/test-site/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

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

2
manifests/type/airship-core/target/generator/cleanup/kustomization.yaml
View File

@ -1,2 +0,0 @@
resources:
- secret-cleanup.yaml

11
manifests/type/airship-core/target/generator/cleanup/secret-cleanup.yaml
View File

@ -1,11 +0,0 @@
apiVersion: builtin
kind: PatchStrategicMergeTransformer
metadata:
name: smp_cleanup
patches: |-
---
apiVersion: airshipit.org/v1alpha1
kind: VariableCatalogue
metadata:
name: generated-secrets
$patch: delete

4
manifests/type/multi-tenant/sub-clusters/lma/catalogue-replacements/subcluster-networking.yaml
View File

@ -8,7 +8,7 @@ metadata:
annotations:
config.kubernetes.io/function: |-
container:
image: quay.io/airshipit/replacement-transformer:latest
image: quay.io/airshipit/replacement-transformer:v2
replacements:
# Replace Kubernetes networking info
- source:
@ -30,4 +30,4 @@ replacements:
objref:
kind: NetworkCatalogue
name: networking
fieldrefs: ["{.spec.port_range}"]
fieldrefs: ["{.spec.port_range}"]

4
manifests/type/multi-tenant/sub-clusters/wordpress/catalogue-replacements/subcluster-networking.yaml
View File

@ -5,7 +5,7 @@ metadata:
annotations:
config.kubernetes.io/function: |-
container:
image: quay.io/airshipit/replacement-transformer:latest
image: quay.io/airshipit/replacement-transformer:v2
replacements:
# Replace Kubernetes networking info
- source:
@ -27,4 +27,4 @@ replacements:
objref:
kind: NetworkCatalogue
name: networking
fieldrefs: ["{.spec.port_range}"]
fieldrefs: ["{.spec.port_range}"]

2
tools/deployment/35_deploy_worker_node.sh
View File

@ -24,7 +24,7 @@ export WORKER_NODE=${WORKER_NODE:-"$(airshipctl phase render workers-target \
sed 's/"//g')"}
# Annotate node for hostconfig-operator
hosts=(kubectl \
hosts=$(kubectl \
--kubeconfig $KUBECONFIG \
--context $KUBECONFIG_TARGET_CONTEXT \
--request-timeout 10s get nodes -o name)

2
zuul.d/projects.yaml
View File

@ -14,7 +14,7 @@
vars:
# NOTE(drewwalters96): Set AIRSHIPCTL_REF to a commit SHA in order to pin
# the cloned version of airshipctl to a known/compatible reference.
AIRSHIPCTL_REF: "63c1faf718fd3341fc5bd975e575e3cf41647206"
AIRSHIPCTL_REF: "fcfad3533a73355c55d0aacb135dac0d1acd6a4f"
sphinx_build_dir: docs/build
check:
jobs: