Skip to content

Commit

Permalink
Merge pull request #123771 from cpanato/update-go-127
Browse files Browse the repository at this point in the history
[release-1.27] [go] Bump images, dependencies and versions to go 1.21.8 / distroless-iptables to v0.4.6
  • Loading branch information
k8s-ci-robot committed Mar 7, 2024
2 parents aa1ad8d + 702624b commit a3dd170
Show file tree
Hide file tree
Showing 7 changed files with 40 additions and 40 deletions.
2 changes: 1 addition & 1 deletion .go-version
@@ -1 +1 @@
1.21.7
1.21.8
2 changes: 1 addition & 1 deletion build/build-image/cross/VERSION
@@ -1 +1 @@
v1.27.0-go1.21.7-bullseye.0
v1.27.0-go1.21.8-bullseye.0
4 changes: 2 additions & 2 deletions build/common.sh
Expand Up @@ -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.5
readonly __default_go_runner_version=v2.3.1-go1.21.7-bullseye.0
readonly __default_distroless_iptables_version=v0.4.6
readonly __default_go_runner_version=v2.3.1-go1.21.8-bullseye.0
readonly __default_setcap_version=bullseye-v1.4.2

# These are the base images for the Docker-wrapped binaries.
Expand Down
8 changes: 4 additions & 4 deletions build/dependencies.yaml
Expand Up @@ -95,7 +95,7 @@ dependencies:

# Golang
- name: "golang: upstream version"
version: 1.21.7
version: 1.21.8
refPaths:
- path: .go-version
- path: build/build-image/cross/VERSION
Expand All @@ -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.7-bullseye.0
version: v1.27.0-go1.21.8-bullseye.0
refPaths:
- path: build/build-image/cross/VERSION

Expand All @@ -140,15 +140,15 @@ dependencies:
match: BASE_IMAGE_VERSION\?=

- name: "registry.k8s.io/distroless-iptables: dependents"
version: v0.4.5
version: v0.4.6
refPaths:
- path: build/common.sh
match: __default_distroless_iptables_version=
- path: test/utils/image/manifest.go
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.7-bullseye.0
version: v2.3.1-go1.21.8-bullseye.0
refPaths:
- path: build/common.sh
match: __default_go_runner_version=
Expand Down
60 changes: 30 additions & 30 deletions staging/publishing/rules.yaml
Expand Up @@ -21,7 +21,7 @@ rules:
branch: release-1.26
dir: staging/src/k8s.io/code-generator
- name: release-1.27
go: 1.21.7
go: 1.21.8
source:
branch: release-1.27
dir: staging/src/k8s.io/code-generator
Expand All @@ -47,7 +47,7 @@ rules:
branch: release-1.26
dir: staging/src/k8s.io/apimachinery
- name: release-1.27
go: 1.21.7
go: 1.21.8
source:
branch: release-1.27
dir: staging/src/k8s.io/apimachinery
Expand Down Expand Up @@ -86,7 +86,7 @@ rules:
branch: release-1.26
dir: staging/src/k8s.io/api
- name: release-1.27
go: 1.21.7
go: 1.21.8
dependencies:
- repository: apimachinery
branch: release-1.27
Expand Down Expand Up @@ -152,7 +152,7 @@ rules:
go build -mod=mod ./...
go test -mod=mod ./...
- name: release-1.27
go: 1.21.7
go: 1.21.8
dependencies:
- repository: apimachinery
branch: release-1.27
Expand Down Expand Up @@ -216,7 +216,7 @@ rules:
branch: release-1.26
dir: staging/src/k8s.io/component-base
- name: release-1.27
go: 1.21.7
go: 1.21.8
dependencies:
- repository: apimachinery
branch: release-1.27
Expand Down Expand Up @@ -278,7 +278,7 @@ rules:
branch: release-1.26
dir: staging/src/k8s.io/component-helpers
- name: release-1.27
go: 1.21.7
go: 1.21.8
dependencies:
- repository: apimachinery
branch: release-1.27
Expand Down Expand Up @@ -309,7 +309,7 @@ rules:
branch: release-1.26
dir: staging/src/k8s.io/kms
- name: release-1.27
go: 1.21.7
go: 1.21.8
dependencies:
- repository: apimachinery
branch: release-1.27
Expand Down Expand Up @@ -383,7 +383,7 @@ rules:
branch: release-1.26
dir: staging/src/k8s.io/apiserver
- name: release-1.27
go: 1.21.7
go: 1.21.8
dependencies:
- repository: apimachinery
branch: release-1.27
Expand Down Expand Up @@ -477,7 +477,7 @@ rules:
branch: release-1.26
dir: staging/src/k8s.io/kube-aggregator
- name: release-1.27
go: 1.21.7
go: 1.21.8
dependencies:
- repository: apimachinery
branch: release-1.27
Expand Down Expand Up @@ -594,7 +594,7 @@ rules:
# assumes GO111MODULE=on
go build -mod=mod .
- name: release-1.27
go: 1.21.7
go: 1.21.8
dependencies:
- repository: apimachinery
branch: release-1.27
Expand Down Expand Up @@ -696,7 +696,7 @@ rules:
# assumes GO111MODULE=on
go build -mod=mod .
- name: release-1.27
go: 1.21.7
go: 1.21.8
dependencies:
- repository: apimachinery
branch: release-1.27
Expand Down Expand Up @@ -800,7 +800,7 @@ rules:
required-packages:
- k8s.io/code-generator
- name: release-1.27
go: 1.21.7
go: 1.21.8
dependencies:
- repository: apimachinery
branch: release-1.27
Expand Down Expand Up @@ -879,7 +879,7 @@ rules:
branch: release-1.26
dir: staging/src/k8s.io/metrics
- name: release-1.27
go: 1.21.7
go: 1.21.8
dependencies:
- repository: apimachinery
branch: release-1.27
Expand Down Expand Up @@ -943,7 +943,7 @@ rules:
branch: release-1.26
dir: staging/src/k8s.io/cli-runtime
- name: release-1.27
go: 1.21.7
go: 1.21.8
dependencies:
- repository: api
branch: release-1.27
Expand Down Expand Up @@ -1013,7 +1013,7 @@ rules:
branch: release-1.26
dir: staging/src/k8s.io/sample-cli-plugin
- name: release-1.27
go: 1.21.7
go: 1.21.8
dependencies:
- repository: api
branch: release-1.27
Expand Down Expand Up @@ -1084,7 +1084,7 @@ rules:
branch: release-1.26
dir: staging/src/k8s.io/kube-proxy
- name: release-1.27
go: 1.21.7
go: 1.21.8
dependencies:
- repository: apimachinery
branch: release-1.27
Expand Down Expand Up @@ -1156,7 +1156,7 @@ rules:
branch: release-1.26
dir: staging/src/k8s.io/kubelet
- name: release-1.27
go: 1.21.7
go: 1.21.8
dependencies:
- repository: apimachinery
branch: release-1.27
Expand Down Expand Up @@ -1228,7 +1228,7 @@ rules:
branch: release-1.26
dir: staging/src/k8s.io/kube-scheduler
- name: release-1.27
go: 1.21.7
go: 1.21.8
dependencies:
- repository: apimachinery
branch: release-1.27
Expand Down Expand Up @@ -1312,7 +1312,7 @@ rules:
branch: release-1.26
dir: staging/src/k8s.io/controller-manager
- name: release-1.27
go: 1.21.7
go: 1.21.8
dependencies:
- repository: api
branch: release-1.27
Expand Down Expand Up @@ -1416,7 +1416,7 @@ rules:
branch: release-1.26
dir: staging/src/k8s.io/cloud-provider
- name: release-1.27
go: 1.21.7
go: 1.21.8
dependencies:
- repository: api
branch: release-1.27
Expand Down Expand Up @@ -1532,7 +1532,7 @@ rules:
branch: release-1.26
dir: staging/src/k8s.io/kube-controller-manager
- name: release-1.27
go: 1.21.7
go: 1.21.8
dependencies:
- repository: apimachinery
branch: release-1.27
Expand Down Expand Up @@ -1598,7 +1598,7 @@ rules:
branch: release-1.26
dir: staging/src/k8s.io/cluster-bootstrap
- name: release-1.27
go: 1.21.7
go: 1.21.8
dependencies:
- repository: apimachinery
branch: release-1.27
Expand Down Expand Up @@ -1650,7 +1650,7 @@ rules:
branch: release-1.26
dir: staging/src/k8s.io/csi-translation-lib
- name: release-1.27
go: 1.21.7
go: 1.21.8
dependencies:
- repository: api
branch: release-1.27
Expand Down Expand Up @@ -1682,7 +1682,7 @@ rules:
branch: release-1.26
dir: staging/src/k8s.io/mount-utils
- name: release-1.27
go: 1.21.7
go: 1.21.8
source:
branch: release-1.27
dir: staging/src/k8s.io/mount-utils
Expand Down Expand Up @@ -1793,7 +1793,7 @@ rules:
branch: release-1.26
dir: staging/src/k8s.io/legacy-cloud-providers
- name: release-1.27
go: 1.21.7
go: 1.21.8
dependencies:
- repository: api
branch: release-1.27
Expand Down Expand Up @@ -1839,7 +1839,7 @@ rules:
branch: release-1.26
dir: staging/src/k8s.io/cri-api
- name: release-1.27
go: 1.21.7
go: 1.21.8
source:
branch: release-1.27
dir: staging/src/k8s.io/cri-api
Expand Down Expand Up @@ -1934,7 +1934,7 @@ rules:
branch: release-1.26
dir: staging/src/k8s.io/kubectl
- name: release-1.27
go: 1.21.7
go: 1.21.8
dependencies:
- repository: api
branch: release-1.27
Expand Down Expand Up @@ -2026,7 +2026,7 @@ rules:
branch: release-1.26
dir: staging/src/k8s.io/pod-security-admission
- name: release-1.27
go: 1.21.7
go: 1.21.8
dependencies:
- repository: api
branch: release-1.27
Expand Down Expand Up @@ -2078,7 +2078,7 @@ rules:
branch: release-1.26
dir: staging/src/k8s.io/dynamic-resource-allocation
- name: release-1.27
go: 1.21.7
go: 1.21.8
dependencies:
- repository: apimachinery
branch: release-1.27
Expand All @@ -2095,4 +2095,4 @@ rules:
dir: staging/src/k8s.io/dynamic-resource-allocation
recursive-delete-patterns:
- '*/.gitattributes'
default-go-version: 1.21.7
default-go-version: 1.21.8
2 changes: 1 addition & 1 deletion test/images/Makefile
Expand Up @@ -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.7
GOLANG_VERSION=1.21.8
export

ifndef WHAT
Expand Down
2 changes: 1 addition & 1 deletion test/utils/image/manifest.go
Expand Up @@ -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.5"}
configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.4.6"}
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"}
Expand Down

0 comments on commit a3dd170

Please sign in to comment.