From 3ae0bf6c54e220710dda461b6648f7210a8ac1b7 Mon Sep 17 00:00:00 2001 From: Sean Eagan Date: Mon, 5 Apr 2021 10:41:56 -0500 Subject: [PATCH] Pin airship images for release This pins to static tags for all airship owned images: airship/images: all: 053c992218601cc49fd4a595ee4873380b132408 airship/airshipctl: aiap-*: 892bb6a16d53a0f43571284db83901bef53ed440 released krm functions: v2.0.2 (030bb123d8fedd39125dd6eae92f48e0d32a7469) toolbox krm function (unreleased): 346196e6c1d0dda202464133377aa3ec586719e4 Change-Id: I79eedaf0f61c1bcda58640aed0540e1102b23dc8 Signed-off-by: Sean Eagan --- docs/source/plugins.md | 2 +- .../local-resource/example-use.yaml | 2 +- .../templater/local-resource/example-use.yaml | 2 +- .../env-vars-template.yaml | 2 +- .../versions-airshipctl.yaml | 8 ++++++-- .../replacements/ironic-env-vars.yaml | 2 +- .../replacements/networking.yaml | 2 +- .../replacements/versions.yaml | 2 +- .../replacements/remotedirect-vars.yaml | 2 +- manifests/function/bootstrap/template.yaml | 2 +- .../clusterctl/replacements/versions.yaml | 2 +- .../replacements/ephemeral-env-vars.yaml | 2 +- .../replacements/generated-secrets.yaml | 2 +- .../ephemeral/replacements/networking.yaml | 2 +- .../replacements/versions.yaml | 2 +- .../replacements/env-vars.yaml | 2 +- .../replacements/versions.yaml | 2 +- .../generate-secrets-example/README.md | 2 +- .../secret-generation.yaml | 2 +- .../replacements/hosts.yaml | 2 +- .../replacements/kustomization.yaml | 4 ++++ .../replacements/versions.yaml | 19 +++++++++++++++++++ .../replacements/helm-operator-env-vars.yaml | 2 +- .../helm-operator/replacements/versions.yaml | 2 +- .../hostgenerator-m3/hosttemplate.yaml | 2 +- .../hostgenerator-m3/replacements/hosts.yaml | 2 +- .../function/hwcc/replacements/versions.yaml | 2 +- .../k8scontrol/replacements/cluster.yaml | 2 +- .../replacements/generated-secrets.yaml | 2 +- .../replacements/k8scontrol-env-vars.yaml | 2 +- .../k8scontrol/replacements/networking.yaml | 2 +- .../k8scontrol/replacements/versions.yaml | 2 +- manifests/phases/executors.yaml | 18 +++++++++--------- .../test-site/kubeconfig/update-target.yaml | 2 +- .../configurable-decryption.yaml | 2 +- .../replacements/generated-secrets.yaml | 2 +- .../replacements/workers-env-vars.yaml | 2 +- .../target/generator/secret-template.yaml | 2 +- .../ingress/replacements/versions.yaml | 2 +- playbooks/vars/test-config.yaml | 2 +- tools/airship-in-a-pod/airship-in-a-pod.yaml | 6 +++--- tools/deployment/22_test_configs.sh | 2 +- tools/deployment/azure/31_create_configs.sh | 2 +- tools/deployment/update-krm-images | 6 +++--- 44 files changed, 82 insertions(+), 55 deletions(-) create mode 100644 manifests/function/helm-chart-collator/replacements/kustomization.yaml create mode 100644 manifests/function/helm-chart-collator/replacements/versions.yaml diff --git a/docs/source/plugins.md b/docs/source/plugins.md index 08d4ddd8f..fb1d4f9a8 100644 --- a/docs/source/plugins.md +++ b/docs/source/plugins.md @@ -220,7 +220,7 @@ metadata: annotations: config.kubernetes.io/function: | container: - image: quay.io/airshipit/templater:v2 + image: quay.io/airshipit/templater:v2.0.2 values: hosts: - macAddress: 00:aa:bb:cc:dd diff --git a/krm-functions/replacement-transformer/local-resource/example-use.yaml b/krm-functions/replacement-transformer/local-resource/example-use.yaml index c71970b69..4df857bba 100644 --- a/krm-functions/replacement-transformer/local-resource/example-use.yaml +++ b/krm-functions/replacement-transformer/local-resource/example-use.yaml @@ -17,7 +17,7 @@ metadata: annotations: config.kubernetes.io/function: |- container: - image: quay.io/airshipit/replacement-transformer:v2 + image: quay.io/airshipit/replacement-transformer:v2.0.2 name: k8scontrol-versions-replacements replacements: # Replace the Kubernetes version in the KubeadmControlPlane diff --git a/krm-functions/templater/local-resource/example-use.yaml b/krm-functions/templater/local-resource/example-use.yaml index 360e8fc82..1d4f59630 100644 --- a/krm-functions/templater/local-resource/example-use.yaml +++ b/krm-functions/templater/local-resource/example-use.yaml @@ -15,7 +15,7 @@ metadata: annotations: config.kubernetes.io/function: | container: - image: quay.io/airshipit/templater:v2 + image: quay.io/airshipit/templater:v2.0.2 values: hosts: - macAddress: 00:aa:bb:cc:dd diff --git a/manifests/function/airshipctl-base-catalogues/env-vars-template.yaml b/manifests/function/airshipctl-base-catalogues/env-vars-template.yaml index 568f48496..f3c0667c9 100644 --- a/manifests/function/airshipctl-base-catalogues/env-vars-template.yaml +++ b/manifests/function/airshipctl-base-catalogues/env-vars-template.yaml @@ -7,7 +7,7 @@ metadata: annotations: config.kubernetes.io/function: |- container: - image: quay.io/airshipit/templater:v2 + image: quay.io/airshipit/templater:v2.0.2 envs: - HTTP_PROXY - HTTPS_PROXY diff --git a/manifests/function/airshipctl-base-catalogues/versions-airshipctl.yaml b/manifests/function/airshipctl-base-catalogues/versions-airshipctl.yaml index e43d39e2e..33894b19b 100644 --- a/manifests/function/airshipctl-base-catalogues/versions-airshipctl.yaml +++ b/manifests/function/airshipctl-base-catalogues/versions-airshipctl.yaml @@ -84,14 +84,18 @@ spec: tag: v0.4.1 images: + airship: + helm_chart_collator: + helm_chart_collator: + image: quay.io/airshipit/helm-chart-collator:053c992218601cc49fd4a595ee4873380b132408 baremetal_operator: ironic: # ironic Deployment init_bootstrap: image: quay.io/centos/centos:8.3.2011 init_images: - image: quay.io/airshipit/ipa:latest + image: quay.io/airshipit/ipa:053c992218601cc49fd4a595ee4873380b132408 qcow_bundle: - image: quay.io/airshipit/qcow-bundle:latest-ubuntu_focal + image: quay.io/airshipit/qcow-bundle:053c992218601cc49fd4a595ee4873380b132408-ubuntu_focal dnsmasq: image: quay.io/metal3-io/ironic:capm3-v0.4.0 httpd: diff --git a/manifests/function/baremetal-operator/replacements/ironic-env-vars.yaml b/manifests/function/baremetal-operator/replacements/ironic-env-vars.yaml index 880f030ec..d28eee976 100644 --- a/manifests/function/baremetal-operator/replacements/ironic-env-vars.yaml +++ b/manifests/function/baremetal-operator/replacements/ironic-env-vars.yaml @@ -6,7 +6,7 @@ metadata: annotations: config.kubernetes.io/function: |- container: - image: quay.io/airshipit/replacement-transformer:v2 + image: quay.io/airshipit/replacement-transformer:v2.0.2 replacements: # Replace the proxy vars - source: diff --git a/manifests/function/baremetal-operator/replacements/networking.yaml b/manifests/function/baremetal-operator/replacements/networking.yaml index ecd0ae278..b8e20b75d 100644 --- a/manifests/function/baremetal-operator/replacements/networking.yaml +++ b/manifests/function/baremetal-operator/replacements/networking.yaml @@ -6,7 +6,7 @@ metadata: annotations: config.kubernetes.io/function: |- container: - image: quay.io/airshipit/replacement-transformer:v2 + image: quay.io/airshipit/replacement-transformer:v2.0.2 replacements: # Replace the pod & service networks - source: diff --git a/manifests/function/baremetal-operator/replacements/versions.yaml b/manifests/function/baremetal-operator/replacements/versions.yaml index ea85183e8..81548a52b 100644 --- a/manifests/function/baremetal-operator/replacements/versions.yaml +++ b/manifests/function/baremetal-operator/replacements/versions.yaml @@ -7,7 +7,7 @@ metadata: annotations: config.kubernetes.io/function: |- container: - image: quay.io/airshipit/replacement-transformer:v2 + image: quay.io/airshipit/replacement-transformer:v2.0.2 replacements: # Container versions for the ironic Deployment - source: diff --git a/manifests/function/bootstrap/replacements/remotedirect-vars.yaml b/manifests/function/bootstrap/replacements/remotedirect-vars.yaml index a42c84f55..1b441f76c 100644 --- a/manifests/function/bootstrap/replacements/remotedirect-vars.yaml +++ b/manifests/function/bootstrap/replacements/remotedirect-vars.yaml @@ -5,7 +5,7 @@ metadata: annotations: config.kubernetes.io/function: |- container: - image: quay.io/airshipit/replacement-transformer:v2 + image: quay.io/airshipit/replacement-transformer:v2.0.2 replacements: - source: objref: diff --git a/manifests/function/bootstrap/template.yaml b/manifests/function/bootstrap/template.yaml index 611e9a313..6fc1fa242 100644 --- a/manifests/function/bootstrap/template.yaml +++ b/manifests/function/bootstrap/template.yaml @@ -5,7 +5,7 @@ metadata: annotations: config.kubernetes.io/function: | container: - image: quay.io/airshipit/templater:latest + image: quay.io/airshipit/templater:v2.0.2 envs: - AIRSHIPCTL_EPHEMERAL_ISO_URL template: | diff --git a/manifests/function/clusterctl/replacements/versions.yaml b/manifests/function/clusterctl/replacements/versions.yaml index a087b0b47..65e668b15 100644 --- a/manifests/function/clusterctl/replacements/versions.yaml +++ b/manifests/function/clusterctl/replacements/versions.yaml @@ -6,7 +6,7 @@ metadata: annotations: config.kubernetes.io/function: |- container: - image: quay.io/airshipit/replacement-transformer:v2 + image: quay.io/airshipit/replacement-transformer:v2.0.2 replacements: # Replace capm3 versions - source: diff --git a/manifests/function/ephemeral/replacements/ephemeral-env-vars.yaml b/manifests/function/ephemeral/replacements/ephemeral-env-vars.yaml index 3aadb81d9..874bbfda1 100644 --- a/manifests/function/ephemeral/replacements/ephemeral-env-vars.yaml +++ b/manifests/function/ephemeral/replacements/ephemeral-env-vars.yaml @@ -6,7 +6,7 @@ metadata: annotations: config.kubernetes.io/function: |- container: - image: quay.io/airshipit/replacement-transformer:v2 + image: quay.io/airshipit/replacement-transformer:v2.0.2 replacements: # Replace the proxy vars - source: diff --git a/manifests/function/ephemeral/replacements/generated-secrets.yaml b/manifests/function/ephemeral/replacements/generated-secrets.yaml index d3d8d6507..a384ebed5 100644 --- a/manifests/function/ephemeral/replacements/generated-secrets.yaml +++ b/manifests/function/ephemeral/replacements/generated-secrets.yaml @@ -5,7 +5,7 @@ metadata: annotations: config.kubernetes.io/function: |- container: - image: quay.io/airshipit/replacement-transformer:v2 + image: quay.io/airshipit/replacement-transformer:v2.0.2 replacements: - source: objref: diff --git a/manifests/function/ephemeral/replacements/networking.yaml b/manifests/function/ephemeral/replacements/networking.yaml index 8f2539c1a..4c9a5f642 100644 --- a/manifests/function/ephemeral/replacements/networking.yaml +++ b/manifests/function/ephemeral/replacements/networking.yaml @@ -6,7 +6,7 @@ metadata: annotations: config.kubernetes.io/function: |- container: - image: quay.io/airshipit/replacement-transformer:v2 + image: quay.io/airshipit/replacement-transformer:v2.0.2 replacements: # Substring-replace the ephemeral control plane's info - source: diff --git a/manifests/function/flux/helm-controller/replacements/versions.yaml b/manifests/function/flux/helm-controller/replacements/versions.yaml index ba0b3ceea..d0431b32e 100644 --- a/manifests/function/flux/helm-controller/replacements/versions.yaml +++ b/manifests/function/flux/helm-controller/replacements/versions.yaml @@ -5,7 +5,7 @@ metadata: annotations: config.kubernetes.io/function: |- container: - image: quay.io/airshipit/replacement-transformer:v2 + image: quay.io/airshipit/replacement-transformer:v2.0.2 replacements: - source: objref: diff --git a/manifests/function/flux/source-controller/replacements/env-vars.yaml b/manifests/function/flux/source-controller/replacements/env-vars.yaml index 6fb9a8e00..e1b92278c 100644 --- a/manifests/function/flux/source-controller/replacements/env-vars.yaml +++ b/manifests/function/flux/source-controller/replacements/env-vars.yaml @@ -6,7 +6,7 @@ metadata: annotations: config.kubernetes.io/function: |- container: - image: quay.io/airshipit/replacement-transformer:v2 + image: quay.io/airshipit/replacement-transformer:v2.0.2 replacements: # Replace the proxy vars - source: diff --git a/manifests/function/flux/source-controller/replacements/versions.yaml b/manifests/function/flux/source-controller/replacements/versions.yaml index ed374eb3d..6b7569364 100644 --- a/manifests/function/flux/source-controller/replacements/versions.yaml +++ b/manifests/function/flux/source-controller/replacements/versions.yaml @@ -5,7 +5,7 @@ metadata: annotations: config.kubernetes.io/function: |- container: - image: quay.io/airshipit/replacement-transformer:v2 + image: quay.io/airshipit/replacement-transformer:v2.0.2 replacements: - source: objref: diff --git a/manifests/function/generate-secrets-example/README.md b/manifests/function/generate-secrets-example/README.md index 3ed97bf27..622f3c1e6 100644 --- a/manifests/function/generate-secrets-example/README.md +++ b/manifests/function/generate-secrets-example/README.md @@ -101,7 +101,7 @@ metadata: kustomizeSinkOutputDir: "target/generator/results/generated" spec: container: - image: quay.io/airshipit/templater:v2 + image: quay.io/airshipit/templater:v2.0.2 config: | foo: bar ``` diff --git a/manifests/function/generate-secrets-example/secret-generation.yaml b/manifests/function/generate-secrets-example/secret-generation.yaml index aa547d7c6..202c186d1 100644 --- a/manifests/function/generate-secrets-example/secret-generation.yaml +++ b/manifests/function/generate-secrets-example/secret-generation.yaml @@ -5,7 +5,7 @@ metadata: annotations: config.kubernetes.io/function: | container: - image: quay.io/airshipit/templater:v2 + image: quay.io/airshipit/templater:v2.0.2 values: clusterCa: cn: "Kubernetes API" diff --git a/manifests/function/hardwareprofile-example/replacements/hosts.yaml b/manifests/function/hardwareprofile-example/replacements/hosts.yaml index 3b61d1465..f9ae5c8b9 100644 --- a/manifests/function/hardwareprofile-example/replacements/hosts.yaml +++ b/manifests/function/hardwareprofile-example/replacements/hosts.yaml @@ -8,7 +8,7 @@ metadata: annotations: config.kubernetes.io/function: |- container: - image: quay.io/airshipit/replacement-transformer:v2 + image: quay.io/airshipit/replacement-transformer:v2.0.2 replacements: - source: objref: diff --git a/manifests/function/helm-chart-collator/replacements/kustomization.yaml b/manifests/function/helm-chart-collator/replacements/kustomization.yaml new file mode 100644 index 000000000..1d43ee154 --- /dev/null +++ b/manifests/function/helm-chart-collator/replacements/kustomization.yaml @@ -0,0 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - versions.yaml diff --git a/manifests/function/helm-chart-collator/replacements/versions.yaml b/manifests/function/helm-chart-collator/replacements/versions.yaml new file mode 100644 index 000000000..0c9c220f6 --- /dev/null +++ b/manifests/function/helm-chart-collator/replacements/versions.yaml @@ -0,0 +1,19 @@ +apiVersion: airshipit.org/v1alpha1 +kind: ReplacementTransformer +metadata: + name: baremetal-operator-versions-replacements + annotations: + config.kubernetes.io/function: |- + container: + image: quay.io/airshipit/replacement-transformer:v2.0.2 +replacements: +- source: + objref: + kind: VersionsCatalogue + name: versions-airshipctl + fieldref: "{.spec.images.airship.helm_chart_collator.helm_chart_collator.image}" + target: + objref: + kind: Deployment + name: helm-chart-collator + fieldrefs: ["{.spec.template.spec.containers[?(.name == 'helm-chart-collator')].image}"] diff --git a/manifests/function/helm-operator/replacements/helm-operator-env-vars.yaml b/manifests/function/helm-operator/replacements/helm-operator-env-vars.yaml index ab0ee78f8..ea9fb3bc1 100644 --- a/manifests/function/helm-operator/replacements/helm-operator-env-vars.yaml +++ b/manifests/function/helm-operator/replacements/helm-operator-env-vars.yaml @@ -6,7 +6,7 @@ metadata: annotations: config.kubernetes.io/function: |- container: - image: quay.io/airshipit/replacement-transformer:v2 + image: quay.io/airshipit/replacement-transformer:v2.0.2 replacements: # Replace the proxy vars - source: diff --git a/manifests/function/helm-operator/replacements/versions.yaml b/manifests/function/helm-operator/replacements/versions.yaml index 142e7dcc3..8f030fe77 100644 --- a/manifests/function/helm-operator/replacements/versions.yaml +++ b/manifests/function/helm-operator/replacements/versions.yaml @@ -5,7 +5,7 @@ metadata: annotations: config.kubernetes.io/function: |- container: - image: quay.io/airshipit/replacement-transformer:v2 + image: quay.io/airshipit/replacement-transformer:v2.0.2 replacements: - source: objref: diff --git a/manifests/function/hostgenerator-m3/hosttemplate.yaml b/manifests/function/hostgenerator-m3/hosttemplate.yaml index 278913db7..8a6644746 100644 --- a/manifests/function/hostgenerator-m3/hosttemplate.yaml +++ b/manifests/function/hostgenerator-m3/hosttemplate.yaml @@ -5,7 +5,7 @@ metadata: annotations: config.kubernetes.io/function: |- container: - image: quay.io/airshipit/templater:v2 + image: quay.io/airshipit/templater:v2.0.2 values: # hosts: diff --git a/manifests/function/hostgenerator-m3/replacements/hosts.yaml b/manifests/function/hostgenerator-m3/replacements/hosts.yaml index 4f13d219f..8b11926d5 100644 --- a/manifests/function/hostgenerator-m3/replacements/hosts.yaml +++ b/manifests/function/hostgenerator-m3/replacements/hosts.yaml @@ -7,7 +7,7 @@ metadata: annotations: config.kubernetes.io/function: |- container: - image: quay.io/airshipit/replacement-transformer:v2 + image: quay.io/airshipit/replacement-transformer:v2.0.2 replacements: - source: objref: diff --git a/manifests/function/hwcc/replacements/versions.yaml b/manifests/function/hwcc/replacements/versions.yaml index a7a6d04f9..ced162900 100644 --- a/manifests/function/hwcc/replacements/versions.yaml +++ b/manifests/function/hwcc/replacements/versions.yaml @@ -5,7 +5,7 @@ metadata: annotations: config.kubernetes.io/function: |- container: - image: quay.io/airshipit/replacement-transformer:v2 + image: quay.io/airshipit/replacement-transformer:v2.0.2 replacements: - source: objref: diff --git a/manifests/function/k8scontrol/replacements/cluster.yaml b/manifests/function/k8scontrol/replacements/cluster.yaml index a1d99ed6c..8d8daaa63 100644 --- a/manifests/function/k8scontrol/replacements/cluster.yaml +++ b/manifests/function/k8scontrol/replacements/cluster.yaml @@ -5,7 +5,7 @@ metadata: annotations: config.kubernetes.io/function: |- container: - image: quay.io/airshipit/replacement-transformer:v2 + image: quay.io/airshipit/replacement-transformer:v2.0.2 replacements: - source: objref: diff --git a/manifests/function/k8scontrol/replacements/generated-secrets.yaml b/manifests/function/k8scontrol/replacements/generated-secrets.yaml index cd1eba013..b68e700e6 100644 --- a/manifests/function/k8scontrol/replacements/generated-secrets.yaml +++ b/manifests/function/k8scontrol/replacements/generated-secrets.yaml @@ -6,7 +6,7 @@ metadata: annotations: config.kubernetes.io/function: |- container: - image: quay.io/airshipit/replacement-transformer:v2 + image: quay.io/airshipit/replacement-transformer:v2.0.2 replacements: - source: objref: diff --git a/manifests/function/k8scontrol/replacements/k8scontrol-env-vars.yaml b/manifests/function/k8scontrol/replacements/k8scontrol-env-vars.yaml index 1978b149d..a270ba52a 100644 --- a/manifests/function/k8scontrol/replacements/k8scontrol-env-vars.yaml +++ b/manifests/function/k8scontrol/replacements/k8scontrol-env-vars.yaml @@ -6,7 +6,7 @@ metadata: annotations: config.kubernetes.io/function: |- container: - image: quay.io/airshipit/replacement-transformer:v2 + image: quay.io/airshipit/replacement-transformer:v2.0.2 replacements: # Replace the proxy vars - source: diff --git a/manifests/function/k8scontrol/replacements/networking.yaml b/manifests/function/k8scontrol/replacements/networking.yaml index 10e02a86c..dcf4af0e3 100644 --- a/manifests/function/k8scontrol/replacements/networking.yaml +++ b/manifests/function/k8scontrol/replacements/networking.yaml @@ -11,7 +11,7 @@ metadata: annotations: config.kubernetes.io/function: |- container: - image: quay.io/airshipit/replacement-transformer:v2 + image: quay.io/airshipit/replacement-transformer:v2.0.2 replacements: # Replace the pod & service networks - source: diff --git a/manifests/function/k8scontrol/replacements/versions.yaml b/manifests/function/k8scontrol/replacements/versions.yaml index 3d9d47341..60a3b7462 100644 --- a/manifests/function/k8scontrol/replacements/versions.yaml +++ b/manifests/function/k8scontrol/replacements/versions.yaml @@ -6,7 +6,7 @@ metadata: annotations: config.kubernetes.io/function: |- container: - image: quay.io/airshipit/replacement-transformer:v2 + image: quay.io/airshipit/replacement-transformer:v2.0.2 replacements: # Replace the Kubernetes version in the KubeadmControlPlane - source: diff --git a/manifests/phases/executors.yaml b/manifests/phases/executors.yaml index 9c9927ae4..c2835f600 100644 --- a/manifests/phases/executors.yaml +++ b/manifests/phases/executors.yaml @@ -98,7 +98,7 @@ ephemeralCluster: configFilename: azure-config.yaml bootstrapContainer: containerRuntime: docker - image: quay.io/airshipit/capz-bootstrap:latest + image: quay.io/airshipit/capz-bootstrap:053c992218601cc49fd4a595ee4873380b132408 volume: /tmp:/kube saveKubeconfigFileName: capz.kubeconfig --- @@ -115,7 +115,7 @@ ephemeralCluster: configFilename: azure-config.yaml bootstrapContainer: containerRuntime: docker - image: quay.io/airshipit/capz-bootstrap:latest + image: quay.io/airshipit/capz-bootstrap:053c992218601cc49fd4a595ee4873380b132408 volume: /tmp:/kube saveKubeconfigFileName: capz.kubeconfig --- @@ -132,7 +132,7 @@ ephemeralCluster: configFilename: gcp-config.yaml bootstrapContainer: containerRuntime: docker - image: quay.io/airshipit/capg-bootstrap:latest + image: quay.io/airshipit/capg-bootstrap:053c992218601cc49fd4a595ee4873380b132408 volume: /tmp:/kube saveKubeconfigFileName: capg.kubeconfig --- @@ -149,7 +149,7 @@ ephemeralCluster: configFilename: gcp-config.yaml bootstrapContainer: containerRuntime: docker - image: quay.io/airshipit/capg-bootstrap:latest + image: quay.io/airshipit/capg-bootstrap:053c992218601cc49fd4a595ee4873380b132408 volume: /tmp:/kube saveKubeconfigFileName: capg.kubeconfig --- @@ -166,7 +166,7 @@ ephemeralCluster: configFilename: openstack-config.yaml bootstrapContainer: containerRuntime: docker - image: quay.io/airshipit/capo-ephemeral:latest + image: quay.io/airshipit/capo-ephemeral:053c992218601cc49fd4a595ee4873380b132408 volume: /tmp:/kube saveKubeconfigFileName: capo.kubeconfig --- @@ -183,7 +183,7 @@ ephemeralCluster: configFilename: openstack-config.yaml bootstrapContainer: containerRuntime: docker - image: quay.io/airshipit/capo-ephemeral:latest + image: quay.io/airshipit/capo-ephemeral:053c992218601cc49fd4a595ee4873380b132408 volume: /tmp:/kube saveKubeconfigFileName: capo.kubeconfig --- @@ -209,7 +209,7 @@ metadata: airshipit.org/deploy-k8s: "false" spec: type: krm - image: quay.io/airshipit/cloud-init:v2 + image: quay.io/airshipit/cloud-init:v2.0.2 mounts: - type: bind src: /srv/images @@ -249,7 +249,7 @@ spec: - /bin/bash - -c - /usr/bin/local/entrypoint.sh 1>&2 - image: quay.io/airshipit/image-builder:latest-ubuntu_focal + image: quay.io/airshipit/image-builder:053c992218601cc49fd4a595ee4873380b132408-ubuntu_focal mounts: - type: bind src: /srv/images @@ -282,7 +282,7 @@ metadata: airshipit.org/deploy-k8s: "false" spec: type: krm - image: quay.io/airshipit/toolbox:latest + image: quay.io/airshipit/toolbox:346196e6c1d0dda202464133377aa3ec586719e4 hostNetwork: true configRef: kind: ConfigMap diff --git a/manifests/site/test-site/kubeconfig/update-target.yaml b/manifests/site/test-site/kubeconfig/update-target.yaml index 3af7f8d78..f47e28ba2 100644 --- a/manifests/site/test-site/kubeconfig/update-target.yaml +++ b/manifests/site/test-site/kubeconfig/update-target.yaml @@ -5,7 +5,7 @@ metadata: annotations: config.kubernetes.io/function: |- container: - image: quay.io/airshipit/replacement-transformer:v2 + image: quay.io/airshipit/replacement-transformer:v2.0.2 replacements: - source: objref: diff --git a/manifests/site/test-site/target/generator/results/decrypt-secrets/configurable-decryption.yaml b/manifests/site/test-site/target/generator/results/decrypt-secrets/configurable-decryption.yaml index 0be9ef32a..16a0be041 100644 --- a/manifests/site/test-site/target/generator/results/decrypt-secrets/configurable-decryption.yaml +++ b/manifests/site/test-site/target/generator/results/decrypt-secrets/configurable-decryption.yaml @@ -5,7 +5,7 @@ metadata: annotations: config.kubernetes.io/function: | container: - image: quay.io/airshipit/templater:v2 + image: quay.io/airshipit/templater:v2.0.2 envs: - TOLERATE_DECRYPTION_FAILURES - DEBUG_SOPS_GPG diff --git a/manifests/site/test-site/target/workers/replacements/generated-secrets.yaml b/manifests/site/test-site/target/workers/replacements/generated-secrets.yaml index 7d59c9fac..0e452fafa 100644 --- a/manifests/site/test-site/target/workers/replacements/generated-secrets.yaml +++ b/manifests/site/test-site/target/workers/replacements/generated-secrets.yaml @@ -6,7 +6,7 @@ metadata: annotations: config.kubernetes.io/function: |- container: - image: quay.io/airshipit/replacement-transformer:v2 + image: quay.io/airshipit/replacement-transformer:v2.0.2 replacements: - source: objref: diff --git a/manifests/site/test-site/target/workers/replacements/workers-env-vars.yaml b/manifests/site/test-site/target/workers/replacements/workers-env-vars.yaml index 3d90acfd6..aa4eece3e 100644 --- a/manifests/site/test-site/target/workers/replacements/workers-env-vars.yaml +++ b/manifests/site/test-site/target/workers/replacements/workers-env-vars.yaml @@ -6,7 +6,7 @@ metadata: annotations: config.kubernetes.io/function: |- container: - image: quay.io/airshipit/replacement-transformer:v2 + image: quay.io/airshipit/replacement-transformer:v2.0.2 replacements: # Replace the proxy vars - source: diff --git a/manifests/type/gating/target/generator/secret-template.yaml b/manifests/type/gating/target/generator/secret-template.yaml index e556f45bc..274130f22 100644 --- a/manifests/type/gating/target/generator/secret-template.yaml +++ b/manifests/type/gating/target/generator/secret-template.yaml @@ -5,7 +5,7 @@ metadata: annotations: config.kubernetes.io/function: | container: - image: quay.io/airshipit/templater:v2 + image: quay.io/airshipit/templater:v2.0.2 values: sshKeyGen: encBit: 4096 diff --git a/manifests/type/gating/target/workload/ingress/replacements/versions.yaml b/manifests/type/gating/target/workload/ingress/replacements/versions.yaml index 473a4b78b..efca0d509 100644 --- a/manifests/type/gating/target/workload/ingress/replacements/versions.yaml +++ b/manifests/type/gating/target/workload/ingress/replacements/versions.yaml @@ -5,7 +5,7 @@ metadata: annotations: config.kubernetes.io/function: |- container: - image: quay.io/airshipit/replacement-transformer:v2 + image: quay.io/airshipit/replacement-transformer:v2.0.2 replacements: - source: objref: diff --git a/playbooks/vars/test-config.yaml b/playbooks/vars/test-config.yaml index 6596462c4..f6aa28eb9 100644 --- a/playbooks/vars/test-config.yaml +++ b/playbooks/vars/test-config.yaml @@ -15,7 +15,7 @@ airship_config_iso_gen_target_path: "{{ serve_dir }}" airship_config_phase_repo_url: "https://review.opendev.org/airship/airshipctl" airship_config_manifest_directory: "{{ remote_work_dir | default(zuul.project.src_dir) | default(local_src_dir) }}" airship_config_ephemeral_ip: "{{ airship_gate_ipam.nat_network.ephemeral_ip }}" -airship_config_iso_builder_docker_image: "quay.io/airshipit/image-builder:latest-ubuntu_focal" +airship_config_iso_builder_docker_image: "quay.io/airshipit/image-builder:053c992218601cc49fd4a595ee4873380b132408-ubuntu_focal" airship_config_site_path: manifests/site/test-site airship_config_ca_data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN5RENDQWJDZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFWTVJNd0VRWURWUVFERXdwcmRXSmwKY201bGRHVnpNQjRYRFRFNU1USXlOakE0TWpneU5Gb1hEVEk1TVRJeU16QTRNamd5TkZvd0ZURVRNQkVHQTFVRQpBeE1LYTNWaVpYSnVaWFJsY3pDQ0FTSXdEUVlKS29aSWh2Y05BUUVCQlFBRGdnRVBBRENDQVFvQ2dnRUJBTTFSClM0d3lnajNpU0JBZjlCR0JUS1p5VTFwYmdDaGQ2WTdJektaZWRoakM2K3k1ZEJpWm81ZUx6Z2tEc2gzOC9YQ1MKenFPS2V5cE5RcDN5QVlLdmJKSHg3ODZxSFZZNjg1ZDVYVDNaOHNyVVRzVDR5WmNzZHAzV3lHdDM0eXYzNi9BSQoxK1NlUFErdU5JemN6bzNEdWhXR0ZoQjk3VjZwRitFUTBlVWN5bk05c2hkL3AwWVFzWDR1ZlhxaENENVpzZnZUCnBka3UvTWkyWnVGUldUUUtNeGpqczV3Z2RBWnBsNnN0L2ZkbmZwd1Q5cC9WTjRuaXJnMEsxOURTSFFJTHVrU2MKb013bXNBeDJrZmxITWhPazg5S3FpMEloL2cyczRFYTRvWURZemt0Y2JRZ24wd0lqZ2dmdnVzM3pRbEczN2lwYQo4cVRzS2VmVGdkUjhnZkJDNUZNQ0F3RUFBYU1qTUNFd0RnWURWUjBQQVFIL0JBUURBZ0trTUE4R0ExVWRFd0VCCi93UUZNQU1CQWY4d0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFJek9BL00xWmRGUElzd2VoWjFuemJ0VFNURG4KRHMyVnhSV0VnclFFYzNSYmV3a1NkbTlBS3MwVGR0ZHdEbnBEL2tRYkNyS2xEeFF3RWg3NFZNSFZYYkFadDdsVwpCSm90T21xdXgxYThKYklDRTljR0FHRzFvS0g5R29jWERZY0JzOTA3ckxIdStpVzFnL0xVdG5hN1dSampqZnBLCnFGelFmOGdJUHZIM09BZ3B1RVVncUx5QU8ya0VnelZwTjZwQVJxSnZVRks2TUQ0YzFmMnlxWGxwNXhrN2dFSnIKUzQ4WmF6d0RmWUVmV3Jrdld1YWdvZ1M2SktvbjVEZ0Z1ZHhINXM2Snl6R3lPVnZ0eG1TY2FvOHNxaCs3UXkybgoyLzFVcU5ZK0hlN0x4d04rYkhwYkIxNUtIMTU5ZHNuS3BRbjRORG1jSTZrVnJ3MDVJMUg5ZGRBbGF0bz0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo= airship_config_client_cert_data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUQwRENDQXJnQ0ZFdFBveEZYSjVrVFNWTXQ0OVlqcHBQL3hCYnlNQTBHQ1NxR1NJYjNEUUVCQ3dVQU1CVXgKRXpBUkJnTlZCQU1UQ210MVltVnlibVYwWlhNd0hoY05NakF3TVRJME1Ua3hOVEV3V2hjTk1qa3hNakF5TVRreApOVEV3V2pBME1Sa3dGd1lEVlFRRERCQnJkV0psY201bGRHVnpMV0ZrYldsdU1SY3dGUVlEVlFRS0RBNXplWE4wClpXMDZiV0Z6ZEdWeWN6Q0NBaUl3RFFZSktvWklodmNOQVFFQkJRQURnZ0lQQURDQ0Fnb0NnZ0lCQU1iaFhUUmsKVjZiZXdsUjBhZlpBdTBGYWVsOXRtRThaSFEvaGtaSHhuTjc2bDZUUFltcGJvaDRvRjNGMFFqbzROS1o5NVRuWgo0OWNoV240eFJiZVlPU25EcDBpV0Qzd0pXUlZ5aVFvVUFyYTlNcHVPNkVFU1FpbFVGNXNxc0VXUVdVMjBETStBCkdxK1k0Z2c3eDJ1Q0hTdk1GUmkrNEw5RWlXR2xnRDIvb1hXUm5NWEswNExQajZPb3Vkb2Zid2RmT3J6dTBPVkUKUzR0eGtuS1BCY1BUU3YxMWVaWVhja0JEVjNPbExENEZ3dTB3NTcwcnczNzAraEpYdlZxd3Zjb2RjZjZEL1BXWQowamlnd2ppeUJuZ2dXYW04UVFjd1Nud3o0d05sV3hKOVMyWUJFb1ptdWxVUlFaWVk5ZXRBcEpBdFMzTjlUNlQ2ClovSlJRdEdhZDJmTldTYkxEck5qdU1OTGhBYWRMQnhJUHpBNXZWWk5aalJkdEMwU25pMlFUMTVpSFp4d1RxcjQKakRQQ0pYRXU3KytxcWpQVldUaUZLK3JqcVNhS1pqVWZVaUpHQkJWcm5RZkJENHNtRnNkTjB5cm9tYTZOYzRMNQpKS21RV1NHdmd1aG0zbW5sYjFRaVRZanVyZFJQRFNmdmwrQ0NHbnA1QkkvZ1pwMkF1SHMvNUpKVTJlc1ZvL0xsCkVPdHdSOXdXd3dXcTAvZjhXS3R4bVRrMTUyOUp2dFBGQXQweW1CVjhQbHZlYnVwYmJqeW5pL2xWbTJOYmV6dWUKeCtlMEpNbGtWWnFmYkRSS243SjZZSnJHWW1CUFV0QldoSVkzb1pJVTFEUXI4SUlIbkdmYlZoWlR5ME1IMkFCQQp1dlVQcUtSVk80UGkxRTF4OEE2eWVPeVRDcnB4L0pBazVyR2RBZ01CQUFFd0RRWUpLb1pJaHZjTkFRRUxCUUFECmdnRUJBSWNFM1BxZHZDTVBIMnJzMXJESk9ESHY3QWk4S01PVXZPRi90RjlqR2EvSFBJbkh3RlVFNEltbldQeDYKVUdBMlE1bjFsRDFGQlU0T0M4eElZc3VvS1VQVHk1T0t6SVNMNEZnL0lEcG54STlrTXlmNStMR043aG8rblJmawpCZkpJblVYb0tERW1neHZzSWFGd1h6bGtSTDJzL1lKYUZRRzE1Uis1YzFyckJmd2dJOFA5Tkd6aEM1cXhnSmovCm04K3hPMGhXUmJIYklrQ21NekRib2pCSWhaL00rb3VYR1doei9TakpodXhZTVBnek5MZkFGcy9PMTVaSjd3YXcKZ3ZoSGc3L2E5UzRvUCtEYytPa3VrMkV1MUZjL0E5WHpWMzc5aWhNWW5ub3RQMldWeFZ3b0ZZQUg0NUdQcDZsUApCQmwyNnkxc2JMbjl6aGZYUUJIMVpFN0EwZVE9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K diff --git a/tools/airship-in-a-pod/airship-in-a-pod.yaml b/tools/airship-in-a-pod/airship-in-a-pod.yaml index 817cbb3eb..89a10bddc 100644 --- a/tools/airship-in-a-pod/airship-in-a-pod.yaml +++ b/tools/airship-in-a-pod/airship-in-a-pod.yaml @@ -181,7 +181,7 @@ spec: mountPath: /srv/ - name: airshipctl-builder - image: quay.io/airshipit/aiap-airshipctl-builder:latest + image: quay.io/airshipit/aiap-airshipctl-builder:892bb6a16d53a0f43571284db83901bef53ed440 command: - bash - -cex @@ -218,7 +218,7 @@ spec: mountPath: /var/run - name: infra-builder - image: quay.io/airshipit/aiap-infra-builder:latest + image: quay.io/airshipit/aiap-infra-builder:892bb6a16d53a0f43571284db83901bef53ed440 securityContext: privileged: true command: @@ -261,7 +261,7 @@ spec: mountPath: /var/run - name: runner - image: quay.io/airshipit/aiap-runner:latest + image: quay.io/airshipit/aiap-runner:892bb6a16d53a0f43571284db83901bef53ed440 command: - bash - -cex diff --git a/tools/deployment/22_test_configs.sh b/tools/deployment/22_test_configs.sh index 02ceb574a..da02af00a 100755 --- a/tools/deployment/22_test_configs.sh +++ b/tools/deployment/22_test_configs.sh @@ -23,7 +23,7 @@ export HTTPS_PROXY=${HTTPS_PROXY:-${https_proxy}} export HTTP_PROXY=${HTTP_PROXY:-${http_proxy}} export NO_PROXY=${NO_PROXY:-${no_proxy}} export AIRSHIP_CONFIG_ISO_GEN_TARGET_PATH=${IMAGE_DIR} -export AIRSHIP_CONFIG_ISO_BUILDER_DOCKER_IMAGE=${BUILDER_IMAGE:-"quay.io/airshipit/image-builder:latest-ubuntu_focal"} +export AIRSHIP_CONFIG_ISO_BUILDER_DOCKER_IMAGE=${BUILDER_IMAGE:-"quay.io/airshipit/image-builder:053c992218601cc49fd4a595ee4873380b132408-ubuntu_focal"} export REMOTE_TYPE=redfish export REMOTE_INSECURE=true export REMOTE_PROXY=false diff --git a/tools/deployment/azure/31_create_configs.sh b/tools/deployment/azure/31_create_configs.sh index 3f92ec8a9..928d53cb7 100755 --- a/tools/deployment/azure/31_create_configs.sh +++ b/tools/deployment/azure/31_create_configs.sh @@ -24,7 +24,7 @@ export HTTPS_PROXY=${HTTP_PROXY:-${http_proxy}} export NO_PROXY=${NO_PROXY:-${no_proxy}} export REMOTE_WORK_DIR=${remote_work_dir:-"/tmp/airship"} export AIRSHIP_CONFIG_ISO_GEN_TARGET_PATH=${IMAGE_DIR} -export AIRSHIP_CONFIG_ISO_BUILDER_DOCKER_IMAGE=${BUILDER_IMAGE:-"quay.io/airshipit/image-builder:latest-ubuntu_focal"} +export AIRSHIP_CONFIG_ISO_BUILDER_DOCKER_IMAGE=${BUILDER_IMAGE:-"quay.io/airshipit/image-builder:053c992218601cc49fd4a595ee4873380b132408-ubuntu_focal"} export REMOTE_TYPE=redfish export REMOTE_INSECURE=true export REMOTE_PROXY=false diff --git a/tools/deployment/update-krm-images b/tools/deployment/update-krm-images index 9c40794ed..33fcd8f9a 100755 --- a/tools/deployment/update-krm-images +++ b/tools/deployment/update-krm-images @@ -21,9 +21,9 @@ set -xe export MANIFEST_DIR=${MANIFEST_DIR:-"$(pwd)"} -export OLD_REPLACEMENT_TRANSFORMER=${OLD_REPLACEMENT_TRANSFORMER:-"quay.io/airshipit/replacement-transformer:v2"} -export OLD_TEMPLATER=${OLD_TEMPLATER:-"quay.io/airshipit/templater:v2"} -export OLD_CLOUD_INIT=${OLD_CLOUD_INIT:-"quay.io/airshipit/cloud-init:v2"} +export OLD_REPLACEMENT_TRANSFORMER=${OLD_REPLACEMENT_TRANSFORMER:-"quay.io/airshipit/replacement-transformer:v2.0.2"} +export OLD_TEMPLATER=${OLD_TEMPLATER:-"quay.io/airshipit/templater:v2.0.2"} +export OLD_CLOUD_INIT=${OLD_CLOUD_INIT:-"quay.io/airshipit/cloud-init:v2.0.2"} export OLD_SOPS=${OLD_SOPS:-"gcr.io/kpt-fn-contrib/sops:v0.1.0"} export NEW_REPLACEMENT_TRANSFORMER=${NEW_REPLACEMENT_TRANSFORMER:-$OLD_REPLACEMENT_TRANSFORMER}