Aligning with NetworkCatalogue & VersionsCatalogue

* Aligning with recent changes of airshipctl

  airshipctl PS:
    https://review.opendev.org/c/airship/airshipctl/+/777023
    https://review.opendev.org/c/airship/airshipctl/+/775464

* uplifting airshipctl version in treasuremap

Change-Id: I92aad33a848b2fadf63eeedf322461dbc03c68ba

manifests/site/test-site/ephemeral/bootstrap/hostgenerator/patch-delete-catalogues.yaml

@@ -1,35 +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: VariableCatalogue
-  metadata:
-    name: versions-airshipctl
-  $patch: delete

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

@@ -11,7 +11,7 @@ patches: |-
   $patch: delete
   ---
   apiVersion: airshipit.org/v1alpha1
-  kind: VariableCatalogue
+  kind: NetworkCatalogue
   metadata:
     name: networking
   $patch: delete
@@ -23,7 +23,7 @@ patches: |-
   $patch: delete
   ---
   apiVersion: airshipit.org/v1alpha1
-  kind: VariableCatalogue
+  kind: VersionsCatalogue
   metadata:
     name: versions-airshipctl
   $patch: delete

manifests/site/test-site/ephemeral/catalogues/networking.yaml

@@ -2,10 +2,11 @@
 # 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: NetworkCatalogue
 metadata:
   name: networking
 
+spec:
   # The catalogue should be overridden as appropriate for different kubernetes
   # clusters, e.g. ephemeral vs target vs tenant
   kubernetes:

manifests/site/test-site/ephemeral/controlplane/hostgenerator/patch-delete-catalogues.yaml

@@ -1,35 +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: VariableCatalogue
-  metadata:
-    name: versions-airshipctl
-  $patch: delete

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

@@ -1,35 +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: VariableCatalogue
-  metadata:
-    name: versions-airshipctl
-  $patch: delete

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

@@ -11,7 +11,7 @@ patches: |-
   $patch: delete
   ---
   apiVersion: airshipit.org/v1alpha1
-  kind: VariableCatalogue
+  kind: NetworkCatalogue
   metadata:
     name: networking
   $patch: delete
@@ -23,7 +23,7 @@ patches: |-
   $patch: delete
   ---
   apiVersion: airshipit.org/v1alpha1
-  kind: VariableCatalogue
+  kind: VersionsCatalogue
   metadata:
     name: versions-airshipctl
   $patch: delete

manifests/site/test-site/target/catalogues/networking.yaml

@@ -2,10 +2,11 @@
 # 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: NetworkCatalogue
 metadata:
   name: networking
 
+spec:
   # The catalogue should be overridden as appropriate for different kubernetes
   # clusters, e.g. ephemeral vs target vs tenant
   kubernetes:

manifests/site/test-site/target/catalogues/versions-airshipctl.yaml

@@ -1,9 +1,10 @@
 # Override default controlplane image location
 apiVersion: airshipit.org/v1alpha1
-kind: VariableCatalogue
+kind: VersionsCatalogue
 metadata:
   name: versions-airshipctl
 
+spec:
   files:
     k8scontrol:
       # Host the image in a locally served location for CI

manifests/site/test-site/target/workers/hostgenerator/patch-delete-catalogues.yaml

@@ -1,35 +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: VariableCatalogue
-  metadata:
-    name: versions-airshipctl
-  $patch: delete

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

@@ -17,7 +17,7 @@ patches: |-
   $patch: delete
   ---
   apiVersion: airshipit.org/v1alpha1
-  kind: VariableCatalogue
+  kind: NetworkCatalogue
   metadata:
     name: networking
   $patch: delete
@@ -29,7 +29,7 @@ patches: |-
   $patch: delete
   ---
   apiVersion: airshipit.org/v1alpha1
-  kind: VariableCatalogue
+  kind: VersionsCatalogue
   metadata:
     name: versions-airshipctl
   $patch: delete

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

@@ -11,7 +11,7 @@ patches: |-
   $patch: delete
   ---
   apiVersion: airshipit.org/v1alpha1
-  kind: VariableCatalogue
+  kind: NetworkCatalogue
   metadata:
     name: networking
   $patch: delete
@@ -23,7 +23,7 @@ patches: |-
   $patch: delete
   ---
   apiVersion: airshipit.org/v1alpha1
-  kind: VariableCatalogue
+  kind: VersionsCatalogue
   metadata:
     name: versions-airshipctl
   $patch: delete

manifests/site/virtual-network-cloud/ephemeral/catalogues/networking.yaml

@@ -2,10 +2,11 @@
 # 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: NetworkCatalogue
 metadata:
   name: networking
 
+spec:
   # The catalogue should be overridden as appropriate for different kubernetes
   # clusters, e.g. ephemeral vs target vs tenant
   kubernetes:

manifests/site/virtual-network-cloud/ephemeral/controlplane/hostgenerator/patch-delete-catalogues.yaml

@@ -17,7 +17,7 @@ patches: |-
   $patch: delete
   ---
   apiVersion: airshipit.org/v1alpha1
-  kind: VariableCatalogue
+  kind: NetworkCatalogue
   metadata:
     name: networking
   $patch: delete
@@ -29,7 +29,7 @@ patches: |-
   $patch: delete
   ---
   apiVersion: airshipit.org/v1alpha1
-  kind: VariableCatalogue
+  kind: VersionsCatalogue
   metadata:
     name: versions-airshipctl
   $patch: delete

manifests/site/virtual-network-cloud/ephemeral/controlplane/versions-catalogue-patch.yaml

@@ -1,9 +1,11 @@
 # Patch the versions catalogue to use the site-specific local image URL
 # TODO: patch this in from a site-networking catalogue in the future
 apiVersion: airshipit.org/v1alpha1
-kind: VariableCatalogue
+kind: VersionsCatalogue
 metadata:
   name: versions-airshipctl
+
+spec:
   files:
     k8scontrol:
       cluster_controlplane_image:

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

@@ -11,7 +11,7 @@ patches: |-
   $patch: delete
   ---
   apiVersion: airshipit.org/v1alpha1
-  kind: VariableCatalogue
+  kind: NetworkCatalogue
   metadata:
     name: networking
   $patch: delete
@@ -23,7 +23,7 @@ patches: |-
   $patch: delete
   ---
   apiVersion: airshipit.org/v1alpha1
-  kind: VariableCatalogue
+  kind: VersionsCatalogue
   metadata:
     name: versions-airshipctl
   $patch: delete

manifests/site/virtual-network-cloud/target/catalogues/networking.yaml

@@ -2,10 +2,11 @@
 # 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: NetworkCatalogue
 metadata:
   name: networking
 
+spec:
   # The catalogue should be overridden as appropriate for different kubernetes
   # clusters, e.g. ephemeral vs target vs tenant
   kubernetes:

manifests/site/virtual-network-cloud/target/catalogues/versions-airshipctl.yaml

@@ -1,9 +1,10 @@
 # Override default controlplane image location
 apiVersion: airshipit.org/v1alpha1
-kind: VariableCatalogue
+kind: VersionsCatalogue
 metadata:
   name: versions-airshipctl
 
+spec:
   files:
     k8scontrol:
       # Host the image in a locally served location for CI

manifests/type/airship-core/shared/catalogues/networking.yaml

@@ -1,12 +1,12 @@
 # The default networking catalogue for functions hosted in the airshipctl project.
 # These values can be overridden at the site, type, etc levels as appropriate.
 apiVersion: airshipit.org/v1alpha1
-kind: VariableCatalogue
+kind: NetworkCatalogue
 metadata:
   labels:
     airshipit.org/deploy-k8s: "false"
   name: networking
-
+spec:
   # This section is only relevant when using Metal3 BareMetalHosts, and
   # is consumed by the `hostgenerator-m3` function.
   # It defines host-level networking that is common across all BMHs in a site,

playbooks/airship-treasuremap-gate-runner.yaml

@@ -16,7 +16,7 @@
   environment:
     SOPS_IMPORT_PGP: "{{ airship_config_pgp }}"
     SOPS_PGP_FP: "{{ airship_config_pgp_fp }}"
-    AIRSHIPCTL_REF: "681f8547c989e862d155f2e9f2c794c89326d931"
+    AIRSHIPCTL_REF: "5820e22d9f436df2f93d8b71286b2ad0492279bc"
   tasks:
     - name: "set default gate scripts"
       set_fact: