Merge "Pin krm function calls"

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

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

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

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

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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
 ```

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"

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

manifests/phases/executors.yaml

@@ -197,7 +197,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

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:

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
         - DEBUG_SOPS_GPG

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:

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:

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:

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_REPLACEMENT_TRANSFORMER=${OLD_REPLACEMENT_TRANSFORMER:-"quay.io/airshipit/replacement-transformer:v2"}
-export OLD_TEMPLATER=${OLD_TEMPLATER:-"quay.io/airshipit/templater:latest"}
+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" {} \;