Skip to content

Commit 8611471

Browse files
tobiasgiesek8s-infra-cherrypick-robot
authored andcommitted
Update ubuntu image
We have an issue with our ubuntu image where we're not able to update the apt sources due to outdated public keys. To fix this issue we recreate the image via image-builder. Signed-off-by: Tobias Giese <[email protected]>
1 parent 3430748 commit 8611471

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

docs/book/src/development/development.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,10 @@ The file [`test/e2e/data/e2e_conf.yaml`](https://github.com/kubernetes-sigs/clus
118118
* Network trunking (neutron-trunk)
119119
* see [Configration](https://github.com/kubernetes-sigs/cluster-api-provider-openstack/blob/main/docs/book/src/development/ci.md#configuration) for more details.
120120
* Glance images
121-
* `cirros-0.5.1-x86_64-disk`
121+
* `cirros-0.6.1-x86_64-disk`
122122
* Download from https://docs.openstack.org/image-guide/obtain-images.html
123-
* `ubuntu-2004-kube-v1.18.15`
124-
* Download from https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/ubuntu/2021-03-27/ubuntu-2004-kube-v1.18.15.qcow2
123+
* `ubuntu-2004-kube-v1.23.10`
124+
* Download from https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/ubuntu/2022-12-05/ubuntu-2004-kube-v1.23.10.qcow2
125125
* Or generate using the `images/capi` directory from https://github.com/kubernetes-sigs/image-builder
126126
* Boot volume size must be less than 15GB
127127
* Flavors

hack/ci/cloud-init/controller.yaml.tpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
# Don't download default images, just our test images
5555
DOWNLOAD_DEFAULT_IMAGES=False
5656
# We upload the Amphora image so it doesn't have to be build
57-
IMAGE_URLS="https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/amphora/2021-03-27/amphora-x64-haproxy.qcow2"
57+
IMAGE_URLS="https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/amphora/2022-12-05/amphora-x64-haproxy.qcow2"
5858

5959
[[post-config|$NOVA_CONF]]
6060
[DEFAULT]
@@ -136,8 +136,8 @@
136136
# Upload the images so we don't have to upload them from Prow
137137
# Upload cirros image first in order to avoid reach limit of project
138138
# https://docs.openstack.org/glance/latest/admin/quotas.html
139-
/opt/stack/devstack/tools/upload_image.sh https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/cirros/2021-03-27/cirros-0.5.1-x86_64-disk.img
140-
/opt/stack/devstack/tools/upload_image.sh https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/ubuntu/2021-03-27/ubuntu-2004-kube-v1.18.15.qcow2
139+
/opt/stack/devstack/tools/upload_image.sh https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/cirros/2022-12-05/cirros-0.6.1-x86_64-disk.img
140+
/opt/stack/devstack/tools/upload_image.sh https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/ubuntu/2022-12-05/ubuntu-2004-kube-v1.23.10.qcow2
141141

142142
# Add the controller to its own host aggregate and availability zone
143143
aggregateid=$(openstack aggregate create --zone "${PRIMARY_AZ}" "${PRIMARY_AZ}" -f value -c id)

test/e2e/data/e2e_conf.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ variables:
119119
CNI: "../../data/cni/calico.yaml"
120120
CCM: "../../data/ccm/cloud-controller-manager.yaml"
121121
EXP_CLUSTER_RESOURCE_SET: "true"
122-
OPENSTACK_BASTION_IMAGE_NAME: "cirros-0.5.1-x86_64-disk"
122+
OPENSTACK_BASTION_IMAGE_NAME: "cirros-0.6.1-x86_64-disk"
123123
OPENSTACK_BASTION_MACHINE_FLAVOR: "m1.tiny"
124124
OPENSTACK_CLOUD: "capo-e2e"
125125
OPENSTACK_CLOUD_ADMIN: "capo-e2e-admin"
@@ -129,7 +129,7 @@ variables:
129129
OPENSTACK_DNS_NAMESERVERS: "8.8.8.8"
130130
OPENSTACK_FAILURE_DOMAIN: "testaz1"
131131
OPENSTACK_FAILURE_DOMAIN_ALT: "testaz2"
132-
OPENSTACK_IMAGE_NAME: "ubuntu-2004-kube-v1.18.15"
132+
OPENSTACK_IMAGE_NAME: "ubuntu-2004-kube-v1.23.10"
133133
OPENSTACK_NODE_MACHINE_FLAVOR: "m1.small"
134134
OPENSTACK_SSH_KEY_NAME: "cluster-api-provider-openstack-sigs-k8s-io"
135135
OPENSTACK_EXTERNAL_NETWORK_ID: ""

0 commit comments

Comments
 (0)