Fix versions-treasuremap base catalogue

Converts the base versions-treasuremap catalogue back to a
VersionsCatalogue CR and ensures it conforms to the defined
CRD schema. Updates the airshipctl reference to pull in schema
changes made in the airshipctl repo[0].

Also adds replacements for the following functions:
- dex-aio
- rook-operator

[0] https://review.opendev.org/c/airship/airshipctl/+/784620

Closes: #112
Change-Id: Ia755f07f6dc8a9344f0ed640a0f758af9d5368e8

manifests/function/dex-aio/replacements/kustomization.yaml

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

manifests/function/dex-aio/replacements/versions.yaml

@@ -0,0 +1,168 @@
+apiVersion: airshipit.org/v1alpha1
+kind: ReplacementTransformer
+metadata:
+  name: dex-aio-versions-replacements
+  annotations:
+    config.kubernetes.io/function: |-
+      container:
+        image: quay.io/airshipit/replacement-transformer:latest
+replacements:
+# Helm repository
+- source:
+    objref:
+      kind: VersionsCatalogue
+      name: versions-treasuremap
+    fieldref: "{.spec.helm_repositories.dex-aio}"
+  target:
+    objref:
+      kind: HelmRepository
+      name: dex-helm-repo
+    fieldrefs: ["{.spec}"]
+
+# chart
+- source:
+    objref:
+      kind: VersionsCatalogue
+      name: versions-treasuremap
+    fieldref: "{.spec.charts.dex-aio.chart}"
+  target:
+    objref:
+      kind: HelmRelease
+      name: dex-aio
+    fieldrefs: ["{.spec.chart.spec.chart}"]
+- source:
+    objref:
+      kind: VersionsCatalogue
+      name: versions-treasuremap
+    fieldref: "{.spec.charts.dex-aio.version}"
+  target:
+    objref:
+      kind: HelmRelease
+      name: dex-aio
+    fieldrefs: ["{.spec.chart.version}"]
+
+# images
+# dex image components
+- source:
+    objref:
+      kind: VersionsCatalogue
+      name: versions-treasuremap
+    fieldref: "{.spec.image_components.dex-aio.dex.tag}"
+  target:
+    objref:
+      kind: HelmRelease
+      name: dex-aio
+    fieldrefs: ["{.spec.values.images.applications.dex.tag}"]
+- source:
+    objref:
+      kind: VersionsCatalogue
+      name: versions-treasuremap
+    fieldref: "{.spec.image_components.dex-aio.dex.name}"
+  target:
+    objref:
+      kind: HelmRelease
+      name: dex-aio
+    fieldrefs: ["{.spec.values.images.applications.dex.name}"]
+- source:
+    objref:
+      kind: VersionsCatalogue
+      name: versions-treasuremap
+    fieldref: "{.spec.image_components.dex-aio.dex.repository}"
+  target:
+    objref:
+      kind: HelmRelease
+      name: dex-aio
+    fieldrefs: ["{.spec.values.images.applications.dex.repo}"]
+# nginx image components
+- source:
+    objref:
+      kind: VersionsCatalogue
+      name: versions-treasuremap
+    fieldref: "{.spec.image_components.dex-aio.nginx.tag}"
+  target:
+    objref:
+      kind: HelmRelease
+      name: dex-aio
+    fieldrefs: ["{.spec.values.images.applications.nginx.tag}"]
+- source:
+    objref:
+      kind: VersionsCatalogue
+      name: versions-treasuremap
+    fieldref: "{.spec.image_components.dex-aio.nginx.name}"
+  target:
+    objref:
+      kind: HelmRelease
+      name: dex-aio
+    fieldrefs: ["{.spec.values.images.applications.nginx.name}"]
+- source:
+    objref:
+      kind: VersionsCatalogue
+      name: versions-treasuremap
+    fieldref: "{.spec.image_components.dex-aio.nginx.repository}"
+  target:
+    objref:
+      kind: HelmRelease
+      name: dex-aio
+    fieldrefs: ["{.spec.values.images.applications.nginx.repo}"]
+# authenticator
+- source:
+    objref:
+      kind: VersionsCatalogue
+      name: versions-treasuremap
+    fieldref: "{.spec.image_components.dex-aio.authenticator.tag}"
+  target:
+    objref:
+      kind: HelmRelease
+      name: dex-aio
+    fieldrefs: ["{.spec.values.images.applications.authenticator.tag}"]
+- source:
+    objref:
+      kind: VersionsCatalogue
+      name: versions-treasuremap
+    fieldref: "{.spec.image_components.dex-aio.authenticator.name}"
+  target:
+    objref:
+      kind: HelmRelease
+      name: dex-aio
+    fieldrefs: ["{.spec.values.images.applications.authenticator.name}"]
+- source:
+    objref:
+      kind: VersionsCatalogue
+      name: versions-treasuremap
+    fieldref: "{.spec.image_components.dex-aio.authenticator.repository}"
+  target:
+    objref:
+      kind: HelmRelease
+      name: dex-aio
+    fieldrefs: ["{.spec.values.images.applications.authenticator.repo}"]
+# tls_init
+- source:
+    objref:
+      kind: VersionsCatalogue
+      name: versions-treasuremap
+    fieldref: "{.spec.image_components.dex-aio.tls_init.tag}"
+  target:
+    objref:
+      kind: HelmRelease
+      name: dex-aio
+    fieldrefs: ["{.spec.values.images.applications.tls_init.tag}"]
+- source:
+    objref:
+      kind: VersionsCatalogue
+      name: versions-treasuremap
+    fieldref: "{.spec.image_components.dex-aio.tls_init.name}"
+  target:
+    objref:
+      kind: HelmRelease
+      name: dex-aio
+    fieldrefs: ["{.spec.values.images.applications.tls_init.name}"]
+- source:
+    objref:
+      kind: VersionsCatalogue
+      name: versions-treasuremap
+    fieldref: "{.spec.image_components.dex-aio.tls_init.repository}"
+  target:
+    objref:
+      kind: HelmRelease
+      name: dex-aio
+    fieldrefs: ["{.spec.values.images.applications.tls_init.repo}"]

manifests/function/grafana/replacements/versions.yaml

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

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

@@ -10,9 +10,9 @@ replacements:
 # Container versions for the airship-host-config Deployment
 - source:
     objref:
-      kind: VariableCatalogue
+      kind: VersionsCatalogue
       name: versions-treasuremap
-    fieldref: "{.spec.images.airship-host-config.airship-host-config.image}"
+    fieldref: "{.spec.images.hostconfig-operator.airship-host-config.airship-host-config.image}"
   target:
     objref:
       kind: Deployment

manifests/function/ingress/replacements/versions.yaml

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

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

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

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

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

manifests/function/minio/replacements/versions.yaml

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

manifests/function/rook-operator/replacements/kustomization.yaml

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

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

@@ -0,0 +1,49 @@
+apiVersion: airshipit.org/v1alpha1
+kind: ReplacementTransformer
+metadata:
+  name: rook-operator-versions-replacements
+  annotations:
+    config.kubernetes.io/function: |-
+      container:
+        image: quay.io/airshipit/replacement-transformer:latest
+replacements:
+- source:
+    objref:
+      kind: VersionsCatalogue
+      name: versions-treasuremap
+    fieldref: "{.spec.helm_repositories.rook-operator}"
+  target:
+    objref:
+      kind: HelmRepository
+      name: rook-release
+    fieldrefs: ["{.spec}"]
+- source:
+    objref:
+      kind: VersionsCatalogue
+      name: versions-treasuremap
+    fieldref: "{.spec.charts.rook-operator.chart}"
+  target:
+    objref:
+      kind: HelmRelease
+      name: rook-ceph-operator
+    fieldrefs: ["{.spec.chart.spec.chart}"]
+- source:
+    objref:
+      kind: VersionsCatalogue
+      name: versions-treasuremap
+    fieldref: "{.spec.charts.rook-operator.version}"
+  target:
+    objref:
+      kind: HelmRelease
+      name: rook-ceph-operator
+    fieldrefs: ["{.spec.chart.version}"]
+- source:
+    objref:
+      kind: VersionsCatalogue
+      name: versions-treasuremap
+    fieldref: "{.spec.image_components.rook-operator.rook-operator}"
+  target:
+    objref:
+      kind: HelmRelease
+      name: rook-ceph-operator
+    fieldrefs: ["{.spec.values.image}"]

manifests/function/sip/replacements/versions.yaml

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

manifests/function/synclabeller/replacements/versions.yaml

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

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

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

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

@@ -1,5 +1,5 @@
 apiVersion: airshipit.org/v1alpha1
-kind: VariableCatalogue
+kind: VersionsCatalogue
 metadata:
   name: versions-treasuremap
   labels:
@@ -19,6 +19,10 @@ spec:
       url: https://kubernetes-charts.banzaicloud.com
     ingress-nginx:
       url: https://kubernetes.github.io/ingress-nginx
+    rook-operator:
+      url: https://charts.rook.io/release
+    dex-aio:
+      url: http://helm-chart-collator.collator.svc:8080
 
   charts:
     grafana:
@@ -42,14 +46,62 @@ spec:
     ingress-nginx:
       chart: ingress-nginx
       version: 3.5.1
+    rook-operator:
+      chart: rook-ceph
+      version: 0.0.1
+    dex-aio:
+      chart: dex-aio
+      version: 0.1.0
 
   images:
-    grafana:
-      repository: grafana/grafana
-      tag: 7.4.5
-    airship-host-config:
+  # images are organized by
+  #   <function>:
+  #     <component>:
+  #       <container>:
+    kube_prometheus_stack:
+      prometheus_operator:
+        # NOTE: For prometheus and alertmanager instances managed by the operator
+        # https://github.com/prometheus-community/helm-charts/blob/main/charts/kube-prometheus-stack/values.yaml#L1487
+        alertmanagerDefaultBaseImage:
+          image: quay.io/prometheus/alertmanager
+        prometheusDefaultBaseImage:
+          image: quay.io/prometheus/prometheus
+      thanos:
+        thanos:
+          image: quay.io/thanos/thanos:v0.17.2
+    sip:
+      sip:
+        kube-rbac-proxy:
+          image: gcr.io/kubebuilder/kube-rbac-proxy:v0.5.0
+        manager:
+          image: quay.io/airshipit/sip:51e7ff85d617c0e94fa98920fdbacce3ad9e6bc0
+    vino:
+      vino:
+        kube-rbac-proxy:
+          image: gcr.io/kubebuilder/kube-rbac-proxy:v0.5.0
+        libvirt:
+          image: quay.io/airshipit/libvirt
+        manager:
+          image: quay.io/airshipit/vino:6480ddc3ba98fba21fd692b8489adb0177abb8b5
+    synclabeller:
+      synclabeller:
+        kube-rbac-proxy:
+          image: gcr.io/kubebuilder/kube-rbac-proxy:v0.5.0
+        manager:
+          image: quay.io/airshipit/synclabeller:72766d8519e064ffeacb44ddb9afa85c994907ee
+    hostconfig-operator:
       airship-host-config:
-        image: quay.io/airshipit/hostconfig-operator:latest
+        airship-host-config:
+          image: quay.io/airshipit/hostconfig-operator:latest
+
+  image_components:
+  # image_components are organized by
+  #   <function>:
+  #     <container>:
+    grafana:
+      grafana:
+        repository: grafana/grafana
+        tag: 7.4.5
     kube_prometheus_stack:
       admission_webhooks:
         repository: jettech/kube-webhook-certgen
@@ -64,21 +116,12 @@ spec:
         repository: quay.io/prometheus-operator/prometheus-config-reloader
         tag: v0.46.0
       prometheus_operator:
-        # NOTE: For prometheus and alertmanager instances managed by the operator
-        # https://github.com/prometheus-community/helm-charts/blob/main/charts/kube-prometheus-stack/values.yaml#L1487
-        alertmanagerDefaultBaseImage: quay.io/prometheus/alertmanager
-        prometheusDefaultBaseImage: quay.io/prometheus/prometheus
-
-        # Prometheus operator image
-        image:
-          repository: quay.io/prometheus-operator/prometheus-operator
-          tag: v0.46.0
-      thanos:
-        image: quay.io/thanos/thanos:v0.17.2
-        version: v0.17.2
+        repository: quay.io/prometheus-operator/prometheus-operator
+        tag: v0.46.0
     logging_operator:
-      repository: ghcr.io/banzaicloud/logging-operator
-      tag: 3.9.1
+      logging_operator:
+        repository: ghcr.io/banzaicloud/logging-operator
+        tag: 3.9.1
     logging_operator_logging:
       config_reloader:
         repository: jimmidyson/configmap-reload
@@ -99,23 +142,38 @@ spec:
       mc:
         repository: minio/mc
         tag: RELEASE.2020-10-03T02-54-56Z
-    sip:
-      kube-rbac-proxy: gcr.io/kubebuilder/kube-rbac-proxy:v0.5.0
-      manager: quay.io/airshipit/sip:51e7ff85d617c0e94fa98920fdbacce3ad9e6bc0
     thanos:
-      repository: banzaicloud/thanos-operator
-      tag: latest
+      thanos-operator:
+        repository: banzaicloud/thanos-operator
+        tag: latest
     ingress-nginx:
       controller:
         repository: k8s.gcr.io/ingress-nginx/controller
         tag: v0.44.0
       defaultBackend:
         repository: k8s.gcr.io/defaultbackend-amd64
-        tag: 1.5
-    vino:
-      kube-rbac-proxy: gcr.io/kubebuilder/kube-rbac-proxy:v0.5.0
-      libvirt: quay.io/airshipit/libvirt
-      manager: quay.io/airshipit/vino:6480ddc3ba98fba21fd692b8489adb0177abb8b5
-    synclabeller:
-      kube-rbac-proxy: gcr.io/kubebuilder/kube-rbac-proxy:v0.5.0
-      manager: quay.io/airshipit/synclabeller:72766d8519e064ffeacb44ddb9afa85c994907ee
+        tag: "1.5"
+    rook-operator:
+      rook-operator:
+        repository: rook/ceph
+        tag: v1.5.8
+    dex-aio:
+    # NOTE: The dex-aio chart uses a different format for declaring images, so
+    # the 'name' property is required. 'repository' should contain only the name
+    # of the repo, while 'name' should be used for the image name.
+      dex:
+        tag: v2.20.0
+        name: dexidp/dex
+        repository: quay.io
+      nginx:
+        tag: 1.17.10-alpine
+        name: nginx
+        repository: docker.io
+      authenticator:
+        tag: 1.2.0
+        name: mintel/dex-k8s-authenticator
+        repository: docker.io
+      tls_init:
+        tag: latest
+        name: metal3-io/ironic
+        repository: quay.io

manifests/function/vino/replacements/versions.yaml

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

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

@@ -35,7 +35,7 @@ patches: |-
   $patch: delete
   ---
   apiVersion: airshipit.org/v1alpha1
-  kind: VariableCatalogue
+  kind: VersionsCatalogue
   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: VariableCatalogue
+  kind: VersionsCatalogue
   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: VariableCatalogue
+  kind: VersionsCatalogue
   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: "fcfad3533a73355c55d0aacb135dac0d1acd6a4f"
+      AIRSHIPCTL_REF: "c355b600d7a3fd66f03016ad9384a13cf17e80e7"
       sphinx_build_dir: docs/build
     check:
       jobs: