Pin krm function calls

This pins krm function calls to version `v2` which represents [0] [1] the latest 2.x.x semantic version. If we need to make breaking changes to any krm functions, that can now be done by incrementing their major version and thus not breaking these references. [0]: https://review.opendev.org/c/airship/airshipctl/+/762924 [1]: https://review.opendev.org/c/airship/airshipctl/+/780875 Closes: #419 Change-Id: I6cf6519511c77da6cac7e46a6b56ea338bcf150c
2020-12-15 09:43:04 -06:00 · 2020-12-15 09:43:04 -06:00 · 299b2833b2
commit 299b2833b2
parent 442f9965fb
33 changed files with 37 additions and 34 deletions
--- 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:latest
+        image: quay.io/airshipit/templater:v2
 values:
  hosts:
  - macAddress: 00:aa:bb:cc:dd
--- 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:latest
+        image: quay.io/airshipit/replacement-transformer:v2
  name: k8scontrol-versions-replacements
 replacements:
 # Replace the Kubernetes version in the KubeadmControlPlane
--- 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:latest
+        image: quay.io/airshipit/templater:v2
 values:
  hosts:
  - macAddress: 00:aa:bb:cc:dd
--- 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:latest
+        image: quay.io/airshipit/templater:v2
        envs:
          - HTTP_PROXY
          - HTTPS_PROXY
--- 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:latest
+        image: quay.io/airshipit/replacement-transformer:v2
 replacements:
 # Replace the proxy vars
 - source:
--- 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:latest
+        image: quay.io/airshipit/replacement-transformer:v2
 replacements:
 # Replace the pod & service networks
 - source:
--- 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:latest
+        image: quay.io/airshipit/replacement-transformer:v2
 replacements:
 # Container versions for the ironic Deployment
 - source:
--- 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:latest
+        image: quay.io/airshipit/replacement-transformer:v2
 replacements:
 # Replace capm3 versions
 - source:
--- 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:latest
+        image: quay.io/airshipit/replacement-transformer:v2
 replacements:
 # Replace the proxy vars
 - source:
--- 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:latest
+        image: quay.io/airshipit/replacement-transformer:v2
 replacements:
 - source:
    objref:
--- 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:latest
+        image: quay.io/airshipit/replacement-transformer:v2
 replacements:
 # Substring-replace the ephemeral control plane's info
 - source:
--- 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:latest
+        image: quay.io/airshipit/replacement-transformer:v2
 replacements:
 - source:
    objref:
--- 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:latest
+        image: quay.io/airshipit/replacement-transformer:v2
 replacements:
 # Replace the proxy vars
 - source:
--- 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:latest
+        image: quay.io/airshipit/replacement-transformer:v2
 replacements:
 - source:
    objref:
--- 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:latest
+    image: quay.io/airshipit/templater:v2
 config: |
  foo: bar
 ```
--- 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:latest
+        image: quay.io/airshipit/templater:v2
 values:
  clusterCa:
    cn: "Kubernetes API"
--- 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:latest
+        image: quay.io/airshipit/replacement-transformer:v2
 replacements:
 - source:
    objref:
--- 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:latest
+        image: quay.io/airshipit/replacement-transformer:v2
 replacements:
 # Replace the proxy vars
 - source:
--- 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:latest
+        image: quay.io/airshipit/replacement-transformer:v2
 replacements:
 - source:
    objref:
--- 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:latest
+        image: quay.io/airshipit/templater:v2

 values:
  # hosts:
--- 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:latest
+        image: quay.io/airshipit/replacement-transformer:v2
 replacements:
 - source:
    objref:
--- 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:latest
+        image: quay.io/airshipit/replacement-transformer:v2
 replacements:
 - source:
    objref:
--- 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:latest
+        image: quay.io/airshipit/replacement-transformer:v2
 replacements:
 - source:
    objref:
--- 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:latest
+        image: quay.io/airshipit/replacement-transformer:v2
 replacements:
 # Replace the proxy vars
 - source:
--- 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:latest
+        image: quay.io/airshipit/replacement-transformer:v2
 replacements:
 # Replace the pod & service networks
 - source:
--- 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:latest
+        image: quay.io/airshipit/replacement-transformer:v2
 replacements:
 # Replace the Kubernetes version in the KubeadmControlPlane
 - source:
--- a/manifests/phases/executors.yaml
+++ b/manifests/phases/executors.yaml
@ -179,7 +179,7 @@ metadata:
    airshipit.org/deploy-k8s: "false"
 spec:
  type: krm
-  image: quay.io/airshipit/cloud-init:latest
+  image: quay.io/airshipit/cloud-init:v2
  mounts:
  - type: bind
    src: /srv/images
--- 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:latest
+        image: quay.io/airshipit/replacement-transformer:v2
 replacements:
 - source:
    objref:
--- 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:latest
+        image: quay.io/airshipit/templater:v2
        envs:
        - TOLERATE_DECRYPTION_FAILURES
 template: |
--- 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:latest
+        image: quay.io/airshipit/replacement-transformer:v2
 replacements:
 # Replace the proxy vars
 - source:
--- 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:latest
+        image: quay.io/airshipit/templater:v2
 values:
  ephemeralCluster:
    ca:
--- 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:latest
+        image: quay.io/airshipit/replacement-transformer:v2
 replacements:
 - source:
    objref:
--- a/tools/deployment/update-krm-images
+++ b/tools/deployment/update-krm-images
@ -21,14 +21,17 @@ set -xe

 export MANIFEST_DIR=${MANIFEST_DIR:-"$(pwd)"}

-export OLD_REPLACEMENT_TRANSFORMER=${OLD_REPLACEMENT_TRANSFORMER:-"quay.io/airshipit/replacement-transformer:latest"}
-export OLD_TEMPLATER=${OLD_TEMPLATER:-"quay.io/airshipit/templater:latest"}
+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_SOPS=${OLD_SOPS:-"quay.io/aodinokov/sops:v0.0.3"}

 export NEW_REPLACEMENT_TRANSFORMER=${NEW_REPLACEMENT_TRANSFORMER:-$OLD_REPLACEMENT_TRANSFORMER}
 export NEW_TEMPLATER=${NEW_TEMPLATER:-$OLD_TEMPLATER}
+export NEW_CLOUD_INIT=${NEW_CLOUD_INIT:-$OLD_CLOUD_INIT}
 export NEW_SOPS=${NEW_SOPS:-$OLD_SOPS}

 find "$MANIFEST_DIR" -type f -exec sed -i -e "s#$OLD_REPLACEMENT_TRANSFORMER#$NEW_REPLACEMENT_TRANSFORMER#g" {} \;
 find "$MANIFEST_DIR" -type f -exec sed -i -e "s#$OLD_TEMPLATER#$NEW_TEMPLATER#g" {} \;
+find "$MANIFEST_DIR" -type f -exec sed -i -e "s#$OLD_CLOUD_INIT#$NEW_CLOUD_INIT#g" {} \;
 find "$MANIFEST_DIR" -type f -exec sed -i -e "s#$OLD_SOPS#$NEW_SOPS#g" {} \;