Merge branch 'main' into dependabot/go_modules/k8s.io/client-go-0.32.1

hyperspike · Jan 16, 2025 · 88adda7 · 88adda7
2 parents a75dd1d + 61a0d47
commit 88adda7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Dockerfile.valkey b/Dockerfile.valkey
@@ -5,7 +5,7 @@ ARG VALKEY_VERSION=8.0.1
 WORKDIR /home/valkey
 
 RUN apk add --no-cache --virtual .build-deps \
-	git=2.47.1-r0 \
+	git=2.47.2-r0 \
 	coreutils=9.5-r2 \
 	linux-headers=6.6-r1 \
 	musl-dev=1.2.5-r8 \

diff --git a/Makefile b/Makefile
@@ -31,7 +31,7 @@ CONTAINER_TOOL ?= docker
 SHELL = /usr/bin/env bash -o pipefail
 .SHELLFLAGS = -ec
 
-K8S_VERSION ?= 1.32.0
+K8S_VERSION ?= 1.32.1
 ENVTEST_K8S_VERSION = $(K8S_VERSION)
 CILIUM_VERSION ?= 1.16.5
 VALKEY_VERSION ?= 8.0.2