Merge branch 'master' into integration-dcoker-containerd

Author: medyagh

deploy/image/kubernetes-bootcamp/Dockerfile

@@ -0,0 +1,5 @@
+FROM node:slim
+RUN apt-get update && apt-get install curl -y
+EXPOSE 8080
+COPY server.js .
+CMD [ "node", "server.js" ]

deploy/image/kubernetes-bootcamp/server.js

@@ -0,0 +1,19 @@
+var http = require('http');
+var requests = 0;
+var podname = process.env.HOSTNAME;
+var startTime;
+var host;
+var handleRequest = function(request, response) {
+  response.setHeader('Content-Type', 'text/plain');
+  response.writeHead(200);
+  response.write('Hello Kubernetes bootcamp! | Hostname: ');
+  response.write(host);
+  response.end(' | v=2\n');
+  console.log('Hostname:', host, '| Total Requests:', ++requests, '| App Uptime:', (new Date() - startTime)/1000 , 'seconds', '| Log Time:', new Date());
+}
+var www = http.createServer(handleRequest);
+www.listen(8080, function () {
+    startTime = new Date();
+    host = process.env.HOSTNAME;
+    console.log('Kubernetes Bootcamp App Started At:', startTime, '| Running On:', host, '\n');
+});

deploy/kicbase/Dockerfile

@@ -19,7 +19,7 @@
 
 
 # this ARG needs to be global to use it in `FROM` & is updated for new versions of debian:bookworm-slim-*
-ARG KICBASE_IMAGE="debian:bookworm-20251020-slim"
+ARG KICBASE_IMAGE="debian:bookworm-20251117-slim"
 # multi-stage docker build so we can build auto-pause for arm64
 FROM golang:1.25.3 AS auto-pause
 WORKDIR /src

hack/kicbase_version/os-package-list.txt

@@ -16,7 +16,7 @@ ii  ca-certificates                 20230311+deb12u1               all
 ii  catatonit                       0.1.7-1+b2                     amd64        init process for containers
 ii  conmon                          2.1.6+ds1-1                    amd64        OCI container runtime monitor
 ii  conntrack                       1:1.4.7-1+b2                   amd64        Program to modify the conntrack tables
-ii  containerd.io                   2.1.5-1~debian.12~bookworm     amd64        An open and reliable container runtime
+ii  containerd.io                   2.2.0-2~debian.12~bookworm     amd64        An open and reliable container runtime
 ii  containernetworking-plugins     1.1.1+ds1-3+b5                 amd64        standard networking plugins - binaries
 ii  coreutils                       9.1-1                          amd64        GNU core utilities
 ii  cri-o                           1.34.2-1.1                     amd64        Open Container Initiative-based implementation of Kubernetes Container Runtime Interface

hack/prow/image/kubernetes-bootcamp/cloudbuild.yaml

@@ -0,0 +1,19 @@
+# See https://cloud.google.com/cloud-build/docs/build-config
+options:
+  substitution_option: ALLOW_LOOSE
+steps:
+- name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20250513-9264efb079
+  entrypoint: make
+  env:
+    - DOCKER_CLI_EXPERIMENTAL=enabled
+    - _GIT_TAG=$_GIT_TAG
+    - _PULL_BASE_REF=$_PULL_BASE_REF
+  args:
+    - push-kubernetes-bootcamp
+  substitutions:
+  # _GIT_TAG will be filled with a git-based tag for the image, of the form vYYYYMMDD-hash, and
+  # can be used as a substitution
+  _GIT_TAG: '12345'
+  # _PULL_BASE_REF will contain the ref that was pushed to to trigger this build -
+  # a branch like 'master' or 'release-0.2', or a tag like 'v0.2'.
+  _PULL_BASE_REF: 'master'

hack/prow/prow.mk

@@ -27,4 +27,12 @@ build-mini-test: # build minitest binary
 setup-prow-gcp-ssh-keys: # set up ssh keys for gcloud cli. These env vars are set by test/infra
 	mkdir -p -m 0700 ~/.ssh
 	cp -f "${GCE_SSH_PRIVATE_KEY_FILE}" ~/.ssh/google_compute_engine
-	cp -f "${GCE_SSH_PUBLIC_KEY_FILE}" ~/.ssh/google_compute_engine.pub
+	cp -f "${GCE_SSH_PUBLIC_KEY_FILE}" ~/.ssh/google_compute_engine.pub
+	
+.PHONY: push-kubernetes-bootcamp
+push-kubernetes-bootcamp:
+	docker run --rm --privileged tonistiigi/binfmt:latest --install all
+	docker buildx create --name multiarch --bootstrap
+	docker buildx build --builder multiarch --push --platform  linux/amd64,linux/arm64 \
+		-t us-central1-docker.pkg.dev/k8s-staging-images/minikube/kubernetes-bootcamp:$(_GIT_TAG) -t us-central1-docker.pkg.dev/k8s-staging-images/minikube/kubernetes-bootcamp:latest deploy/image/kubernetes-bootcamp
+	docker buildx rm multiarch

pkg/minikube/assets/addons.go

@@ -303,7 +303,7 @@ var Addons = map[string]*Addon{
 			"0640"),
 	}, false, "kong", "3rd party (Kong HQ)", "@gAmUssA", "https://minikube.sigs.k8s.io/docs/handbook/addons/kong-ingress/", map[string]string{
 		"Kong":        "kong:3.9.1@sha256:4379444ecfd82794b27de38a74ba540e8571683dfdfce74c8ecb4018f308fb29",
-		"KongIngress": "kong/kubernetes-ingress-controller:3.5.2@sha256:472012b0f7dca838f2b9cd8fcf6e6daeb2572631b37adb0dbb0770defeb89f04",
+		"KongIngress": "kong/kubernetes-ingress-controller:3.5.3@sha256:e5436a3ddc2896783b55a62c4e9214a851efd2d2d241e19a0f9bc229e4fed3fd",
 	}, map[string]string{
 		"Kong":        "docker.io",
 		"KongIngress": "docker.io",