Skip to content

Commit

Permalink
Merge pull request #331 from AkihiroSuda/dev
Browse files Browse the repository at this point in the history
update components (Kubernetes 1.30.0)
  • Loading branch information
AkihiroSuda authored May 27, 2024
2 parents 82d6cd2 + 7748e2a commit 4cf7564
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 7 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 0 additions & 2 deletions Dockerfile.d/SHA256SUMS.d/cni-plugins-v1.4.1

This file was deleted.

2 changes: 2 additions & 0 deletions Dockerfile.d/SHA256SUMS.d/cni-plugins-v1.5.0
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
57a18478422cb321370e30a5ee6ce026321289cd9c94353ca697dddd7714f1a5 cni-plugins-linux-amd64-v1.5.0.tgz
ab38507efe50c34bc2242a25c5783c19fdfe0376c65a2a91d48174d4f39f1fc2 cni-plugins-linux-arm64-v1.5.0.tgz
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 4cf7564

Please sign in to comment.