diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION index bc90edca446..b06bbbc0046 100644 --- a/build/build-image/cross/VERSION +++ b/build/build-image/cross/VERSION @@ -1 +1 @@ -v1.25.0-go1.19.3-bullseye.0 +v1.26.0-go1.19.4-bullseye.1 diff --git a/build/common.sh b/build/common.sh index c64cd21c788..8bc077f1b1c 100755 --- a/build/common.sh +++ b/build/common.sh @@ -96,7 +96,7 @@ readonly KUBE_CONTAINER_RSYNC_PORT=8730 # These are the default versions (image tags) for their respective base images. readonly __default_distroless_iptables_version=v0.1.2 -readonly __default_go_runner_version=v2.3.1-go1.19.3-bullseye.0 +readonly __default_go_runner_version=v2.3.1-go1.19.4-bullseye.0 readonly __default_setcap_version=bullseye-v1.3.0 # These are the base images for the Docker-wrapped binaries. diff --git a/build/dependencies.yaml b/build/dependencies.yaml index c4d0afaa7f8..f5b7f1786f9 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -88,7 +88,7 @@ dependencies: # Golang - name: "golang: upstream version" - version: 1.19.3 + version: 1.19.4 refPaths: - path: build/build-image/cross/VERSION - path: staging/publishing/rules.yaml @@ -109,7 +109,7 @@ dependencies: match: minimum_go_version=go([0-9]+\.[0-9]+) - name: "registry.k8s.io/kube-cross: dependents" - version: v1.25.0-go1.19.3-bullseye.0 + version: v1.26.0-go1.19.4-bullseye.1 refPaths: - path: build/build-image/cross/VERSION @@ -139,7 +139,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.19.3-bullseye.0 + version: v2.3.1-go1.19.4-bullseye.0 refPaths: - path: build/common.sh match: __default_go_runner_version= diff --git a/staging/publishing/rules.yaml b/staging/publishing/rules.yaml index 6bab2797f7a..606fa2997e7 100644 --- a/staging/publishing/rules.yaml +++ b/staging/publishing/rules.yaml @@ -21,12 +21,12 @@ rules: branch: release-1.24 dir: staging/src/k8s.io/code-generator - name: release-1.25 - go: 1.19.3 + go: 1.19.4 source: branch: release-1.25 dir: staging/src/k8s.io/code-generator - name: release-1.26 - go: 1.19.3 + go: 1.19.4 source: branch: release-1.26 dir: staging/src/k8s.io/code-generator @@ -52,12 +52,12 @@ rules: branch: release-1.24 dir: staging/src/k8s.io/apimachinery - name: release-1.25 - go: 1.19.3 + go: 1.19.4 source: branch: release-1.25 dir: staging/src/k8s.io/apimachinery - name: release-1.26 - go: 1.19.3 + go: 1.19.4 source: branch: release-1.26 dir: staging/src/k8s.io/apimachinery @@ -96,7 +96,7 @@ rules: branch: release-1.24 dir: staging/src/k8s.io/api - name: release-1.25 - go: 1.19.3 + go: 1.19.4 dependencies: - repository: apimachinery branch: release-1.25 @@ -104,7 +104,7 @@ rules: branch: release-1.25 dir: staging/src/k8s.io/api - name: release-1.26 - go: 1.19.3 + go: 1.19.4 dependencies: - repository: apimachinery branch: release-1.26 @@ -170,7 +170,7 @@ rules: go build -mod=mod ./... go test -mod=mod ./... - name: release-1.25 - go: 1.19.3 + go: 1.19.4 dependencies: - repository: apimachinery branch: release-1.25 @@ -184,7 +184,7 @@ rules: go build -mod=mod ./... go test -mod=mod ./... - name: release-1.26 - go: 1.19.3 + go: 1.19.4 dependencies: - repository: apimachinery branch: release-1.26 @@ -248,7 +248,7 @@ rules: branch: release-1.24 dir: staging/src/k8s.io/component-base - name: release-1.25 - go: 1.19.3 + go: 1.19.4 dependencies: - repository: apimachinery branch: release-1.25 @@ -260,7 +260,7 @@ rules: branch: release-1.25 dir: staging/src/k8s.io/component-base - name: release-1.26 - go: 1.19.3 + go: 1.19.4 dependencies: - repository: apimachinery branch: release-1.26 @@ -322,7 +322,7 @@ rules: branch: release-1.24 dir: staging/src/k8s.io/component-helpers - name: release-1.25 - go: 1.19.3 + go: 1.19.4 dependencies: - repository: apimachinery branch: release-1.25 @@ -334,7 +334,7 @@ rules: branch: release-1.25 dir: staging/src/k8s.io/component-helpers - name: release-1.26 - go: 1.19.3 + go: 1.19.4 dependencies: - repository: apimachinery branch: release-1.26 @@ -354,7 +354,7 @@ rules: branch: master dir: staging/src/k8s.io/kms - name: release-1.26 - go: 1.19.3 + go: 1.19.4 source: branch: release-1.26 dir: staging/src/k8s.io/kms @@ -418,7 +418,7 @@ rules: branch: release-1.24 dir: staging/src/k8s.io/apiserver - name: release-1.25 - go: 1.19.3 + go: 1.19.4 dependencies: - repository: apimachinery branch: release-1.25 @@ -432,7 +432,7 @@ rules: branch: release-1.25 dir: staging/src/k8s.io/apiserver - name: release-1.26 - go: 1.19.3 + go: 1.19.4 dependencies: - repository: apimachinery branch: release-1.26 @@ -524,7 +524,7 @@ rules: branch: release-1.24 dir: staging/src/k8s.io/kube-aggregator - name: release-1.25 - go: 1.19.3 + go: 1.19.4 dependencies: - repository: apimachinery branch: release-1.25 @@ -542,7 +542,7 @@ rules: branch: release-1.25 dir: staging/src/k8s.io/kube-aggregator - name: release-1.26 - go: 1.19.3 + go: 1.19.4 dependencies: - repository: apimachinery branch: release-1.26 @@ -655,7 +655,7 @@ rules: # assumes GO111MODULE=on go build -mod=mod . - name: release-1.25 - go: 1.19.3 + go: 1.19.4 dependencies: - repository: apimachinery branch: release-1.25 @@ -678,7 +678,7 @@ rules: # assumes GO111MODULE=on go build -mod=mod . - name: release-1.26 - go: 1.19.3 + go: 1.19.4 dependencies: - repository: apimachinery branch: release-1.26 @@ -778,7 +778,7 @@ rules: # assumes GO111MODULE=on go build -mod=mod . - name: release-1.25 - go: 1.19.3 + go: 1.19.4 dependencies: - repository: apimachinery branch: release-1.25 @@ -797,7 +797,7 @@ rules: # assumes GO111MODULE=on go build -mod=mod . - name: release-1.26 - go: 1.19.3 + go: 1.19.4 dependencies: - repository: apimachinery branch: release-1.26 @@ -899,7 +899,7 @@ rules: required-packages: - k8s.io/code-generator - name: release-1.25 - go: 1.19.3 + go: 1.19.4 dependencies: - repository: apimachinery branch: release-1.25 @@ -919,7 +919,7 @@ rules: required-packages: - k8s.io/code-generator - name: release-1.26 - go: 1.19.3 + go: 1.19.4 dependencies: - repository: apimachinery branch: release-1.26 @@ -996,7 +996,7 @@ rules: branch: release-1.24 dir: staging/src/k8s.io/metrics - name: release-1.25 - go: 1.19.3 + go: 1.19.4 dependencies: - repository: apimachinery branch: release-1.25 @@ -1010,7 +1010,7 @@ rules: branch: release-1.25 dir: staging/src/k8s.io/metrics - name: release-1.26 - go: 1.19.3 + go: 1.19.4 dependencies: - repository: apimachinery branch: release-1.26 @@ -1074,7 +1074,7 @@ rules: branch: release-1.24 dir: staging/src/k8s.io/cli-runtime - name: release-1.25 - go: 1.19.3 + go: 1.19.4 dependencies: - repository: api branch: release-1.25 @@ -1086,7 +1086,7 @@ rules: branch: release-1.25 dir: staging/src/k8s.io/cli-runtime - name: release-1.26 - go: 1.19.3 + go: 1.19.4 dependencies: - repository: api branch: release-1.26 @@ -1156,7 +1156,7 @@ rules: branch: release-1.24 dir: staging/src/k8s.io/sample-cli-plugin - name: release-1.25 - go: 1.19.3 + go: 1.19.4 dependencies: - repository: api branch: release-1.25 @@ -1170,7 +1170,7 @@ rules: branch: release-1.25 dir: staging/src/k8s.io/sample-cli-plugin - name: release-1.26 - go: 1.19.3 + go: 1.19.4 dependencies: - repository: api branch: release-1.26 @@ -1241,7 +1241,7 @@ rules: branch: release-1.24 dir: staging/src/k8s.io/kube-proxy - name: release-1.25 - go: 1.19.3 + go: 1.19.4 dependencies: - repository: apimachinery branch: release-1.25 @@ -1255,7 +1255,7 @@ rules: branch: release-1.25 dir: staging/src/k8s.io/kube-proxy - name: release-1.26 - go: 1.19.3 + go: 1.19.4 dependencies: - repository: apimachinery branch: release-1.26 @@ -1327,7 +1327,7 @@ rules: branch: release-1.24 dir: staging/src/k8s.io/kubelet - name: release-1.25 - go: 1.19.3 + go: 1.19.4 dependencies: - repository: apimachinery branch: release-1.25 @@ -1341,7 +1341,7 @@ rules: branch: release-1.25 dir: staging/src/k8s.io/kubelet - name: release-1.26 - go: 1.19.3 + go: 1.19.4 dependencies: - repository: apimachinery branch: release-1.26 @@ -1413,7 +1413,7 @@ rules: branch: release-1.24 dir: staging/src/k8s.io/kube-scheduler - name: release-1.25 - go: 1.19.3 + go: 1.19.4 dependencies: - repository: apimachinery branch: release-1.25 @@ -1427,7 +1427,7 @@ rules: branch: release-1.25 dir: staging/src/k8s.io/kube-scheduler - name: release-1.26 - go: 1.19.3 + go: 1.19.4 dependencies: - repository: apimachinery branch: release-1.26 @@ -1509,7 +1509,7 @@ rules: branch: release-1.24 dir: staging/src/k8s.io/controller-manager - name: release-1.25 - go: 1.19.3 + go: 1.19.4 dependencies: - repository: api branch: release-1.25 @@ -1525,7 +1525,7 @@ rules: branch: release-1.25 dir: staging/src/k8s.io/controller-manager - name: release-1.26 - go: 1.19.3 + go: 1.19.4 dependencies: - repository: api branch: release-1.26 @@ -1625,7 +1625,7 @@ rules: branch: release-1.24 dir: staging/src/k8s.io/cloud-provider - name: release-1.25 - go: 1.19.3 + go: 1.19.4 dependencies: - repository: api branch: release-1.25 @@ -1645,7 +1645,7 @@ rules: branch: release-1.25 dir: staging/src/k8s.io/cloud-provider - name: release-1.26 - go: 1.19.3 + go: 1.19.4 dependencies: - repository: api branch: release-1.26 @@ -1757,7 +1757,7 @@ rules: branch: release-1.24 dir: staging/src/k8s.io/kube-controller-manager - name: release-1.25 - go: 1.19.3 + go: 1.19.4 dependencies: - repository: apimachinery branch: release-1.25 @@ -1779,7 +1779,7 @@ rules: branch: release-1.25 dir: staging/src/k8s.io/kube-controller-manager - name: release-1.26 - go: 1.19.3 + go: 1.19.4 dependencies: - repository: apimachinery branch: release-1.26 @@ -1843,7 +1843,7 @@ rules: branch: release-1.24 dir: staging/src/k8s.io/cluster-bootstrap - name: release-1.25 - go: 1.19.3 + go: 1.19.4 dependencies: - repository: apimachinery branch: release-1.25 @@ -1853,7 +1853,7 @@ rules: branch: release-1.25 dir: staging/src/k8s.io/cluster-bootstrap - name: release-1.26 - go: 1.19.3 + go: 1.19.4 dependencies: - repository: apimachinery branch: release-1.26 @@ -1905,7 +1905,7 @@ rules: branch: release-1.24 dir: staging/src/k8s.io/csi-translation-lib - name: release-1.25 - go: 1.19.3 + go: 1.19.4 dependencies: - repository: api branch: release-1.25 @@ -1915,7 +1915,7 @@ rules: branch: release-1.25 dir: staging/src/k8s.io/csi-translation-lib - name: release-1.26 - go: 1.19.3 + go: 1.19.4 dependencies: - repository: api branch: release-1.26 @@ -1947,12 +1947,12 @@ rules: branch: release-1.24 dir: staging/src/k8s.io/mount-utils - name: release-1.25 - go: 1.19.3 + go: 1.19.4 source: branch: release-1.25 dir: staging/src/k8s.io/mount-utils - name: release-1.26 - go: 1.19.3 + go: 1.19.4 source: branch: release-1.26 dir: staging/src/k8s.io/mount-utils @@ -2063,7 +2063,7 @@ rules: branch: release-1.24 dir: staging/src/k8s.io/legacy-cloud-providers - name: release-1.25 - go: 1.19.3 + go: 1.19.4 dependencies: - repository: api branch: release-1.25 @@ -2089,7 +2089,7 @@ rules: branch: release-1.25 dir: staging/src/k8s.io/legacy-cloud-providers - name: release-1.26 - go: 1.19.3 + go: 1.19.4 dependencies: - repository: api branch: release-1.26 @@ -2137,12 +2137,12 @@ rules: branch: release-1.24 dir: staging/src/k8s.io/cri-api - name: release-1.25 - go: 1.19.3 + go: 1.19.4 source: branch: release-1.25 dir: staging/src/k8s.io/cri-api - name: release-1.26 - go: 1.19.3 + go: 1.19.4 source: branch: release-1.26 dir: staging/src/k8s.io/cri-api @@ -2237,7 +2237,7 @@ rules: branch: release-1.24 dir: staging/src/k8s.io/kubectl - name: release-1.25 - go: 1.19.3 + go: 1.19.4 dependencies: - repository: api branch: release-1.25 @@ -2259,7 +2259,7 @@ rules: branch: release-1.25 dir: staging/src/k8s.io/kubectl - name: release-1.26 - go: 1.19.3 + go: 1.19.4 dependencies: - repository: api branch: release-1.26 @@ -2349,7 +2349,7 @@ rules: branch: release-1.24 dir: staging/src/k8s.io/pod-security-admission - name: release-1.25 - go: 1.19.3 + go: 1.19.4 dependencies: - repository: api branch: release-1.25 @@ -2365,7 +2365,7 @@ rules: branch: release-1.25 dir: staging/src/k8s.io/pod-security-admission - name: release-1.26 - go: 1.19.3 + go: 1.19.4 dependencies: - repository: api branch: release-1.26 @@ -2399,7 +2399,7 @@ rules: branch: master dir: staging/src/k8s.io/dynamic-resource-allocation - name: release-1.26 - go: 1.19.3 + go: 1.19.4 dependencies: - repository: apimachinery branch: release-1.26 @@ -2416,4 +2416,4 @@ rules: dir: staging/src/k8s.io/dynamic-resource-allocation recursive-delete-patterns: - '*/.gitattributes' -default-go-version: 1.19.3 +default-go-version: 1.19.4 diff --git a/test/images/Makefile b/test/images/Makefile index c46ddb1e6bf..e5ab03770c3 100644 --- a/test/images/Makefile +++ b/test/images/Makefile @@ -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.19.3 +GOLANG_VERSION=1.19.4 export ifndef WHAT