diff --git a/manifests/function/airshipctl-base-catalogues/versions-airshipctl.yaml b/manifests/function/airshipctl-base-catalogues/versions-airshipctl.yaml index 7d379d1df..cb646c081 100644 --- a/manifests/function/airshipctl-base-catalogues/versions-airshipctl.yaml +++ b/manifests/function/airshipctl-base-catalogues/versions-airshipctl.yaml @@ -155,5 +155,9 @@ spec: webhook: manager: image: quay.io/jetstack/cert-manager-webhook:v1.1.0 + image_builder: + image_builder: + image_builder: + image: quay.io/airshipit/image-builder:latest-ubuntu_focal kubernetes: v1.18.6 diff --git a/manifests/phases/replacements/kustomization.yaml b/manifests/phases/replacements/kustomization.yaml new file mode 100644 index 000000000..1d43ee154 --- /dev/null +++ b/manifests/phases/replacements/kustomization.yaml @@ -0,0 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - versions.yaml diff --git a/manifests/phases/replacements/versions.yaml b/manifests/phases/replacements/versions.yaml new file mode 100644 index 000000000..9d8c924a1 --- /dev/null +++ b/manifests/phases/replacements/versions.yaml @@ -0,0 +1,20 @@ +apiVersion: airshipit.org/v1alpha1 +kind: ReplacementTransformer +metadata: + name: image-builder-versions-replacements + annotations: + config.kubernetes.io/function: |- + container: + image: localhost/replacement-transformer +replacements: +- source: + objref: + kind: VersionsCatalogue + name: versions-airshipctl + fieldref: spec.images.image_builder.image_builder.image_builder.image + target: + objref: + kind: GenericContainer + name: iso-build-image + fieldrefs: ["spec.image"] + diff --git a/manifests/site/az-test-site/phases/kustomization.yaml b/manifests/site/az-test-site/phases/kustomization.yaml index ed13ef0c1..5876c4f20 100644 --- a/manifests/site/az-test-site/phases/kustomization.yaml +++ b/manifests/site/az-test-site/phases/kustomization.yaml @@ -12,3 +12,4 @@ patchesJson6902: path: infrastructure-providers.json transformers: - ../../../function/clusterctl/replacements + - ../../../phases/replacements diff --git a/manifests/site/docker-test-site/phases/kustomization.yaml b/manifests/site/docker-test-site/phases/kustomization.yaml index ed13ef0c1..5876c4f20 100644 --- a/manifests/site/docker-test-site/phases/kustomization.yaml +++ b/manifests/site/docker-test-site/phases/kustomization.yaml @@ -12,3 +12,4 @@ patchesJson6902: path: infrastructure-providers.json transformers: - ../../../function/clusterctl/replacements + - ../../../phases/replacements diff --git a/manifests/site/gcp-test-site/phases/kustomization.yaml b/manifests/site/gcp-test-site/phases/kustomization.yaml index ed13ef0c1..5876c4f20 100644 --- a/manifests/site/gcp-test-site/phases/kustomization.yaml +++ b/manifests/site/gcp-test-site/phases/kustomization.yaml @@ -12,3 +12,4 @@ patchesJson6902: path: infrastructure-providers.json transformers: - ../../../function/clusterctl/replacements + - ../../../phases/replacements diff --git a/manifests/site/openstack-test-site/phases/kustomization.yaml b/manifests/site/openstack-test-site/phases/kustomization.yaml index ed13ef0c1..5876c4f20 100644 --- a/manifests/site/openstack-test-site/phases/kustomization.yaml +++ b/manifests/site/openstack-test-site/phases/kustomization.yaml @@ -12,3 +12,4 @@ patchesJson6902: path: infrastructure-providers.json transformers: - ../../../function/clusterctl/replacements + - ../../../phases/replacements diff --git a/manifests/site/test-site/phases/kustomization.yaml b/manifests/site/test-site/phases/kustomization.yaml index a519d307a..6bfeab610 100644 --- a/manifests/site/test-site/phases/kustomization.yaml +++ b/manifests/site/test-site/phases/kustomization.yaml @@ -6,3 +6,4 @@ resources: transformers: - ../../../function/clusterctl/replacements - ../../../function/bootstrap/replacements + - ../../../phases/replacements