Browse Source

Switching to the approach with cleanup by selector

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
changes/76/787276/8
Alexey Odinokov 3 weeks ago
parent
commit
e3caf14b0d
29 changed files with 19 additions and 238 deletions
  1. +1
    -1
      manifests/function/hostconfig-operator/replacements/ssh-key-replacement.yaml
  2. +1
    -1
      manifests/function/synclabeller/replacements/versions.yaml
  3. +3
    -0
      manifests/function/treasuremap-cleanup/kustomization.yaml
  4. +1
    -3
      manifests/site/test-site/ephemeral/bootstrap/hostgenerator/kustomization.yaml
  5. +0
    -3
      manifests/site/test-site/ephemeral/catalogues/cleanup/kustomization.yaml
  6. +0
    -41
      manifests/site/test-site/ephemeral/catalogues/cleanup/smp.yaml
  7. +1
    -3
      manifests/site/test-site/ephemeral/controlplane/hostgenerator/kustomization.yaml
  8. +1
    -2
      manifests/site/test-site/host-inventory/hostgenerator/kustomization.yaml
  9. +1
    -1
      manifests/site/test-site/kubeconfig/kustomization.yaml
  10. +0
    -3
      manifests/site/test-site/target/catalogues/cleanup/kustomization.yaml
  11. +0
    -41
      manifests/site/test-site/target/catalogues/cleanup/smp.yaml
  12. +0
    -2
      manifests/site/test-site/target/generator/results/cleanup/kustomization.yaml
  13. +0
    -2
      manifests/site/test-site/target/generator/results/cleanup/override/kustomization.yaml
  14. +1
    -3
      manifests/site/test-site/target/workers/hostgenerator/kustomization.yaml
  15. +1
    -3
      manifests/site/virtual-network-cloud/ephemeral/bootstrap/hostgenerator/kustomization.yaml
  16. +0
    -3
      manifests/site/virtual-network-cloud/ephemeral/catalogues/cleanup/kustomization.yaml
  17. +0
    -47
      manifests/site/virtual-network-cloud/ephemeral/catalogues/cleanup/smp.yaml
  18. +1
    -2
      manifests/site/virtual-network-cloud/ephemeral/controlplane/hostgenerator/kustomization.yaml
  19. +0
    -3
      manifests/site/virtual-network-cloud/target/catalogues/cleanup/kustomization.yaml
  20. +0
    -48
      manifests/site/virtual-network-cloud/target/catalogues/cleanup/smp.yaml
  21. +0
    -2
      manifests/site/virtual-network-cloud/target/generator/results/cleanup/kustomization.yaml
  22. +0
    -2
      manifests/site/virtual-network-cloud/target/generator/results/cleanup/override/kustomization.yaml
  23. +1
    -3
      manifests/site/virtual-network-cloud/target/workers/hostgenerator/kustomization.yaml
  24. +0
    -2
      manifests/type/airship-core/target/generator/cleanup/kustomization.yaml
  25. +0
    -11
      manifests/type/airship-core/target/generator/cleanup/secret-cleanup.yaml
  26. +2
    -2
      manifests/type/multi-tenant/sub-clusters/lma/catalogue-replacements/subcluster-networking.yaml
  27. +2
    -2
      manifests/type/multi-tenant/sub-clusters/wordpress/catalogue-replacements/subcluster-networking.yaml
  28. +1
    -1
      tools/deployment/35_deploy_worker_node.sh
  29. +1
    -1
      zuul.d/projects.yaml

+ 1
- 1
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:


+ 1
- 1
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
- 0
manifests/function/treasuremap-cleanup/kustomization.yaml View File

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

+ 1
- 3
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

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

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

+ 0
- 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

+ 1
- 3
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

+ 1
- 2
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

+ 1
- 1
manifests/site/test-site/kubeconfig/kustomization.yaml View File

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

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

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

+ 0
- 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

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

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

+ 0
- 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/

+ 1
- 3
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

+ 1
- 3
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

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

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

+ 0
- 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

+ 1
- 2
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

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

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

+ 0
- 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

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

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

+ 0
- 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/

+ 1
- 3
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

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

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

+ 0
- 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

+ 2
- 2
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}"]

+ 2
- 2
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}"]

+ 1
- 1
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)


+ 1
- 1
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:


Loading…
Cancel
Save