Bump airshipctl pin

This bumps the airshipctl pin to the latest merged commit as of 4/1 a.m.,
which includes the kustomize install script[1]  needed by the corresponding
treasuremap change[2], as well as the helm-chart-collator fix here[3].

It also reverts the treasuremap versions catalogue to a VariableCatalogue
kind, since it doesn't currently adhere to the VersionsCatalogue schema.
That will need to be trued up post-2.0-release.

1: https://review.opendev.org/c/airship/airshipctl/+/783907
2: https://review.opendev.org/c/airship/treasuremap/+/783911
3: https://review.opendev.org/c/airship/airshipctl/+/784122

Change-Id: I40d81c6bbe20a9a24af26cbb50791d6afef50149

manifests/function/grafana/replacements/versions.yaml

@@ -9,7 +9,7 @@ metadata:
 replacements:
 - source:
     objref:
-      kind: VersionsCatalogue
+      kind: VariableCatalogue
       name: versions-treasuremap
     fieldref: "{.spec.helm_repositories.grafana}"
   target:
@@ -19,7 +19,7 @@ replacements:
     fieldrefs: ["{.spec}"]
 - source:
     objref:
-      kind: VersionsCatalogue
+      kind: VariableCatalogue
       name: versions-treasuremap
     fieldref: "{.spec.charts.grafana.chart}"
   target:
@@ -29,7 +29,7 @@ replacements:
     fieldrefs: ["{.spec.chart.spec.chart}"]
 - source:
     objref:
-      kind: VersionsCatalogue
+      kind: VariableCatalogue
       name: versions-treasuremap
     fieldref: "{.spec.charts.grafana.version}"
   target:
@@ -39,7 +39,7 @@ replacements:
     fieldrefs: ["{.spec.chart.version}"]
 - source:
     objref:
-      kind: VersionsCatalogue
+      kind: VariableCatalogue
       name: versions-treasuremap
     fieldref: "{.spec.images.grafana}"
   target:

manifests/function/ingress/replacements/versions.yaml

@@ -9,7 +9,7 @@ metadata:
 replacements:
 - source:
     objref:
-      kind: VersionsCatalogue
+      kind: VariableCatalogue
       name: versions-treasuremap
     fieldref: "{.spec.helm_repositories.ingress-nginx.url}"
   target:
@@ -19,7 +19,7 @@ replacements:
     fieldrefs: ["{.spec.url}"]
 - source:
     objref:
-      kind: VersionsCatalogue
+      kind: VariableCatalogue
       name: versions-treasuremap
     fieldref: "{.spec.charts.ingress-nginx.chart}"
   target:
@@ -29,7 +29,7 @@ replacements:
     fieldrefs: ["{.spec.chart.spec.chart}"]
 - source:
     objref:
-      kind: VersionsCatalogue
+      kind: VariableCatalogue
       name: versions-treasuremap
     fieldref: "{.spec.charts.ingress-nginx.version}"
   target:
@@ -39,7 +39,7 @@ replacements:
     fieldrefs: ["{.spec.chart.spec.version}"]
 - source:
     objref:
-      kind: VersionsCatalogue
+      kind: VariableCatalogue
       name: versions-treasuremap
     fieldref: "{.spec.images.ingress-nginx.controller.repository}"
   target:
@@ -49,7 +49,7 @@ replacements:
     fieldrefs: ["{.spec.values.controller.image.repository}"]
 - source:
     objref:
-      kind: VersionsCatalogue
+      kind: VariableCatalogue
       name: versions-treasuremap
     fieldref: "{.spec.images.ingress-nginx.controller.tag}"
   target:
@@ -59,7 +59,7 @@ replacements:
     fieldrefs: ["{.spec.values.controller.image.tag}"]
 - source:
     objref:
-      kind: VersionsCatalogue
+      kind: VariableCatalogue
       name: versions-treasuremap
     fieldref: "{.spec.images.ingress-nginx.defaultBackend.repository}"
   target:
@@ -69,7 +69,7 @@ replacements:
     fieldrefs: ["{.spec.values.defaultBackend.image.repository}"]
 - source:
     objref:
-      kind: VersionsCatalogue
+      kind: VariableCatalogue
       name: versions-treasuremap
     fieldref: "{.spec.images.ingress-nginx.defaultBackend.tag}"
   target:

manifests/function/kube-prometheus-stack/replacements/versions.yaml

@@ -10,7 +10,7 @@ replacements:
 # Helm Repo
 - source:
     objref:
-      kind: VersionsCatalogue
+      kind: VariableCatalogue
       name: versions-treasuremap
     fieldref: "{.spec.helm_repositories.kube_prometheus_stack}"
   target:
@@ -22,7 +22,7 @@ replacements:
 # Chart
 - source:
     objref:
-      kind: VersionsCatalogue
+      kind: VariableCatalogue
       name: versions-treasuremap
     fieldref: "{.spec.charts.kube_prometheus_stack.chart}"
   target:
@@ -32,7 +32,7 @@ replacements:
     fieldrefs: ["{.spec.chart.spec.chart}"]
 - source:
     objref:
-      kind: VersionsCatalogue
+      kind: VariableCatalogue
       name: versions-treasuremap
     fieldref: "{.spec.charts.kube_prometheus_stack.version}"
   target:
@@ -44,7 +44,7 @@ replacements:
 # Images
 - source:
     objref:
-      kind: VersionsCatalogue
+      kind: VariableCatalogue
       name: versions-treasuremap
     fieldref: "{.spec.images.kube_prometheus_stack.admission_webhooks}"
   target:
@@ -54,7 +54,7 @@ replacements:
     fieldrefs: ["{.spec.values.prometheusOperator.admissionWebhooks.patch.image}"]
 - source:
     objref:
-      kind: VersionsCatalogue
+      kind: VariableCatalogue
       name: versions-treasuremap
     fieldref: "{.spec.images.kube_prometheus_stack.alertmanager}"
   target:
@@ -64,7 +64,7 @@ replacements:
     fieldrefs: ["{.spec.values.alertmanager.alertmanagerSpec.image}"]
 - source:
     objref:
-      kind: VersionsCatalogue
+      kind: VariableCatalogue
       name: versions-treasuremap
     fieldref: "{.spec.images.kube_prometheus_stack.prometheus}"
   target:
@@ -74,7 +74,7 @@ replacements:
     fieldrefs: ["{.spec.values.prometheusOperator.prometheusSpec.image}"]
 - source:
     objref:
-      kind: VersionsCatalogue
+      kind: VariableCatalogue
       name: versions-treasuremap
     fieldref: "{.spec.images.kube_prometheus_stack.prometheus_config_reloader}"
   target:
@@ -84,7 +84,7 @@ replacements:
     fieldrefs: ["{.spec.values.prometheusOperator.prometheusConfigReloaderImage}"]
 - source:
     objref:
-      kind: VersionsCatalogue
+      kind: VariableCatalogue
       name: versions-treasuremap
     fieldref: "{.spec.images.kube_prometheus_stack.prometheus_operator.alertmanagerDefaultBaseImage}"
   target:
@@ -94,7 +94,7 @@ replacements:
     fieldrefs: ["{.spec.values.prometheusOperator.alertmanagerDefaultBaseImage}"]
 - source:
     objref:
-      kind: VersionsCatalogue
+      kind: VariableCatalogue
       name: versions-treasuremap
     fieldref: "{.spec.images.kube_prometheus_stack.prometheus_operator.prometheusDefaultBaseImage}"
   target:
@@ -104,7 +104,7 @@ replacements:
     fieldrefs: ["{.spec.values.prometheusOperator.prometheusDefaultBaseImage}"]
 - source:
     objref:
-      kind: VersionsCatalogue
+      kind: VariableCatalogue
       name: versions-treasuremap
     fieldref: "{.spec.images.kube_prometheus_stack.prometheus_operator.image}"
   target:
@@ -114,7 +114,7 @@ replacements:
     fieldrefs: ["{.spec.values.prometheusOperator.image}"]
 - source:
     objref:
-      kind: VersionsCatalogue
+      kind: VariableCatalogue
       name: versions-treasuremap
     fieldref: "{.spec.images.kube_prometheus_stack.thanos}"
   target:

manifests/function/logging-operator/replacements/versions.yaml

@@ -10,7 +10,7 @@ replacements:
 # Helm Repo (logging-operator and logging-operator-logging charts)
 - source:
     objref:
-      kind: VersionsCatalogue
+      kind: VariableCatalogue
       name: versions-treasuremap
     fieldref: "{.spec.helm_repositories.logging_operator}"
   target:
@@ -22,7 +22,7 @@ replacements:
 # Logging-operator Chart
 - source:
     objref:
-      kind: VersionsCatalogue
+      kind: VariableCatalogue
       name: versions-treasuremap
     fieldref: "{.spec.charts.logging_operator.chart}"
   target:
@@ -32,7 +32,7 @@ replacements:
     fieldrefs: ["{.spec.chart.spec.chart}"]
 - source:
     objref:
-      kind: VersionsCatalogue
+      kind: VariableCatalogue
       name: versions-treasuremap
     fieldref: "{.spec.charts.logging_operator.version}"
   target:
@@ -44,7 +44,7 @@ replacements:
 # Logging-operator-logging Chart
 - source:
     objref:
-      kind: VersionsCatalogue
+      kind: VariableCatalogue
       name: versions-treasuremap
     fieldref: "{.spec.charts.logging_operator_logging.chart}"
   target:
@@ -54,7 +54,7 @@ replacements:
     fieldrefs: ["{.spec.chart.spec.chart}"]
 - source:
     objref:
-      kind: VersionsCatalogue
+      kind: VariableCatalogue
       name: versions-treasuremap
     fieldref: "{.spec.charts.logging_operator_logging.version}"
   target:
@@ -66,7 +66,7 @@ replacements:
 # Logging-operator Chart Image
 - source:
     objref:
-      kind: VersionsCatalogue
+      kind: VariableCatalogue
       name: versions-treasuremap
     fieldref: "{.spec.images.logging_operator}"
   target:
@@ -78,7 +78,7 @@ replacements:
 # Logging-operator-logging Chart Images
 - source:
     objref:
-      kind: VersionsCatalogue
+      kind: VariableCatalogue
       name: versions-treasuremap
     fieldref: "{.spec.images.logging_operator_logging.config_reloader}"
   target:
@@ -88,7 +88,7 @@ replacements:
     fieldrefs: ["{.spec.values.fluentd.configReloaderImage}"]
 - source:
     objref:
-      kind: VersionsCatalogue
+      kind: VariableCatalogue
       name: versions-treasuremap
     fieldref: "{.spec.images.logging_operator_logging.fluentbit}"
   target:
@@ -98,7 +98,7 @@ replacements:
     fieldrefs: ["{.spec.values.fluentbit.image}"]
 - source:
     objref:
-      kind: VersionsCatalogue
+      kind: VariableCatalogue
       name: versions-treasuremap
     fieldref: "{.spec.images.logging_operator_logging.fluentd}"
   target:
@@ -108,7 +108,7 @@ replacements:
     fieldrefs: ["{.spec.values.fluentd.image}"]
 - source:
     objref:
-      kind: VersionsCatalogue
+      kind: VariableCatalogue
       name: versions-treasuremap
     fieldref: "{.spec.images.logging_operator_logging.volume_mod}"
   target:

manifests/function/minio/replacements/versions.yaml

@@ -9,7 +9,7 @@ metadata:
 replacements:
 - source:
     objref:
-      kind: VersionsCatalogue
+      kind: VariableCatalogue
       name: versions-treasuremap
     fieldref: "{.spec.helm_repositories.minio}"
   target:
@@ -20,7 +20,7 @@ replacements:
 
 - source:
     objref:
-      kind: VersionsCatalogue
+      kind: VariableCatalogue
       name: versions-treasuremap
     fieldref: "{.spec.charts.minio.chart}"
   target:
@@ -30,7 +30,7 @@ replacements:
     fieldrefs: ["{.spec.chart.spec.chart}"]
 - source:
     objref:
-      kind: VersionsCatalogue
+      kind: VariableCatalogue
       name: versions-treasuremap
     fieldref: "{.spec.charts.minio.version}"
   target:
@@ -41,7 +41,7 @@ replacements:
 
 - source:
     objref:
-      kind: VersionsCatalogue
+      kind: VariableCatalogue
       name: versions-treasuremap
     fieldref: "{.spec.images.minio.minio}"
   target:
@@ -52,7 +52,7 @@ replacements:
 
 - source:
     objref:
-      kind: VersionsCatalogue
+      kind: VariableCatalogue
       name: versions-treasuremap
     fieldref: "{.spec.images.minio.mc}"
   target:

manifests/function/sip/replacements/versions.yaml

@@ -9,7 +9,7 @@ metadata:
 replacements:
 - source:
     objref:
-      kind: VersionsCatalogue
+      kind: VariableCatalogue
       name: versions-treasuremap
     fieldref: "{.spec.images.sip.manager}"
   target:
@@ -19,7 +19,7 @@ replacements:
     fieldrefs: ["{.spec.template.spec.containers[?(.name == 'manager')].image}"]
 - source:
     objref:
-      kind: VersionsCatalogue
+      kind: VariableCatalogue
       name: versions-treasuremap
     fieldref: "{.spec.images.sip.kube-rbac-proxy}"
   target:

manifests/function/thanos-operator/replacements/versions.yaml

@@ -9,7 +9,7 @@ metadata:
 replacements:
 - source:
     objref:
-      kind: VersionsCatalogue
+      kind: VariableCatalogue
       name: versions-treasuremap
     fieldref: "{.spec.helm_repositories.thanos}"
   target:
@@ -20,7 +20,7 @@ replacements:
 
 - source:
     objref:
-      kind: VersionsCatalogue
+      kind: VariableCatalogue
       name: versions-treasuremap
     fieldref: "{.spec.charts.thanos.chart}"
   target:
@@ -30,7 +30,7 @@ replacements:
     fieldrefs: ["{.spec.chart.spec.chart}"]
 - source:
     objref:
-      kind: VersionsCatalogue
+      kind: VariableCatalogue
       name: versions-treasuremap
     fieldref: "{.spec.charts.thanos.version}"
   target:
@@ -41,7 +41,7 @@ replacements:
 
 - source:
     objref:
-      kind: VersionsCatalogue
+      kind: VariableCatalogue
       name: versions-treasuremap
     fieldref: "{.spec.images.thanos}"
   target:

manifests/function/treasuremap-base-catalogues/versions-treasuremap.yaml

@@ -1,5 +1,5 @@
 apiVersion: airshipit.org/v1alpha1
-kind: VersionsCatalogue
+kind: VariableCatalogue
 metadata:
   name: versions-treasuremap
   labels:

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

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

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

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

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

@@ -35,7 +35,7 @@ patches: |-
   $patch: delete
   ---
   apiVersion: airshipit.org/v1alpha1
-  kind: VersionsCatalogue
+  kind: VariableCatalogue
   metadata:
     name: versions-treasuremap
   $patch: delete

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

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

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

@@ -35,7 +35,7 @@ patches: |-
   $patch: delete
   ---
   apiVersion: airshipit.org/v1alpha1
-  kind: VersionsCatalogue
+  kind: VariableCatalogue
   metadata:
     name: versions-treasuremap
   $patch: delete

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

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

manifests/site/virtual-network-cloud/target/workers/hostgenerator/patch-delete-catalogues.yaml

@@ -35,7 +35,7 @@ patches: |-
   $patch: delete
   ---
   apiVersion: airshipit.org/v1alpha1
-  kind: VersionsCatalogue
+  kind: VariableCatalogue
   metadata:
     name: versions-treasuremap
   $patch: delete

zuul.d/projects.yaml

@@ -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: "310bc282f5988c04c6487d71fcb450a46f12ef1e"
+      AIRSHIPCTL_REF: "030bb123d8fedd39125dd6eae92f48e0d32a7469"
       sphinx_build_dir: docs/build
     check:
       jobs: