diff --git a/UPSTREAM_PROJECTS.yaml b/UPSTREAM_PROJECTS.yaml index 821ccdf591..9e68a1472a 100644 --- a/UPSTREAM_PROJECTS.yaml +++ b/UPSTREAM_PROJECTS.yaml @@ -199,7 +199,7 @@ projects: go_version: N/A - name: kind versions: - - tag: v0.20.0 + - tag: v0.21.0 go_version: "1.20" - org: metallb repos: diff --git a/projects/kubernetes-sigs/kind/ATTRIBUTION.txt b/projects/kubernetes-sigs/kind/ATTRIBUTION.txt index fbed357678..149d48138a 100644 --- a/projects/kubernetes-sigs/kind/ATTRIBUTION.txt +++ b/projects/kubernetes-sigs/kind/ATTRIBUTION.txt @@ -11,7 +11,7 @@ https://github.com/spf13/cobra ** gopkg.in/yaml.v2; version v2.4.0 -- https://gopkg.in/yaml.v2 -** sigs.k8s.io/kind; version v0.20.0 -- +** sigs.k8s.io/kind; version v0.21.0 -- https://github.com/kubernetes-sigs/kind diff --git a/projects/kubernetes-sigs/kind/CHECKSUMS b/projects/kubernetes-sigs/kind/CHECKSUMS index 08cedf62b0..315f23d043 100644 --- a/projects/kubernetes-sigs/kind/CHECKSUMS +++ b/projects/kubernetes-sigs/kind/CHECKSUMS @@ -1,4 +1,4 @@ -bec10195a8c295becb857653fb66081dfa895fbb3ff4474ab280c84685e0b32c _output/bin/kind/linux-amd64/kind -eee9451eadf1c27405c13491a8f9dbf503b7b77417bee35d73179b401db9a538 _output/bin/kind/linux-amd64/kindnetd -0e0020a06d5f71c72cc1daa75e9a7b69df0d9afaacf22c683f36db119d8c2352 _output/bin/kind/linux-arm64/kind -fcc09dbb4a13411f3935dd01a7a277b5a7967330fe02bd45121f947e9716ada0 _output/bin/kind/linux-arm64/kindnetd +21c16a933483fa1b7dff2722cb445c8cc802e16c6834f2e83c6c04ea33cb0b4c _output/bin/kind/linux-amd64/kind +9ca6374e0bdfc4ab53ad941bdb5d792d4058fc897d6a44f05b70684de9fa2785 _output/bin/kind/linux-amd64/kindnetd +fbb8b24efaea55f3301ee6f8fa83e2068b019778884315f0ec3c872af2380313 _output/bin/kind/linux-arm64/kind +f2990b038fe86e8eeb5c2fcba2b618ed069bf8ad820c277d0a8fec84abe69c87 _output/bin/kind/linux-arm64/kindnetd diff --git a/projects/kubernetes-sigs/kind/GIT_TAG b/projects/kubernetes-sigs/kind/GIT_TAG index 1847373e96..759e855fb6 100644 --- a/projects/kubernetes-sigs/kind/GIT_TAG +++ b/projects/kubernetes-sigs/kind/GIT_TAG @@ -1 +1 @@ -v0.20.0 +v0.21.0 diff --git a/projects/kubernetes-sigs/kind/KINDNETD_ATTRIBUTION.txt b/projects/kubernetes-sigs/kind/KINDNETD_ATTRIBUTION.txt index bf7e38bb94..5c459bccb8 100644 --- a/projects/kubernetes-sigs/kind/KINDNETD_ATTRIBUTION.txt +++ b/projects/kubernetes-sigs/kind/KINDNETD_ATTRIBUTION.txt @@ -35,13 +35,13 @@ https://github.com/vishvananda/netns ** gopkg.in/yaml.v2; version v2.4.0 -- https://gopkg.in/yaml.v2 -** k8s.io/api; version v0.26.1 -- +** k8s.io/api; version v0.26.4 -- https://github.com/kubernetes/api -** k8s.io/apimachinery/pkg; version v0.26.1 -- +** k8s.io/apimachinery/pkg; version v0.26.4 -- https://github.com/kubernetes/apimachinery -** k8s.io/client-go; version v0.26.1 -- +** k8s.io/client-go; version v0.26.4 -- https://github.com/kubernetes/client-go ** k8s.io/klog/v2; version v2.90.1 -- @@ -59,7 +59,7 @@ https://github.com/kubernetes/utils ** sigs.k8s.io/json; version v0.0.0-20220713155537-f223a00ba0e2 -- https://github.com/kubernetes-sigs/json -** sigs.k8s.io/kind/images/kindnetd/cmd/kindnetd; version v0.20.0 -- +** sigs.k8s.io/kind/images/kindnetd/cmd/kindnetd; version v0.21.0 -- https://github.com/kubernetes-sigs/kind ** sigs.k8s.io/structured-merge-diff/v4; version v4.2.3 -- @@ -442,25 +442,25 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ** golang.org/go; version go1.20.13 -- https://github.com/golang/go -** golang.org/x/net; version v0.3.1-0.20221206200815-1e63c2f08a10 -- +** golang.org/x/net; version v0.7.0 -- https://golang.org/x/net ** golang.org/x/oauth2; version v0.0.0-20220223155221-ee480838109b -- https://golang.org/x/oauth2 -** golang.org/x/sys/unix; version v0.3.0 -- +** golang.org/x/sys/unix; version v0.5.0 -- https://golang.org/x/sys -** golang.org/x/term; version v0.3.0 -- +** golang.org/x/term; version v0.5.0 -- https://golang.org/x/term -** golang.org/x/text; version v0.5.0 -- +** golang.org/x/text; version v0.7.0 -- https://golang.org/x/text ** golang.org/x/time/rate; version v0.0.0-20220210224613-90d013bbcef8 -- https://golang.org/x/time -** k8s.io/apimachinery/third_party/forked/golang/reflect; version v0.26.1 -- +** k8s.io/apimachinery/third_party/forked/golang/reflect; version v0.26.4 -- https://github.com/kubernetes/apimachinery Copyright (c) 2009 The Go Authors. All rights reserved. diff --git a/projects/kubernetes-sigs/kind/README.md b/projects/kubernetes-sigs/kind/README.md index bd516e1d76..8b35b0c618 100644 --- a/projects/kubernetes-sigs/kind/README.md +++ b/projects/kubernetes-sigs/kind/README.md @@ -1,5 +1,5 @@ ## **Kind** -![Version](https://img.shields.io/badge/version-v0.20.0-blue) +![Version](https://img.shields.io/badge/version-v0.21.0-blue) ![Build Status](https://codebuild.us-west-2.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiVkgvQm93WHUvUWJ1U2ZhSG9JTUJNMFdjdGtwSkIyRCt1azM0THYxcWYweC8rM2lHRmNYMXI0QkVPUm4yZ0JZZ1c4RzdMeTJ3dGtpREdYeFpvTEhtc2FnPSIsIml2UGFyYW1ldGVyU3BlYyI6Im9GV2EzRGZQNVZ5c25kTmoiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=main) [Kind](https://github.com/kubernetes-sigs/kind) is a tool for running local Kubernetes clusters using Docker container "nodes". kind bootstraps each "node" with `kubeadm`. kind consists of: diff --git a/projects/kubernetes-sigs/kind/patches/0001-Switch-to-AL2-base-image-for-node-image.patch b/projects/kubernetes-sigs/kind/patches/0001-Switch-to-AL2-base-image-for-node-image.patch index 11639f07d8..05c8b57c2f 100644 --- a/projects/kubernetes-sigs/kind/patches/0001-Switch-to-AL2-base-image-for-node-image.patch +++ b/projects/kubernetes-sigs/kind/patches/0001-Switch-to-AL2-base-image-for-node-image.patch @@ -1,7 +1,7 @@ -From 0b9b7569f4fa524a14724e2ab604173252e829bd Mon Sep 17 00:00:00 2001 +From 7b87bf672a38c5e1cb15cf507bf13addf6f2ee5d Mon Sep 17 00:00:00 2001 From: Jackson West Date: Thu, 29 Jun 2023 00:56:53 -0700 -Subject: [PATCH 1/5] Switch to AL2 base image for node image +Subject: [PATCH] Switch to AL2 base image for node image --- images/base/Dockerfile | 215 +++++++----------- @@ -9,7 +9,7 @@ Subject: [PATCH 1/5] Switch to AL2 base image for node image 2 files changed, 83 insertions(+), 142 deletions(-) diff --git a/images/base/Dockerfile b/images/base/Dockerfile -index eb3f95ad..68e07d1e 100644 +index 58ea3e6f..de5e14a3 100644 --- a/images/base/Dockerfile +++ b/images/base/Dockerfile @@ -17,11 +17,19 @@ @@ -19,7 +19,7 @@ index eb3f95ad..68e07d1e 100644 -# start from debian slim, this image is reasonably small as a starting point -# for a kubernetes node image, it doesn't contain much (anything?) we don't need -# this stage will install basic files and packages --ARG BASE_IMAGE=debian:bullseye-slim +-ARG BASE_IMAGE=debian:bookworm-slim -FROM $BASE_IMAGE as base +# start from ubuntu, this image is reasonably small as a starting point +# for a kubernetes node image, it doesn't contain much we don't need @@ -37,7 +37,7 @@ index eb3f95ad..68e07d1e 100644 # copy in static files # all scripts are 0755 (rwx r-x r-x) -@@ -71,10 +79,11 @@ COPY --chmod=0644 files/etc/systemd/system/kubelet.service.d/* /etc/systemd/syst +@@ -72,10 +80,11 @@ COPY --chmod=0644 files/etc/systemd/system/kubelet.service.d/* /etc/systemd/syst RUN echo "Installing Packages ..." \ && DEBIAN_FRONTEND=noninteractive clean-install \ systemd \ @@ -52,7 +52,7 @@ index eb3f95ad..68e07d1e 100644 && find /lib/systemd/system/sysinit.target.wants/ -name "systemd-tmpfiles-setup.service" -delete \ && rm -f /lib/systemd/system/multi-user.target.wants/* \ && rm -f /etc/systemd/system/*.wants/* \ -@@ -83,7 +92,12 @@ RUN echo "Installing Packages ..." \ +@@ -84,7 +93,12 @@ RUN echo "Installing Packages ..." \ && rm -f /lib/systemd/system/sockets.target.wants/*initctl* \ && rm -f /lib/systemd/system/basic.target.wants/* \ && echo "ReadKMsg=no" >> /etc/systemd/journald.conf \ @@ -66,7 +66,7 @@ index eb3f95ad..68e07d1e 100644 RUN echo "Enabling services ... " \ && systemctl enable kubelet.service \ -@@ -93,138 +107,67 @@ RUN echo "Enabling services ... " \ +@@ -94,138 +108,67 @@ RUN echo "Enabling services ... " \ RUN echo "Ensuring /etc/kubernetes/manifests" \ && mkdir -p /etc/kubernetes/manifests @@ -94,7 +94,7 @@ index eb3f95ad..68e07d1e 100644 -# stage for building containerd -FROM go-build as build-containerd -ARG TARGETARCH GO_VERSION --ARG CONTAINERD_VERSION="v1.7.1" +-ARG CONTAINERD_VERSION="v1.7.13" -ARG CONTAINERD_CLONE_URL="https://github.com/containerd/containerd" -# we don't build with optional snapshotters, we never select any of these -# they're not ideal inside kind anyhow, and we save some disk space @@ -111,7 +111,7 @@ index eb3f95ad..68e07d1e 100644 -# stage for building runc -FROM go-build as build-runc -ARG TARGETARCH GO_VERSION --ARG RUNC_VERSION="v1.1.7" +-ARG RUNC_VERSION="v1.1.12" -ARG RUNC_CLONE_URL="https://github.com/opencontainers/runc" -RUN git clone --filter=tree:0 "${RUNC_CLONE_URL}" /runc \ - && cd /runc \ @@ -125,7 +125,7 @@ index eb3f95ad..68e07d1e 100644 -FROM go-build as build-crictl -ARG TARGETARCH GO_VERSION -ARG CRI_TOOLS_CLONE_URL="https://github.com/kubernetes-sigs/cri-tools" --ARG CRICTL_VERSION="v1.27.0" +-ARG CRICTL_VERSION="v1.28.0" -RUN git clone --filter=tree:0 "${CRI_TOOLS_CLONE_URL}" /cri-tools \ - && cd /cri-tools \ - && git checkout "${CRICTL_VERSION}" \ @@ -157,7 +157,7 @@ index eb3f95ad..68e07d1e 100644 -# stage for building containerd-fuse-overlayfs -FROM go-build as build-fuse-overlayfs -ARG TARGETARCH GO_VERSION --ARG CONTAINERD_FUSE_OVERLAYFS_VERSION="v1.0.5" +-ARG CONTAINERD_FUSE_OVERLAYFS_VERSION="v1.0.6" -ARG CONTAINERD_FUSE_OVERLAYFS_CLONE_URL="https://github.com/containerd/fuse-overlayfs-snapshotter" -RUN git clone --filter=tree:0 "${CONTAINERD_FUSE_OVERLAYFS_CLONE_URL}" /fuse-overlayfs-snapshotter \ - && cd /fuse-overlayfs-snapshotter \ @@ -288,5 +288,5 @@ index b0b861c3..f1d714a6 100755 - /usr/share/local/* + /usr/share/local/* || true -- -2.34.1 +2.39.3 (Apple Git-145)