diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 0153f226..d8a5102b 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -69,8 +69,10 @@ jobs: include: - lxc-image: ubuntu:22.04 engine: docker - - lxc-image: images:fedora/39/cloud - engine: podman +# LXD is now banned from pulling images:fedora from https://images.linuxcontainers.org/ +# TODO: switch away from LXD to Incus: https://github.com/rootless-containers/usernetes/pull/332 +# - lxc-image: images:fedora/39/cloud +# engine: podman env: LXC_IMAGE: "${{ matrix.lxc-image }}" CONTAINER_ENGINE: "${{ matrix.engine }}" diff --git a/Dockerfile b/Dockerfile index c255d868..df52994a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -ARG BASE_IMAGE=docker.io/kindest/node:v1.29.2@sha256:51a1434a5397193442f0be2a297b488b6c919ce8a3931be0ce822606ea5ca245 -ARG CNI_PLUGINS_VERSION=v1.4.1 +ARG BASE_IMAGE=docker.io/kindest/node:v1.30.0@sha256:047357ac0cfea04663786a612ba1eaba9702bef25227a794b52890dd8bcd692e +ARG CNI_PLUGINS_VERSION=v1.5.0 FROM ${BASE_IMAGE} COPY Dockerfile.d/SHA256SUMS.d/ /tmp/SHA256SUMS.d ARG CNI_PLUGINS_VERSION diff --git a/Dockerfile.d/SHA256SUMS.d/cni-plugins-v1.4.1 b/Dockerfile.d/SHA256SUMS.d/cni-plugins-v1.4.1 deleted file mode 100644 index 0baa626f..00000000 --- a/Dockerfile.d/SHA256SUMS.d/cni-plugins-v1.4.1 +++ /dev/null @@ -1,2 +0,0 @@ -1511f6c003ace805eafeb1132727791326283cff88a923d76329e1892bba7a10 cni-plugins-linux-amd64-v1.4.1.tgz -72644e13557cda8a5b39baf97fc5e93d23fdf7baba7700000e7e9efd8bdf9234 cni-plugins-linux-arm64-v1.4.1.tgz diff --git a/Dockerfile.d/SHA256SUMS.d/cni-plugins-v1.5.0 b/Dockerfile.d/SHA256SUMS.d/cni-plugins-v1.5.0 new file mode 100644 index 00000000..729e73a9 --- /dev/null +++ b/Dockerfile.d/SHA256SUMS.d/cni-plugins-v1.5.0 @@ -0,0 +1,2 @@ +57a18478422cb321370e30a5ee6ce026321289cd9c94353ca697dddd7714f1a5 cni-plugins-linux-amd64-v1.5.0.tgz +ab38507efe50c34bc2242a25c5783c19fdfe0376c65a2a91d48174d4f39f1fc2 cni-plugins-linux-arm64-v1.5.0.tgz diff --git a/Makefile b/Makefile index 171354ef..0e04f0e5 100644 --- a/Makefile +++ b/Makefile @@ -150,4 +150,4 @@ kubeadm-reset: .PHONY: install-flannel install-flannel: - $(NODE_SHELL) kubectl apply -f https://github.com/flannel-io/flannel/releases/download/v0.24.4/kube-flannel.yml + $(NODE_SHELL) kubectl apply -f https://github.com/flannel-io/flannel/releases/download/v0.25.1/kube-flannel.yml