airship/airshipctl
Code Issues Proposed changes

Merge "Pin krm function calls"

Browse Source
This commit is contained in:
Zuul 2021-03-24 21:34:06 +00:00 committed by Gerrit Code Review
commit 76e345b862
33 changed files with 37 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/source/plugins.md
View File

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

2
krm-functions/replacement-transformer/local-resource/example-use.yaml
View File

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

2
krm-functions/templater/local-resource/example-use.yaml
View File

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

2
manifests/function/airshipctl-base-catalogues/env-vars-template.yaml
View File

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

2
manifests/function/baremetal-operator/replacements/ironic-env-vars.yaml
View File

@ -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:

2
manifests/function/baremetal-operator/replacements/networking.yaml
View File

@ -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:

2
manifests/function/baremetal-operator/replacements/versions.yaml
View File

@ -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:

2
manifests/function/clusterctl/replacements/versions.yaml
View File

@ -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:

2
manifests/function/ephemeral/replacements/ephemeral-env-vars.yaml
View File

@ -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:

2
manifests/function/ephemeral/replacements/generated-secrets.yaml
View File

@ -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:

2
manifests/function/ephemeral/replacements/networking.yaml
View File

@ -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:

2
manifests/function/flux/helm-controller/replacements/versions.yaml
View File

@ -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:

2
manifests/function/flux/source-controller/replacements/env-vars.yaml
View File

@ -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:

2
manifests/function/flux/source-controller/replacements/versions.yaml
View File

@ -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:

2
manifests/function/generate-secrets-example/README.md
View File

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

2
manifests/function/generate-secrets-example/secret-generation.yaml
View File

@ -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"

2
manifests/function/hardwareprofile-example/replacements/hosts.yaml
View File

@ -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:

2
manifests/function/helm-operator/replacements/helm-operator-env-vars.yaml
View File

@ -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:

2
manifests/function/helm-operator/replacements/versions.yaml
View File

@ -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:

2
manifests/function/hostgenerator-m3/hosttemplate.yaml
View File

@ -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:

2
manifests/function/hostgenerator-m3/replacements/hosts.yaml
View File

@ -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:

2
manifests/function/hwcc/replacements/versions.yaml
View File

@ -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:

2
manifests/function/k8scontrol/replacements/cluster.yaml
View File

@ -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:

2
manifests/function/k8scontrol/replacements/k8scontrol-env-vars.yaml
View File

@ -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:

2
manifests/function/k8scontrol/replacements/networking.yaml
View File

@ -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:

2
manifests/function/k8scontrol/replacements/versions.yaml
View File

@ -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:

2
manifests/phases/executors.yaml
View File

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

2
manifests/site/test-site/kubeconfig/update-target.yaml
View File

@ -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:

2
manifests/site/test-site/target/generator/results/decrypt-secrets/configurable-decryption.yaml
View File

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

2
manifests/site/test-site/target/workers/replacements/workers-env-vars.yaml
View File

@ -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:

2
manifests/type/gating/target/generator/secret-template.yaml
View File

@ -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:

2
manifests/type/gating/target/workload/ingress/replacements/versions.yaml
View File

@ -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:

7
tools/deployment/update-krm-images
View File

@ -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" {} \;