Merge "Switching to the approach with cleanup by selector"

manifests/function/airshipctl-cleanup/kustomization.yaml

@@ -0,0 +1,2 @@
+resources:
+- patch.yaml

manifests/function/airshipctl-cleanup/patch.yaml

@@ -0,0 +1,39 @@
+apiVersion: builtin
+kind: PatchTransformer
+metadata:
+  name: delete-variable-catalogues
+target:
+ kind: VariableCatalogue
+patch: |
+  apiVersion: not-important
+  kind: not-important
+  metadata:
+    name: not-important
+  $patch: delete
+---
+apiVersion: builtin
+kind: PatchTransformer
+metadata:
+  name: delete-versions-catalogues
+target:
+ kind: VersionsCatalogue
+patch: |
+  apiVersion: not-important
+  kind: not-important
+  metadata:
+    name: not-important
+  $patch: delete
+---
+apiVersion: builtin
+kind: PatchTransformer
+metadata:
+  name: delete-network-catalogues
+target:
+ kind: NetworkCatalogue
+patch: |
+  apiVersion: not-important
+  kind: not-important
+  metadata:
+    name: not-important
+  $patch: delete
+

manifests/site/test-site/ephemeral/bootstrap/hostgenerator/kustomization.yaml

@@ -14,6 +14,4 @@ transformers:
   # NOTE We can not use patchesStrategicMerge directive since Strategic Merge
   # plugin has to be executed once all replacements has been done. Therefore
   # we need to load Strategic Merge plugin as an external plugin
-  - ../../../../../function/hostgenerator-m3/cleanup
+  - ../../../../../function/airshipctl-cleanup/
-  - ../../catalogues/cleanup
-  - ../../../../../function/hardwareprofile-example/cleanup

manifests/site/test-site/ephemeral/catalogues/cleanup/kustomization.yaml

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

manifests/site/test-site/ephemeral/catalogues/cleanup/smp.yaml

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

manifests/site/test-site/ephemeral/controlplane/hostgenerator/kustomization.yaml

@@ -14,6 +14,4 @@ transformers:
   # NOTE We can not use patchesStrategicMerge directive since Strategic Merge
   # plugin has to be executed once all replacements has been done. Therefore
   # we need to load Strategic Merge plugin as an external plugin
-  - ../../../../../function/hostgenerator-m3/cleanup
+  - ../../../../../function/airshipctl-cleanup/
-  - ../../catalogues/cleanup
-  - ../../../../../function/hardwareprofile-example/cleanup

manifests/site/test-site/host-inventory/hostgenerator/kustomization.yaml

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

manifests/site/test-site/kubeconfig/kustomization.yaml

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

manifests/site/test-site/target/catalogues/cleanup/kustomization.yaml

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

manifests/site/test-site/target/catalogues/cleanup/smp.yaml

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

manifests/site/test-site/target/controlplane/hostgenerator/kustomization.yaml

@@ -12,6 +12,4 @@ transformers:
   # NOTE We can not use patchesStrategicMerge directive since Strategic Merge
   # plugin has to be executed once all replacements has been done. Therefore
   # we need to load Strategic Merge plugin as an external plugin
-  - ../../../../../function/hostgenerator-m3/cleanup
+  - ../../../../../function/airshipctl-cleanup/
-  - ../../catalogues/cleanup
-  - ../../../../../function/hardwareprofile-example/cleanup

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

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

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

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

manifests/site/test-site/target/workers/hostgenerator/kustomization.yaml

@@ -10,5 +10,4 @@ transformers:
   # NOTE We can not use patchesStrategicMerge directive since Strategic Merge
   # plugin has to be executed once all replacements has been done. Therefore
   # we need to load Strategic Merge plugin as an external plugin
-  - ../../../../../function/hostgenerator-m3/cleanup
+  - ../../../../../function/airshipctl-cleanup/
-  - ../../catalogues/cleanup

manifests/type/gating/target/generator/cleanup/kustomization.yaml

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

manifests/type/gating/target/generator/cleanup/secret-cleanup.yaml

@@ -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