mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-14 14:23:37 +00:00
Merge pull request #125366 from cpanato/update-go-130
[release-1.30] [go] Bump images, dependencies and versions to go 1.22.4 and distroless iptables/setcap/debian-base
This commit is contained in:
commit
60f96f5818
@ -1 +1 @@
|
|||||||
1.22.3
|
1.22.4
|
@ -1 +1 @@
|
|||||||
v1.30.0-go1.22.3-bullseye.0
|
v1.30.0-go1.22.4-bullseye.0
|
||||||
|
@ -97,9 +97,9 @@ readonly KUBE_RSYNC_PORT="${KUBE_RSYNC_PORT:-}"
|
|||||||
readonly KUBE_CONTAINER_RSYNC_PORT=8730
|
readonly KUBE_CONTAINER_RSYNC_PORT=8730
|
||||||
|
|
||||||
# These are the default versions (image tags) for their respective base images.
|
# These are the default versions (image tags) for their respective base images.
|
||||||
readonly __default_distroless_iptables_version=v0.5.4
|
readonly __default_distroless_iptables_version=v0.5.5
|
||||||
readonly __default_go_runner_version=v2.3.1-go1.22.3-bookworm.0
|
readonly __default_go_runner_version=v2.3.1-go1.22.4-bookworm.0
|
||||||
readonly __default_setcap_version=bookworm-v1.0.2
|
readonly __default_setcap_version=bookworm-v1.0.3
|
||||||
|
|
||||||
# These are the base images for the Docker-wrapped binaries.
|
# These are the base images for the Docker-wrapped binaries.
|
||||||
readonly KUBE_GORUNNER_IMAGE="${KUBE_GORUNNER_IMAGE:-$KUBE_BASE_IMAGE_REGISTRY/go-runner:$__default_go_runner_version}"
|
readonly KUBE_GORUNNER_IMAGE="${KUBE_GORUNNER_IMAGE:-$KUBE_BASE_IMAGE_REGISTRY/go-runner:$__default_go_runner_version}"
|
||||||
|
@ -116,7 +116,7 @@ dependencies:
|
|||||||
|
|
||||||
# Golang
|
# Golang
|
||||||
- name: "golang: upstream version"
|
- name: "golang: upstream version"
|
||||||
version: 1.22.3
|
version: 1.22.4
|
||||||
refPaths:
|
refPaths:
|
||||||
- path: .go-version
|
- path: .go-version
|
||||||
- path: build/build-image/cross/VERSION
|
- path: build/build-image/cross/VERSION
|
||||||
@ -138,13 +138,13 @@ dependencies:
|
|||||||
match: minimum_go_version=go([0-9]+\.[0-9]+)
|
match: minimum_go_version=go([0-9]+\.[0-9]+)
|
||||||
|
|
||||||
- name: "registry.k8s.io/kube-cross: dependents"
|
- name: "registry.k8s.io/kube-cross: dependents"
|
||||||
version: v1.30.0-go1.22.3-bullseye.0
|
version: v1.30.0-go1.22.4-bullseye.0
|
||||||
refPaths:
|
refPaths:
|
||||||
- path: build/build-image/cross/VERSION
|
- path: build/build-image/cross/VERSION
|
||||||
|
|
||||||
# Base images
|
# Base images
|
||||||
- name: "registry.k8s.io/debian-base: dependents"
|
- name: "registry.k8s.io/debian-base: dependents"
|
||||||
version: bookworm-v1.0.2
|
version: bookworm-v1.0.3
|
||||||
refPaths:
|
refPaths:
|
||||||
- path: cluster/images/etcd/Makefile
|
- path: cluster/images/etcd/Makefile
|
||||||
match: BASEIMAGE\?\=registry\.k8s\.io\/build-image\/debian-base:[a-zA-Z]+\-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
|
match: BASEIMAGE\?\=registry\.k8s\.io\/build-image\/debian-base:[a-zA-Z]+\-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
|
||||||
@ -176,7 +176,7 @@ dependencies:
|
|||||||
match: registry\.k8s\.io\/build-image\/debian-base:[a-zA-Z]+\-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
|
match: registry\.k8s\.io\/build-image\/debian-base:[a-zA-Z]+\-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
|
||||||
|
|
||||||
- name: "registry.k8s.io/distroless-iptables: dependents"
|
- name: "registry.k8s.io/distroless-iptables: dependents"
|
||||||
version: v0.5.4
|
version: v0.5.5
|
||||||
refPaths:
|
refPaths:
|
||||||
- path: build/common.sh
|
- path: build/common.sh
|
||||||
match: __default_distroless_iptables_version=
|
match: __default_distroless_iptables_version=
|
||||||
@ -184,7 +184,7 @@ dependencies:
|
|||||||
match: configs\[DistrolessIptables\] = Config{list\.BuildImageRegistry, "distroless-iptables", "v([0-9]+)\.([0-9]+)\.([0-9]+)"}
|
match: configs\[DistrolessIptables\] = Config{list\.BuildImageRegistry, "distroless-iptables", "v([0-9]+)\.([0-9]+)\.([0-9]+)"}
|
||||||
|
|
||||||
- name: "registry.k8s.io/go-runner: dependents"
|
- name: "registry.k8s.io/go-runner: dependents"
|
||||||
version: v2.3.1-go1.22.3-bookworm.0
|
version: v2.3.1-go1.22.4-bookworm.0
|
||||||
refPaths:
|
refPaths:
|
||||||
- path: build/common.sh
|
- path: build/common.sh
|
||||||
match: __default_go_runner_version=
|
match: __default_go_runner_version=
|
||||||
@ -252,7 +252,7 @@ dependencies:
|
|||||||
match: configs\[Pause\] = Config{list\.GcRegistry, "pause", "\d+\.\d+(.\d+)?"}
|
match: configs\[Pause\] = Config{list\.GcRegistry, "pause", "\d+\.\d+(.\d+)?"}
|
||||||
|
|
||||||
- name: "registry.k8s.io/build-image/setcap: dependents"
|
- name: "registry.k8s.io/build-image/setcap: dependents"
|
||||||
version: bookworm-v1.0.2
|
version: bookworm-v1.0.3
|
||||||
refPaths:
|
refPaths:
|
||||||
- path: build/common.sh
|
- path: build/common.sh
|
||||||
match: __default_setcap_version=
|
match: __default_setcap_version=
|
||||||
|
@ -3173,7 +3173,7 @@ spec:
|
|||||||
- name: vol
|
- name: vol
|
||||||
containers:
|
containers:
|
||||||
- name: pv-recycler
|
- name: pv-recycler
|
||||||
image: registry.k8s.io/build-image/debian-base:bookworm-v1.0.2
|
image: registry.k8s.io/build-image/debian-base:bookworm-v1.0.3
|
||||||
command:
|
command:
|
||||||
- /bin/sh
|
- /bin/sh
|
||||||
args:
|
args:
|
||||||
|
@ -92,19 +92,19 @@ DOCKERFILE.windows = Dockerfile.windows
|
|||||||
DOCKERFILE := ${DOCKERFILE.${OS}}
|
DOCKERFILE := ${DOCKERFILE.${OS}}
|
||||||
|
|
||||||
ifeq ($(ARCH),amd64)
|
ifeq ($(ARCH),amd64)
|
||||||
BASEIMAGE?=registry.k8s.io/build-image/debian-base:bookworm-v1.0.2
|
BASEIMAGE?=registry.k8s.io/build-image/debian-base:bookworm-v1.0.3
|
||||||
endif
|
endif
|
||||||
ifeq ($(ARCH),arm)
|
ifeq ($(ARCH),arm)
|
||||||
BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.2
|
BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.3
|
||||||
endif
|
endif
|
||||||
ifeq ($(ARCH),arm64)
|
ifeq ($(ARCH),arm64)
|
||||||
BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.2
|
BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.3
|
||||||
endif
|
endif
|
||||||
ifeq ($(ARCH),ppc64le)
|
ifeq ($(ARCH),ppc64le)
|
||||||
BASEIMAGE?=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.2
|
BASEIMAGE?=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.3
|
||||||
endif
|
endif
|
||||||
ifeq ($(ARCH),s390x)
|
ifeq ($(ARCH),s390x)
|
||||||
BASEIMAGE?=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.2
|
BASEIMAGE?=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.3
|
||||||
endif
|
endif
|
||||||
|
|
||||||
BASE.windows = mcr.microsoft.com/windows/nanoserver
|
BASE.windows = mcr.microsoft.com/windows/nanoserver
|
||||||
|
@ -1064,7 +1064,7 @@ func NewPersistentVolumeRecyclerPodTemplate() *v1.Pod {
|
|||||||
Containers: []v1.Container{
|
Containers: []v1.Container{
|
||||||
{
|
{
|
||||||
Name: "pv-recycler",
|
Name: "pv-recycler",
|
||||||
Image: "registry.k8s.io/build-image/debian-base:bookworm-v1.0.2",
|
Image: "registry.k8s.io/build-image/debian-base:bookworm-v1.0.3",
|
||||||
Command: []string{"/bin/sh"},
|
Command: []string{"/bin/sh"},
|
||||||
Args: []string{"-c", "test -e /scrub && find /scrub -mindepth 1 -delete && test -z \"$(ls -A /scrub)\" || exit 1"},
|
Args: []string{"-c", "test -e /scrub && find /scrub -mindepth 1 -delete && test -z \"$(ls -A /scrub)\" || exit 1"},
|
||||||
VolumeMounts: []v1.VolumeMount{
|
VolumeMounts: []v1.VolumeMount{
|
||||||
|
@ -31,7 +31,7 @@ rules:
|
|||||||
dirs:
|
dirs:
|
||||||
- staging/src/k8s.io/apimachinery
|
- staging/src/k8s.io/apimachinery
|
||||||
- name: release-1.30
|
- name: release-1.30
|
||||||
go: 1.22.3
|
go: 1.22.4
|
||||||
source:
|
source:
|
||||||
branch: release-1.30
|
branch: release-1.30
|
||||||
dirs:
|
dirs:
|
||||||
@ -84,7 +84,7 @@ rules:
|
|||||||
dirs:
|
dirs:
|
||||||
- staging/src/k8s.io/api
|
- staging/src/k8s.io/api
|
||||||
- name: release-1.30
|
- name: release-1.30
|
||||||
go: 1.22.3
|
go: 1.22.4
|
||||||
dependencies:
|
dependencies:
|
||||||
- repository: apimachinery
|
- repository: apimachinery
|
||||||
branch: release-1.30
|
branch: release-1.30
|
||||||
@ -170,7 +170,7 @@ rules:
|
|||||||
go build -mod=mod ./...
|
go build -mod=mod ./...
|
||||||
go test -mod=mod ./...
|
go test -mod=mod ./...
|
||||||
- name: release-1.30
|
- name: release-1.30
|
||||||
go: 1.22.3
|
go: 1.22.4
|
||||||
dependencies:
|
dependencies:
|
||||||
- repository: apimachinery
|
- repository: apimachinery
|
||||||
branch: release-1.30
|
branch: release-1.30
|
||||||
@ -220,7 +220,7 @@ rules:
|
|||||||
dirs:
|
dirs:
|
||||||
- staging/src/k8s.io/code-generator
|
- staging/src/k8s.io/code-generator
|
||||||
- name: release-1.30
|
- name: release-1.30
|
||||||
go: 1.22.3
|
go: 1.22.4
|
||||||
dependencies:
|
dependencies:
|
||||||
- repository: apimachinery
|
- repository: apimachinery
|
||||||
branch: release-1.30
|
branch: release-1.30
|
||||||
@ -295,7 +295,7 @@ rules:
|
|||||||
dirs:
|
dirs:
|
||||||
- staging/src/k8s.io/component-base
|
- staging/src/k8s.io/component-base
|
||||||
- name: release-1.30
|
- name: release-1.30
|
||||||
go: 1.22.3
|
go: 1.22.4
|
||||||
dependencies:
|
dependencies:
|
||||||
- repository: apimachinery
|
- repository: apimachinery
|
||||||
branch: release-1.30
|
branch: release-1.30
|
||||||
@ -375,7 +375,7 @@ rules:
|
|||||||
dirs:
|
dirs:
|
||||||
- staging/src/k8s.io/component-helpers
|
- staging/src/k8s.io/component-helpers
|
||||||
- name: release-1.30
|
- name: release-1.30
|
||||||
go: 1.22.3
|
go: 1.22.4
|
||||||
dependencies:
|
dependencies:
|
||||||
- repository: apimachinery
|
- repository: apimachinery
|
||||||
branch: release-1.30
|
branch: release-1.30
|
||||||
@ -440,7 +440,7 @@ rules:
|
|||||||
dirs:
|
dirs:
|
||||||
- staging/src/k8s.io/kms
|
- staging/src/k8s.io/kms
|
||||||
- name: release-1.30
|
- name: release-1.30
|
||||||
go: 1.22.3
|
go: 1.22.4
|
||||||
dependencies:
|
dependencies:
|
||||||
- repository: apimachinery
|
- repository: apimachinery
|
||||||
branch: release-1.30
|
branch: release-1.30
|
||||||
@ -536,7 +536,7 @@ rules:
|
|||||||
dirs:
|
dirs:
|
||||||
- staging/src/k8s.io/apiserver
|
- staging/src/k8s.io/apiserver
|
||||||
- name: release-1.30
|
- name: release-1.30
|
||||||
go: 1.22.3
|
go: 1.22.4
|
||||||
dependencies:
|
dependencies:
|
||||||
- repository: apimachinery
|
- repository: apimachinery
|
||||||
branch: release-1.30
|
branch: release-1.30
|
||||||
@ -660,7 +660,7 @@ rules:
|
|||||||
dirs:
|
dirs:
|
||||||
- staging/src/k8s.io/kube-aggregator
|
- staging/src/k8s.io/kube-aggregator
|
||||||
- name: release-1.30
|
- name: release-1.30
|
||||||
go: 1.22.3
|
go: 1.22.4
|
||||||
dependencies:
|
dependencies:
|
||||||
- repository: apimachinery
|
- repository: apimachinery
|
||||||
branch: release-1.30
|
branch: release-1.30
|
||||||
@ -812,7 +812,7 @@ rules:
|
|||||||
# assumes GO111MODULE=on
|
# assumes GO111MODULE=on
|
||||||
go build -mod=mod .
|
go build -mod=mod .
|
||||||
- name: release-1.30
|
- name: release-1.30
|
||||||
go: 1.22.3
|
go: 1.22.4
|
||||||
dependencies:
|
dependencies:
|
||||||
- repository: apimachinery
|
- repository: apimachinery
|
||||||
branch: release-1.30
|
branch: release-1.30
|
||||||
@ -939,7 +939,7 @@ rules:
|
|||||||
# assumes GO111MODULE=on
|
# assumes GO111MODULE=on
|
||||||
go build -mod=mod .
|
go build -mod=mod .
|
||||||
- name: release-1.30
|
- name: release-1.30
|
||||||
go: 1.22.3
|
go: 1.22.4
|
||||||
dependencies:
|
dependencies:
|
||||||
- repository: apimachinery
|
- repository: apimachinery
|
||||||
branch: release-1.30
|
branch: release-1.30
|
||||||
@ -1075,7 +1075,7 @@ rules:
|
|||||||
required-packages:
|
required-packages:
|
||||||
- k8s.io/code-generator
|
- k8s.io/code-generator
|
||||||
- name: release-1.30
|
- name: release-1.30
|
||||||
go: 1.22.3
|
go: 1.22.4
|
||||||
dependencies:
|
dependencies:
|
||||||
- repository: apimachinery
|
- repository: apimachinery
|
||||||
branch: release-1.30
|
branch: release-1.30
|
||||||
@ -1174,7 +1174,7 @@ rules:
|
|||||||
dirs:
|
dirs:
|
||||||
- staging/src/k8s.io/metrics
|
- staging/src/k8s.io/metrics
|
||||||
- name: release-1.30
|
- name: release-1.30
|
||||||
go: 1.22.3
|
go: 1.22.4
|
||||||
dependencies:
|
dependencies:
|
||||||
- repository: apimachinery
|
- repository: apimachinery
|
||||||
branch: release-1.30
|
branch: release-1.30
|
||||||
@ -1256,7 +1256,7 @@ rules:
|
|||||||
dirs:
|
dirs:
|
||||||
- staging/src/k8s.io/cli-runtime
|
- staging/src/k8s.io/cli-runtime
|
||||||
- name: release-1.30
|
- name: release-1.30
|
||||||
go: 1.22.3
|
go: 1.22.4
|
||||||
dependencies:
|
dependencies:
|
||||||
- repository: api
|
- repository: api
|
||||||
branch: release-1.30
|
branch: release-1.30
|
||||||
@ -1346,7 +1346,7 @@ rules:
|
|||||||
dirs:
|
dirs:
|
||||||
- staging/src/k8s.io/sample-cli-plugin
|
- staging/src/k8s.io/sample-cli-plugin
|
||||||
- name: release-1.30
|
- name: release-1.30
|
||||||
go: 1.22.3
|
go: 1.22.4
|
||||||
dependencies:
|
dependencies:
|
||||||
- repository: api
|
- repository: api
|
||||||
branch: release-1.30
|
branch: release-1.30
|
||||||
@ -1437,7 +1437,7 @@ rules:
|
|||||||
dirs:
|
dirs:
|
||||||
- staging/src/k8s.io/kube-proxy
|
- staging/src/k8s.io/kube-proxy
|
||||||
- name: release-1.30
|
- name: release-1.30
|
||||||
go: 1.22.3
|
go: 1.22.4
|
||||||
dependencies:
|
dependencies:
|
||||||
- repository: apimachinery
|
- repository: apimachinery
|
||||||
branch: release-1.30
|
branch: release-1.30
|
||||||
@ -1484,7 +1484,7 @@ rules:
|
|||||||
dirs:
|
dirs:
|
||||||
- staging/src/k8s.io/cri-api
|
- staging/src/k8s.io/cri-api
|
||||||
- name: release-1.30
|
- name: release-1.30
|
||||||
go: 1.22.3
|
go: 1.22.4
|
||||||
source:
|
source:
|
||||||
branch: release-1.30
|
branch: release-1.30
|
||||||
dirs:
|
dirs:
|
||||||
@ -1585,7 +1585,7 @@ rules:
|
|||||||
dirs:
|
dirs:
|
||||||
- staging/src/k8s.io/kubelet
|
- staging/src/k8s.io/kubelet
|
||||||
- name: release-1.30
|
- name: release-1.30
|
||||||
go: 1.22.3
|
go: 1.22.4
|
||||||
dependencies:
|
dependencies:
|
||||||
- repository: apimachinery
|
- repository: apimachinery
|
||||||
branch: release-1.30
|
branch: release-1.30
|
||||||
@ -1683,7 +1683,7 @@ rules:
|
|||||||
dirs:
|
dirs:
|
||||||
- staging/src/k8s.io/kube-scheduler
|
- staging/src/k8s.io/kube-scheduler
|
||||||
- name: release-1.30
|
- name: release-1.30
|
||||||
go: 1.22.3
|
go: 1.22.4
|
||||||
dependencies:
|
dependencies:
|
||||||
- repository: apimachinery
|
- repository: apimachinery
|
||||||
branch: release-1.30
|
branch: release-1.30
|
||||||
@ -1795,7 +1795,7 @@ rules:
|
|||||||
dirs:
|
dirs:
|
||||||
- staging/src/k8s.io/controller-manager
|
- staging/src/k8s.io/controller-manager
|
||||||
- name: release-1.30
|
- name: release-1.30
|
||||||
go: 1.22.3
|
go: 1.22.4
|
||||||
dependencies:
|
dependencies:
|
||||||
- repository: api
|
- repository: api
|
||||||
branch: release-1.30
|
branch: release-1.30
|
||||||
@ -1931,7 +1931,7 @@ rules:
|
|||||||
dirs:
|
dirs:
|
||||||
- staging/src/k8s.io/cloud-provider
|
- staging/src/k8s.io/cloud-provider
|
||||||
- name: release-1.30
|
- name: release-1.30
|
||||||
go: 1.22.3
|
go: 1.22.4
|
||||||
dependencies:
|
dependencies:
|
||||||
- repository: api
|
- repository: api
|
||||||
branch: release-1.30
|
branch: release-1.30
|
||||||
@ -2081,7 +2081,7 @@ rules:
|
|||||||
dirs:
|
dirs:
|
||||||
- staging/src/k8s.io/kube-controller-manager
|
- staging/src/k8s.io/kube-controller-manager
|
||||||
- name: release-1.30
|
- name: release-1.30
|
||||||
go: 1.22.3
|
go: 1.22.4
|
||||||
dependencies:
|
dependencies:
|
||||||
- repository: apimachinery
|
- repository: apimachinery
|
||||||
branch: release-1.30
|
branch: release-1.30
|
||||||
@ -2163,7 +2163,7 @@ rules:
|
|||||||
dirs:
|
dirs:
|
||||||
- staging/src/k8s.io/cluster-bootstrap
|
- staging/src/k8s.io/cluster-bootstrap
|
||||||
- name: release-1.30
|
- name: release-1.30
|
||||||
go: 1.22.3
|
go: 1.22.4
|
||||||
dependencies:
|
dependencies:
|
||||||
- repository: apimachinery
|
- repository: apimachinery
|
||||||
branch: release-1.30
|
branch: release-1.30
|
||||||
@ -2231,7 +2231,7 @@ rules:
|
|||||||
dirs:
|
dirs:
|
||||||
- staging/src/k8s.io/csi-translation-lib
|
- staging/src/k8s.io/csi-translation-lib
|
||||||
- name: release-1.30
|
- name: release-1.30
|
||||||
go: 1.22.3
|
go: 1.22.4
|
||||||
dependencies:
|
dependencies:
|
||||||
- repository: api
|
- repository: api
|
||||||
branch: release-1.30
|
branch: release-1.30
|
||||||
@ -2274,7 +2274,7 @@ rules:
|
|||||||
dirs:
|
dirs:
|
||||||
- staging/src/k8s.io/mount-utils
|
- staging/src/k8s.io/mount-utils
|
||||||
- name: release-1.30
|
- name: release-1.30
|
||||||
go: 1.22.3
|
go: 1.22.4
|
||||||
source:
|
source:
|
||||||
branch: release-1.30
|
branch: release-1.30
|
||||||
dirs:
|
dirs:
|
||||||
@ -2411,7 +2411,7 @@ rules:
|
|||||||
dirs:
|
dirs:
|
||||||
- staging/src/k8s.io/legacy-cloud-providers
|
- staging/src/k8s.io/legacy-cloud-providers
|
||||||
- name: release-1.30
|
- name: release-1.30
|
||||||
go: 1.22.3
|
go: 1.22.4
|
||||||
dependencies:
|
dependencies:
|
||||||
- repository: api
|
- repository: api
|
||||||
branch: release-1.30
|
branch: release-1.30
|
||||||
@ -2553,7 +2553,7 @@ rules:
|
|||||||
dirs:
|
dirs:
|
||||||
- staging/src/k8s.io/kubectl
|
- staging/src/k8s.io/kubectl
|
||||||
- name: release-1.30
|
- name: release-1.30
|
||||||
go: 1.22.3
|
go: 1.22.4
|
||||||
dependencies:
|
dependencies:
|
||||||
- repository: api
|
- repository: api
|
||||||
branch: release-1.30
|
branch: release-1.30
|
||||||
@ -2673,7 +2673,7 @@ rules:
|
|||||||
dirs:
|
dirs:
|
||||||
- staging/src/k8s.io/pod-security-admission
|
- staging/src/k8s.io/pod-security-admission
|
||||||
- name: release-1.30
|
- name: release-1.30
|
||||||
go: 1.22.3
|
go: 1.22.4
|
||||||
dependencies:
|
dependencies:
|
||||||
- repository: api
|
- repository: api
|
||||||
branch: release-1.30
|
branch: release-1.30
|
||||||
@ -2793,7 +2793,7 @@ rules:
|
|||||||
dirs:
|
dirs:
|
||||||
- staging/src/k8s.io/dynamic-resource-allocation
|
- staging/src/k8s.io/dynamic-resource-allocation
|
||||||
- name: release-1.30
|
- name: release-1.30
|
||||||
go: 1.22.3
|
go: 1.22.4
|
||||||
dependencies:
|
dependencies:
|
||||||
- repository: apimachinery
|
- repository: apimachinery
|
||||||
branch: release-1.30
|
branch: release-1.30
|
||||||
@ -2862,7 +2862,7 @@ rules:
|
|||||||
dirs:
|
dirs:
|
||||||
- staging/src/k8s.io/endpointslice
|
- staging/src/k8s.io/endpointslice
|
||||||
- name: release-1.30
|
- name: release-1.30
|
||||||
go: 1.22.3
|
go: 1.22.4
|
||||||
dependencies:
|
dependencies:
|
||||||
- repository: api
|
- repository: api
|
||||||
branch: release-1.30
|
branch: release-1.30
|
||||||
@ -2878,4 +2878,4 @@ rules:
|
|||||||
- staging/src/k8s.io/endpointslice
|
- staging/src/k8s.io/endpointslice
|
||||||
recursive-delete-patterns:
|
recursive-delete-patterns:
|
||||||
- '*/.gitattributes'
|
- '*/.gitattributes'
|
||||||
default-go-version: 1.22.3
|
default-go-version: 1.22.4
|
||||||
|
@ -33,7 +33,7 @@ CLUSTER_DIR?=$(shell pwd)/../../../cluster/
|
|||||||
|
|
||||||
# This is defined in root Makefile, but some build contexts do not refer to them
|
# This is defined in root Makefile, but some build contexts do not refer to them
|
||||||
KUBE_BASE_IMAGE_REGISTRY?=registry.k8s.io
|
KUBE_BASE_IMAGE_REGISTRY?=registry.k8s.io
|
||||||
BASE_IMAGE_VERSION?=bookworm-v1.0.2
|
BASE_IMAGE_VERSION?=bookworm-v1.0.3
|
||||||
RUNNERIMAGE?=${KUBE_BASE_IMAGE_REGISTRY}/build-image/debian-base-${ARCH}:${BASE_IMAGE_VERSION}
|
RUNNERIMAGE?=${KUBE_BASE_IMAGE_REGISTRY}/build-image/debian-base-${ARCH}:${BASE_IMAGE_VERSION}
|
||||||
|
|
||||||
TEMP_DIR:=$(shell mktemp -d -t conformance-XXXXXX)
|
TEMP_DIR:=$(shell mktemp -d -t conformance-XXXXXX)
|
||||||
|
@ -16,7 +16,7 @@ REGISTRY ?= registry.k8s.io/e2e-test-images
|
|||||||
GOARM ?= 7
|
GOARM ?= 7
|
||||||
DOCKER_CERT_BASE_PATH ?=
|
DOCKER_CERT_BASE_PATH ?=
|
||||||
QEMUVERSION=v5.1.0-2
|
QEMUVERSION=v5.1.0-2
|
||||||
GOLANG_VERSION=1.22.3
|
GOLANG_VERSION=1.22.4
|
||||||
export
|
export
|
||||||
|
|
||||||
ifndef WHAT
|
ifndef WHAT
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.2
|
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.3
|
||||||
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.2
|
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.3
|
||||||
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.2
|
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.3
|
||||||
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.2
|
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.3
|
||||||
linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.2
|
linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.3
|
||||||
windows/amd64/1809=mcr.microsoft.com/windows/nanoserver:1809
|
windows/amd64/1809=mcr.microsoft.com/windows/nanoserver:1809
|
||||||
windows/amd64/ltsc2022=mcr.microsoft.com/windows/nanoserver:ltsc2022
|
windows/amd64/ltsc2022=mcr.microsoft.com/windows/nanoserver:ltsc2022
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.2
|
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.3
|
||||||
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.2
|
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.3
|
||||||
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.2
|
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.3
|
||||||
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.2
|
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.3
|
||||||
linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.2
|
linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.3
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.2
|
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.3
|
||||||
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.2
|
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.3
|
||||||
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.2
|
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.3
|
||||||
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.2
|
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.3
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.2
|
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.3
|
||||||
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.2
|
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.3
|
||||||
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.2
|
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.3
|
||||||
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.2
|
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.3
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.2
|
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.3
|
||||||
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.2
|
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.3
|
||||||
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.2
|
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.3
|
||||||
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.2
|
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.3
|
||||||
linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.2
|
linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.3
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.2
|
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.3
|
||||||
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.2
|
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.3
|
||||||
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.2
|
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.3
|
||||||
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.2
|
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.3
|
||||||
linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.2
|
linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.3
|
||||||
windows/amd64/1809=mcr.microsoft.com/windows/nanoserver:1809
|
windows/amd64/1809=mcr.microsoft.com/windows/nanoserver:1809
|
||||||
windows/amd64/ltsc2022=mcr.microsoft.com/windows/nanoserver:ltsc2022
|
windows/amd64/ltsc2022=mcr.microsoft.com/windows/nanoserver:ltsc2022
|
||||||
|
@ -237,7 +237,7 @@ func initImageConfigs(list RegistryList) (map[ImageID]Config, map[ImageID]Config
|
|||||||
configs[BusyBox] = Config{list.PromoterE2eRegistry, "busybox", "1.36.1-1"}
|
configs[BusyBox] = Config{list.PromoterE2eRegistry, "busybox", "1.36.1-1"}
|
||||||
configs[CudaVectorAdd] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "1.0"}
|
configs[CudaVectorAdd] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "1.0"}
|
||||||
configs[CudaVectorAdd2] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "2.3"}
|
configs[CudaVectorAdd2] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "2.3"}
|
||||||
configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.5.4"}
|
configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.5.5"}
|
||||||
configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.5.12-0"}
|
configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.5.12-0"}
|
||||||
configs[Httpd] = Config{list.PromoterE2eRegistry, "httpd", "2.4.38-4"}
|
configs[Httpd] = Config{list.PromoterE2eRegistry, "httpd", "2.4.38-4"}
|
||||||
configs[HttpdNew] = Config{list.PromoterE2eRegistry, "httpd", "2.4.39-4"}
|
configs[HttpdNew] = Config{list.PromoterE2eRegistry, "httpd", "2.4.39-4"}
|
||||||
|
Loading…
Reference in New Issue
Block a user