From 31e844fbb1fbf3d8696e49b6ed7bbcc8be9a758b Mon Sep 17 00:00:00 2001 From: Christian Berendt Date: Wed, 13 Dec 2023 18:16:29 +0100 Subject: [PATCH] Add 1.29 image Signed-off-by: Christian Berendt --- .cirrus.yml | 17 +++++++++++------ README.md | 3 +++ extra_vars_129.json | 6 ++++++ playbooks/pre.yml | 3 --- 4 files changed, 20 insertions(+), 9 deletions(-) create mode 100644 extra_vars_129.json diff --git a/.cirrus.yml b/.cirrus.yml index d40ac49..4b6021a 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -29,18 +29,17 @@ build_task_template: &BUILD_TASK_TEMPLATE - while fuser /var/lib/dpkg/lock >/dev/null 2>&1; do sleep 5; done; - while fuser /var/lib/dpkg/lock-frontend >/dev/null 2>&1; do sleep 5; done; - apt-get update - - apt-get install -y curl git software-properties-common - - curl -fsSL https://apt.releases.hashicorp.com/gpg | apt-key add - - - apt-add-repository "deb [arch=amd64] https://apt.releases.hashicorp.com focal main" - - apt-add-repository --yes --update ppa:ansible/ansible - - apt-get install -y ansible packer + - apt-get install -y git make python3-pip curl jq unzip prepare_script: - git clone https://github.com/kubernetes-sigs/image-builder - - ansible-playbook -i localhost, playbooks/pre.yml -e working_directory=$CIRRUS_WORKING_DIR + - cd image-builder/images/capi + - export PATH=$PWD/.bin:$HOME/.local/bin:$PATH + - make deps-qemu build_script: - cd image-builder/images/capi + - export PATH=$PWD/.bin:$HOME/.local/bin:$PATH - make build-qemu-ubuntu-2204 prepare_push_script: @@ -74,3 +73,9 @@ build_128_task: skip: "!changesInclude('extra_vars_128.json')" env: PACKER_VAR_FILES: ../../../extra_vars_128.json + +build_129_task: + <<: *BUILD_TASK_TEMPLATE + skip: "!changesInclude('extra_vars_129.json')" + env: + PACKER_VAR_FILES: ../../../extra_vars_129.json diff --git a/README.md b/README.md index f3e702c..07074a2 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,7 @@ This means that the image for version `1.27` contains, for example, version `1.2 | Version | Image URL | |---------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------| +| v1.29 | [ubuntu-2204-kube-v1.29.qcow2](https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-k8s-capi-images/ubuntu-2204-kube-v1.29/ubuntu-2204-kube-v1.29.qcow2) | | v1.28 | [ubuntu-2204-kube-v1.28.qcow2](https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-k8s-capi-images/ubuntu-2204-kube-v1.28/ubuntu-2204-kube-v1.28.qcow2) | | v1.27 | [ubuntu-2204-kube-v1.27.qcow2](https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-k8s-capi-images/ubuntu-2204-kube-v1.27/ubuntu-2204-kube-v1.27.qcow2) | | v1.26 | [ubuntu-2204-kube-v1.26.qcow2](https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-k8s-capi-images/ubuntu-2204-kube-v1.26/ubuntu-2204-kube-v1.26.qcow2) | @@ -19,6 +20,8 @@ This means that the image for version `1.27` contains, for example, version `1.2 | Series | Version | Image URL | CHECKSUM URL | |--------|----------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| v1.29 | | | | +| | v1.29.0 | [ubuntu-2204-kube-v1.29.0.qcow2](https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-k8s-capi-images/ubuntu-2204-kube-v1.29/ubuntu-2204-kube-v1.29.0.qcow2) | [ubuntu-2204-kube-v1.29.0.qcow2.CHECKSUM](https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-k8s-capi-images/ubuntu-2204-kube-v1.29/ubuntu-2204-kube-v1.29.0.qcow2.CHECKSUM) | | v1.28 | | | | | | v1.28.4 | [ubuntu-2204-kube-v1.28.4.qcow2](https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-k8s-capi-images/ubuntu-2204-kube-v1.28/ubuntu-2204-kube-v1.28.4.qcow2) | [ubuntu-2204-kube-v1.28.4.qcow2.CHECKSUM](https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-k8s-capi-images/ubuntu-2204-kube-v1.28/ubuntu-2204-kube-v1.28.4.qcow2.CHECKSUM) | | | v1.28.3 | [ubuntu-2204-kube-v1.28.3.qcow2](https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-k8s-capi-images/ubuntu-2204-kube-v1.28/ubuntu-2204-kube-v1.28.3.qcow2) | [ubuntu-2204-kube-v1.28.3.qcow2.CHECKSUM](https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-k8s-capi-images/ubuntu-2204-kube-v1.28/ubuntu-2204-kube-v1.28.3.qcow2.CHECKSUM) | diff --git a/extra_vars_129.json b/extra_vars_129.json new file mode 100644 index 0000000..73093b6 --- /dev/null +++ b/extra_vars_129.json @@ -0,0 +1,6 @@ +{ + "kubernetes_deb_version": "1.29.0-1.1", + "kubernetes_semver": "v1.29.0", + "kubernetes_series": "v1.29", + "output_directory": "./output/{{user `build_name`}}-kube-{{user `kubernetes_series`}}" +} diff --git a/playbooks/pre.yml b/playbooks/pre.yml index 4c2be6f..034c35d 100644 --- a/playbooks/pre.yml +++ b/playbooks/pre.yml @@ -32,9 +32,6 @@ software-properties-common \ unzip - sudo apt-add-repository --yes --update ppa:ansible/ansible - sudo apt-get install -y ansible - sudo chmod 0777 /dev/kvm echo "Host *" | sudo tee /etc/ssh/ssh_config