mirror of
https://github.com/kubernetes/kubernetes.git
synced 2026-05-28 04:04:39 -04:00
Merge pull request #124199 from cpanato/update-go-1.27
[release-1.27] [go] Bump images, dependencies and versions to go 1.21.9 and distroless iptables
This commit is contained in:
commit
8be2458691
7 changed files with 40 additions and 40 deletions
|
|
@ -1 +1 @@
|
|||
1.21.8
|
||||
1.21.9
|
||||
|
|
@ -1 +1 @@
|
|||
v1.27.0-go1.21.8-bullseye.0
|
||||
v1.27.0-go1.21.9-bullseye.0
|
||||
|
|
|
|||
|
|
@ -95,8 +95,8 @@ readonly KUBE_RSYNC_PORT="${KUBE_RSYNC_PORT:-}"
|
|||
readonly KUBE_CONTAINER_RSYNC_PORT=8730
|
||||
|
||||
# These are the default versions (image tags) for their respective base images.
|
||||
readonly __default_distroless_iptables_version=v0.4.6
|
||||
readonly __default_go_runner_version=v2.3.1-go1.21.8-bullseye.0
|
||||
readonly __default_distroless_iptables_version=v0.4.7
|
||||
readonly __default_go_runner_version=v2.3.1-go1.21.9-bullseye.0
|
||||
readonly __default_setcap_version=bullseye-v1.4.2
|
||||
|
||||
# These are the base images for the Docker-wrapped binaries.
|
||||
|
|
|
|||
|
|
@ -95,7 +95,7 @@ dependencies:
|
|||
|
||||
# Golang
|
||||
- name: "golang: upstream version"
|
||||
version: 1.21.8
|
||||
version: 1.21.9
|
||||
refPaths:
|
||||
- path: .go-version
|
||||
- path: build/build-image/cross/VERSION
|
||||
|
|
@ -118,7 +118,7 @@ dependencies:
|
|||
# match: minimum_go_version=go([0-9]+\.[0-9]+)
|
||||
|
||||
- name: "registry.k8s.io/kube-cross: dependents"
|
||||
version: v1.27.0-go1.21.8-bullseye.0
|
||||
version: v1.27.0-go1.21.9-bullseye.0
|
||||
refPaths:
|
||||
- path: build/build-image/cross/VERSION
|
||||
|
||||
|
|
@ -140,7 +140,7 @@ dependencies:
|
|||
match: BASE_IMAGE_VERSION\?=
|
||||
|
||||
- name: "registry.k8s.io/distroless-iptables: dependents"
|
||||
version: v0.4.6
|
||||
version: v0.4.7
|
||||
refPaths:
|
||||
- path: build/common.sh
|
||||
match: __default_distroless_iptables_version=
|
||||
|
|
@ -148,7 +148,7 @@ dependencies:
|
|||
match: configs\[DistrolessIptables\] = Config{list\.BuildImageRegistry, "distroless-iptables", "v([0-9]+)\.([0-9]+)\.([0-9]+)"}
|
||||
|
||||
- name: "registry.k8s.io/go-runner: dependents"
|
||||
version: v2.3.1-go1.21.8-bullseye.0
|
||||
version: v2.3.1-go1.21.9-bullseye.0
|
||||
refPaths:
|
||||
- path: build/common.sh
|
||||
match: __default_go_runner_version=
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ rules:
|
|||
branch: release-1.26
|
||||
dir: staging/src/k8s.io/code-generator
|
||||
- name: release-1.27
|
||||
go: 1.21.8
|
||||
go: 1.21.9
|
||||
source:
|
||||
branch: release-1.27
|
||||
dir: staging/src/k8s.io/code-generator
|
||||
|
|
@ -47,7 +47,7 @@ rules:
|
|||
branch: release-1.26
|
||||
dir: staging/src/k8s.io/apimachinery
|
||||
- name: release-1.27
|
||||
go: 1.21.8
|
||||
go: 1.21.9
|
||||
source:
|
||||
branch: release-1.27
|
||||
dir: staging/src/k8s.io/apimachinery
|
||||
|
|
@ -86,7 +86,7 @@ rules:
|
|||
branch: release-1.26
|
||||
dir: staging/src/k8s.io/api
|
||||
- name: release-1.27
|
||||
go: 1.21.8
|
||||
go: 1.21.9
|
||||
dependencies:
|
||||
- repository: apimachinery
|
||||
branch: release-1.27
|
||||
|
|
@ -152,7 +152,7 @@ rules:
|
|||
go build -mod=mod ./...
|
||||
go test -mod=mod ./...
|
||||
- name: release-1.27
|
||||
go: 1.21.8
|
||||
go: 1.21.9
|
||||
dependencies:
|
||||
- repository: apimachinery
|
||||
branch: release-1.27
|
||||
|
|
@ -216,7 +216,7 @@ rules:
|
|||
branch: release-1.26
|
||||
dir: staging/src/k8s.io/component-base
|
||||
- name: release-1.27
|
||||
go: 1.21.8
|
||||
go: 1.21.9
|
||||
dependencies:
|
||||
- repository: apimachinery
|
||||
branch: release-1.27
|
||||
|
|
@ -278,7 +278,7 @@ rules:
|
|||
branch: release-1.26
|
||||
dir: staging/src/k8s.io/component-helpers
|
||||
- name: release-1.27
|
||||
go: 1.21.8
|
||||
go: 1.21.9
|
||||
dependencies:
|
||||
- repository: apimachinery
|
||||
branch: release-1.27
|
||||
|
|
@ -309,7 +309,7 @@ rules:
|
|||
branch: release-1.26
|
||||
dir: staging/src/k8s.io/kms
|
||||
- name: release-1.27
|
||||
go: 1.21.8
|
||||
go: 1.21.9
|
||||
dependencies:
|
||||
- repository: apimachinery
|
||||
branch: release-1.27
|
||||
|
|
@ -383,7 +383,7 @@ rules:
|
|||
branch: release-1.26
|
||||
dir: staging/src/k8s.io/apiserver
|
||||
- name: release-1.27
|
||||
go: 1.21.8
|
||||
go: 1.21.9
|
||||
dependencies:
|
||||
- repository: apimachinery
|
||||
branch: release-1.27
|
||||
|
|
@ -477,7 +477,7 @@ rules:
|
|||
branch: release-1.26
|
||||
dir: staging/src/k8s.io/kube-aggregator
|
||||
- name: release-1.27
|
||||
go: 1.21.8
|
||||
go: 1.21.9
|
||||
dependencies:
|
||||
- repository: apimachinery
|
||||
branch: release-1.27
|
||||
|
|
@ -594,7 +594,7 @@ rules:
|
|||
# assumes GO111MODULE=on
|
||||
go build -mod=mod .
|
||||
- name: release-1.27
|
||||
go: 1.21.8
|
||||
go: 1.21.9
|
||||
dependencies:
|
||||
- repository: apimachinery
|
||||
branch: release-1.27
|
||||
|
|
@ -696,7 +696,7 @@ rules:
|
|||
# assumes GO111MODULE=on
|
||||
go build -mod=mod .
|
||||
- name: release-1.27
|
||||
go: 1.21.8
|
||||
go: 1.21.9
|
||||
dependencies:
|
||||
- repository: apimachinery
|
||||
branch: release-1.27
|
||||
|
|
@ -800,7 +800,7 @@ rules:
|
|||
required-packages:
|
||||
- k8s.io/code-generator
|
||||
- name: release-1.27
|
||||
go: 1.21.8
|
||||
go: 1.21.9
|
||||
dependencies:
|
||||
- repository: apimachinery
|
||||
branch: release-1.27
|
||||
|
|
@ -879,7 +879,7 @@ rules:
|
|||
branch: release-1.26
|
||||
dir: staging/src/k8s.io/metrics
|
||||
- name: release-1.27
|
||||
go: 1.21.8
|
||||
go: 1.21.9
|
||||
dependencies:
|
||||
- repository: apimachinery
|
||||
branch: release-1.27
|
||||
|
|
@ -943,7 +943,7 @@ rules:
|
|||
branch: release-1.26
|
||||
dir: staging/src/k8s.io/cli-runtime
|
||||
- name: release-1.27
|
||||
go: 1.21.8
|
||||
go: 1.21.9
|
||||
dependencies:
|
||||
- repository: api
|
||||
branch: release-1.27
|
||||
|
|
@ -1013,7 +1013,7 @@ rules:
|
|||
branch: release-1.26
|
||||
dir: staging/src/k8s.io/sample-cli-plugin
|
||||
- name: release-1.27
|
||||
go: 1.21.8
|
||||
go: 1.21.9
|
||||
dependencies:
|
||||
- repository: api
|
||||
branch: release-1.27
|
||||
|
|
@ -1084,7 +1084,7 @@ rules:
|
|||
branch: release-1.26
|
||||
dir: staging/src/k8s.io/kube-proxy
|
||||
- name: release-1.27
|
||||
go: 1.21.8
|
||||
go: 1.21.9
|
||||
dependencies:
|
||||
- repository: apimachinery
|
||||
branch: release-1.27
|
||||
|
|
@ -1156,7 +1156,7 @@ rules:
|
|||
branch: release-1.26
|
||||
dir: staging/src/k8s.io/kubelet
|
||||
- name: release-1.27
|
||||
go: 1.21.8
|
||||
go: 1.21.9
|
||||
dependencies:
|
||||
- repository: apimachinery
|
||||
branch: release-1.27
|
||||
|
|
@ -1228,7 +1228,7 @@ rules:
|
|||
branch: release-1.26
|
||||
dir: staging/src/k8s.io/kube-scheduler
|
||||
- name: release-1.27
|
||||
go: 1.21.8
|
||||
go: 1.21.9
|
||||
dependencies:
|
||||
- repository: apimachinery
|
||||
branch: release-1.27
|
||||
|
|
@ -1312,7 +1312,7 @@ rules:
|
|||
branch: release-1.26
|
||||
dir: staging/src/k8s.io/controller-manager
|
||||
- name: release-1.27
|
||||
go: 1.21.8
|
||||
go: 1.21.9
|
||||
dependencies:
|
||||
- repository: api
|
||||
branch: release-1.27
|
||||
|
|
@ -1416,7 +1416,7 @@ rules:
|
|||
branch: release-1.26
|
||||
dir: staging/src/k8s.io/cloud-provider
|
||||
- name: release-1.27
|
||||
go: 1.21.8
|
||||
go: 1.21.9
|
||||
dependencies:
|
||||
- repository: api
|
||||
branch: release-1.27
|
||||
|
|
@ -1532,7 +1532,7 @@ rules:
|
|||
branch: release-1.26
|
||||
dir: staging/src/k8s.io/kube-controller-manager
|
||||
- name: release-1.27
|
||||
go: 1.21.8
|
||||
go: 1.21.9
|
||||
dependencies:
|
||||
- repository: apimachinery
|
||||
branch: release-1.27
|
||||
|
|
@ -1598,7 +1598,7 @@ rules:
|
|||
branch: release-1.26
|
||||
dir: staging/src/k8s.io/cluster-bootstrap
|
||||
- name: release-1.27
|
||||
go: 1.21.8
|
||||
go: 1.21.9
|
||||
dependencies:
|
||||
- repository: apimachinery
|
||||
branch: release-1.27
|
||||
|
|
@ -1650,7 +1650,7 @@ rules:
|
|||
branch: release-1.26
|
||||
dir: staging/src/k8s.io/csi-translation-lib
|
||||
- name: release-1.27
|
||||
go: 1.21.8
|
||||
go: 1.21.9
|
||||
dependencies:
|
||||
- repository: api
|
||||
branch: release-1.27
|
||||
|
|
@ -1682,7 +1682,7 @@ rules:
|
|||
branch: release-1.26
|
||||
dir: staging/src/k8s.io/mount-utils
|
||||
- name: release-1.27
|
||||
go: 1.21.8
|
||||
go: 1.21.9
|
||||
source:
|
||||
branch: release-1.27
|
||||
dir: staging/src/k8s.io/mount-utils
|
||||
|
|
@ -1793,7 +1793,7 @@ rules:
|
|||
branch: release-1.26
|
||||
dir: staging/src/k8s.io/legacy-cloud-providers
|
||||
- name: release-1.27
|
||||
go: 1.21.8
|
||||
go: 1.21.9
|
||||
dependencies:
|
||||
- repository: api
|
||||
branch: release-1.27
|
||||
|
|
@ -1839,7 +1839,7 @@ rules:
|
|||
branch: release-1.26
|
||||
dir: staging/src/k8s.io/cri-api
|
||||
- name: release-1.27
|
||||
go: 1.21.8
|
||||
go: 1.21.9
|
||||
source:
|
||||
branch: release-1.27
|
||||
dir: staging/src/k8s.io/cri-api
|
||||
|
|
@ -1934,7 +1934,7 @@ rules:
|
|||
branch: release-1.26
|
||||
dir: staging/src/k8s.io/kubectl
|
||||
- name: release-1.27
|
||||
go: 1.21.8
|
||||
go: 1.21.9
|
||||
dependencies:
|
||||
- repository: api
|
||||
branch: release-1.27
|
||||
|
|
@ -2026,7 +2026,7 @@ rules:
|
|||
branch: release-1.26
|
||||
dir: staging/src/k8s.io/pod-security-admission
|
||||
- name: release-1.27
|
||||
go: 1.21.8
|
||||
go: 1.21.9
|
||||
dependencies:
|
||||
- repository: api
|
||||
branch: release-1.27
|
||||
|
|
@ -2078,7 +2078,7 @@ rules:
|
|||
branch: release-1.26
|
||||
dir: staging/src/k8s.io/dynamic-resource-allocation
|
||||
- name: release-1.27
|
||||
go: 1.21.8
|
||||
go: 1.21.9
|
||||
dependencies:
|
||||
- repository: apimachinery
|
||||
branch: release-1.27
|
||||
|
|
@ -2095,4 +2095,4 @@ rules:
|
|||
dir: staging/src/k8s.io/dynamic-resource-allocation
|
||||
recursive-delete-patterns:
|
||||
- '*/.gitattributes'
|
||||
default-go-version: 1.21.8
|
||||
default-go-version: 1.21.9
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ REGISTRY ?= registry.k8s.io/e2e-test-images
|
|||
GOARM ?= 7
|
||||
DOCKER_CERT_BASE_PATH ?=
|
||||
QEMUVERSION=v5.1.0-2
|
||||
GOLANG_VERSION=1.21.8
|
||||
GOLANG_VERSION=1.21.9
|
||||
export
|
||||
|
||||
ifndef WHAT
|
||||
|
|
|
|||
|
|
@ -245,7 +245,7 @@ func initImageConfigs(list RegistryList) (map[ImageID]Config, map[ImageID]Config
|
|||
configs[BusyBox] = Config{list.PromoterE2eRegistry, "busybox", "1.29-4"}
|
||||
configs[CudaVectorAdd] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "1.0"}
|
||||
configs[CudaVectorAdd2] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "2.2"}
|
||||
configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.4.6"}
|
||||
configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.4.7"}
|
||||
configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.5.12-0"}
|
||||
configs[GlusterDynamicProvisioner] = Config{list.PromoterE2eRegistry, "glusterdynamic-provisioner", "v1.3"}
|
||||
configs[Httpd] = Config{list.PromoterE2eRegistry, "httpd", "2.4.38-4"}
|
||||
|
|
|
|||
Loading…
Reference in a new issue