diff --git a/src/cloud-api-adaptor/docker/kind-config-crio.yaml b/src/cloud-api-adaptor/docker/kind-config-crio.yaml index df071ce224..61940a09ec 100644 --- a/src/cloud-api-adaptor/docker/kind-config-crio.yaml +++ b/src/cloud-api-adaptor/docker/kind-config-crio.yaml @@ -6,7 +6,7 @@ networking: nodes: - role: control-plane # Instructions to build - https://github.com/cri-o/cri-o/blob/main/tutorials/crio-in-kind.md#build-node-image - image: quay.io/confidential-containers/kind-crio:v1.29.4 + image: quay.io/wainersm/kind-crio:v1.34 extraMounts: # The config.json file contains the registry secrets that you might # need to pull images from a private registry or docker registry to avoid @@ -23,7 +23,7 @@ nodes: nodeRegistration: criSocket: unix:///var/run/crio/crio.sock - role: worker - image: quay.io/confidential-containers/kind-crio:v1.29.4 + image: quay.io/wainersm/kind-crio:v1.34 extraMounts: - hostPath: /var/run/docker.sock containerPath: /var/run/docker.sock diff --git a/src/cloud-api-adaptor/docker/kind-config.yaml b/src/cloud-api-adaptor/docker/kind-config.yaml index 3b12ea5118..e471f30fd0 100644 --- a/src/cloud-api-adaptor/docker/kind-config.yaml +++ b/src/cloud-api-adaptor/docker/kind-config.yaml @@ -6,7 +6,7 @@ networking: nodes: - role: control-plane # Same image version as used for pod VM base image - image: kindest/node:v1.29.4 + image: kindest/node:v1.34.0 extraMounts: # The config.json file contains the registry secrets that you might # need to pull images from a private registry or docker registry to avoid @@ -14,7 +14,7 @@ nodes: - hostPath: /tmp/config.json containerPath: /var/lib/kubelet/config.json - role: worker - image: kindest/node:v1.29.4 + image: kindest/node:v1.34.0 extraMounts: - hostPath: /var/run/docker.sock containerPath: /var/run/docker.sock diff --git a/src/cloud-api-adaptor/docker/kind_cluster.sh b/src/cloud-api-adaptor/docker/kind_cluster.sh index 2e763c0a83..1a4a9935c8 100755 --- a/src/cloud-api-adaptor/docker/kind_cluster.sh +++ b/src/cloud-api-adaptor/docker/kind_cluster.sh @@ -39,7 +39,7 @@ if [ "$1" == "create" ]; then kind create cluster --name "\$CLUSTER_NAME" --config "\$KIND_CONFIG_FILE" || exit 1 # Deploy calico - kubectl apply -f https://raw.githubusercontent.com/projectcalico/calico/v3.28.0/manifests/calico.yaml || exit 1 + kubectl apply -f https://raw.githubusercontent.com/projectcalico/calico/v3.31.0/manifests/calico.yaml || exit 1 exit 0 fi diff --git a/src/cloud-api-adaptor/libvirt/kcli_cluster.sh b/src/cloud-api-adaptor/libvirt/kcli_cluster.sh index e381989461..eacfe9b229 100755 --- a/src/cloud-api-adaptor/libvirt/kcli_cluster.sh +++ b/src/cloud-api-adaptor/libvirt/kcli_cluster.sh @@ -12,8 +12,8 @@ set -o pipefail CLUSTER_DISK_SIZE="${CLUSTER_DISK_SIZE:-30}" CLUSTER_CONTROL_NODES="${CLUSTER_CONTROL_NODES:-1}" CLUSTER_NAME="${CLUSTER_NAME:-peer-pods}" -CLUSTER_IMAGE="${CLUSTER_IMAGE:-ubuntu2204}" -CLUSTER_VERSION="${CLUSTER_VERSION:-1.30.0}" +CLUSTER_IMAGE="${CLUSTER_IMAGE:-ubuntu2404}" +CLUSTER_VERSION="${CLUSTER_VERSION:-1.34.1}" CLUSTER_WORKERS="${CLUSTER_WORKERS:-1}" CONTAINER_RUNTIME="${CONTAINER_RUNTIME:-containerd}" # Either "containerd" or "crio" LIBVIRT_NETWORK="${LIBVIRT_NETWORK:-default}" diff --git a/src/cloud-api-adaptor/versions.yaml b/src/cloud-api-adaptor/versions.yaml index e2d8329a64..3df149d50c 100644 --- a/src/cloud-api-adaptor/versions.yaml +++ b/src/cloud-api-adaptor/versions.yaml @@ -30,7 +30,7 @@ tools: bats: 1.10.0 iptables-wrapper: v0.0.0-20240819165702-06cad2ec6cb5 golang: 1.24.7 - kcli: 99.0.202507200957 + kcli: 99.0.202510241005 mkosi: v22 protoc: 3.16.0 packer: v1.9.4