Merge pull request #106833 from cpanato/go117

[go1.17] Update to go1.17.4
This commit is contained in:
Kubernetes Prow Robot 2021-12-07 19:28:44 -08:00 committed by GitHub
commit 68bd9994ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 37 additions and 10 deletions

View File

@ -1 +1 @@
v1.23.0-go1.17.3-bullseye.0 v1.24.0-go1.17.4-bullseye.0

View File

@ -91,7 +91,7 @@ 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_debian_iptables_version=bullseye-v1.1.0 readonly __default_debian_iptables_version=bullseye-v1.1.0
readonly __default_go_runner_version=v2.3.1-go1.17.3-bullseye.0 readonly __default_go_runner_version=v2.3.1-go1.17.4-bullseye.0
readonly __default_setcap_version=bullseye-v1.0.0 readonly __default_setcap_version=bullseye-v1.0.0
# These are the base images for the Docker-wrapped binaries. # These are the base images for the Docker-wrapped binaries.

View File

@ -87,7 +87,7 @@ dependencies:
# Golang # Golang
- name: "golang: upstream version" - name: "golang: upstream version"
version: 1.17.3 version: 1.17.4
refPaths: refPaths:
- path: build/build-image/cross/VERSION - path: build/build-image/cross/VERSION
- path: cluster/addons/fluentd-elasticsearch/es-image/Dockerfile - path: cluster/addons/fluentd-elasticsearch/es-image/Dockerfile
@ -110,13 +110,13 @@ dependencies:
match: minimum_go_version=go([0-9]+\.[0-9]+) match: minimum_go_version=go([0-9]+\.[0-9]+)
- name: "golang: etcd release version" - name: "golang: etcd release version"
version: 1.16.10 version: 1.16.11
refPaths: refPaths:
- path: cluster/images/etcd/Makefile - path: cluster/images/etcd/Makefile
match: 'GOLANG_VERSION\?=\d+.\d+(alpha|beta|rc)?\.?(\d+)?' match: 'GOLANG_VERSION\?=\d+.\d+(alpha|beta|rc)?\.?(\d+)?'
- name: "k8s.gcr.io/kube-cross: dependents" - name: "k8s.gcr.io/kube-cross: dependents"
version: v1.23.0-go1.17.3-bullseye.0 version: v1.24.0-go1.17.4-bullseye.0
refPaths: refPaths:
- path: build/build-image/cross/VERSION - path: build/build-image/cross/VERSION
@ -146,7 +146,7 @@ dependencies:
match: configs\[DebianIptables\] = Config{list\.BuildImageRegistry, "debian-iptables", "[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: configs\[DebianIptables\] = Config{list\.BuildImageRegistry, "debian-iptables", "[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: "k8s.gcr.io/go-runner: dependents" - name: "k8s.gcr.io/go-runner: dependents"
version: v2.3.1-go1.17.3-bullseye.0 version: v2.3.1-go1.17.4-bullseye.0
refPaths: refPaths:
- path: build/common.sh - path: build/common.sh
match: __default_go_runner_version= match: __default_go_runner_version=

View File

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
FROM golang:1.17.3 AS builder FROM golang:1.17.4 AS builder
COPY elasticsearch_logging_discovery.go go.mod go.sum / COPY elasticsearch_logging_discovery.go go.mod go.sum /
RUN CGO_ENABLED=0 GOOS=linux GO111MODULE=on go build -a -ldflags "-w" -o /elasticsearch_logging_discovery /elasticsearch_logging_discovery.go RUN CGO_ENABLED=0 GOOS=linux GO111MODULE=on go build -a -ldflags "-w" -o /elasticsearch_logging_discovery /elasticsearch_logging_discovery.go

View File

@ -62,7 +62,7 @@ endif
# This option is for running docker manifest command # This option is for running docker manifest command
export DOCKER_CLI_EXPERIMENTAL := enabled export DOCKER_CLI_EXPERIMENTAL := enabled
# golang version should match the golang version of the official build from https://github.com/etcd-io/etcd/releases. # golang version should match the golang version of the official build from https://github.com/etcd-io/etcd/releases.
GOLANG_VERSION?=1.16.10 GOLANG_VERSION?=1.16.11
GOARM?=7 GOARM?=7
TEMP_DIR:=$(shell mktemp -d) TEMP_DIR:=$(shell mktemp -d)

View File

@ -7,7 +7,7 @@ recursive-delete-patterns:
- BUILD.bazel - BUILD.bazel
- "*/BUILD.bazel" - "*/BUILD.bazel"
- Gopkg.toml - Gopkg.toml
default-go-version: 1.17.3 default-go-version: 1.17.4
rules: rules:
- destination: code-generator - destination: code-generator
branches: branches:
@ -34,6 +34,7 @@ rules:
branch: release-1.23 branch: release-1.23
dir: staging/src/k8s.io/code-generator dir: staging/src/k8s.io/code-generator
name: release-1.23 name: release-1.23
go: 1.17.3
- destination: apimachinery - destination: apimachinery
library: true library: true
@ -61,6 +62,7 @@ rules:
branch: release-1.23 branch: release-1.23
dir: staging/src/k8s.io/apimachinery dir: staging/src/k8s.io/apimachinery
name: release-1.23 name: release-1.23
go: 1.17.3
- destination: api - destination: api
library: true library: true
@ -100,6 +102,7 @@ rules:
branch: release-1.23 branch: release-1.23
dir: staging/src/k8s.io/api dir: staging/src/k8s.io/api
name: release-1.23 name: release-1.23
go: 1.17.3
dependencies: dependencies:
- repository: apimachinery - repository: apimachinery
branch: release-1.23 branch: release-1.23
@ -166,6 +169,7 @@ rules:
branch: release-1.23 branch: release-1.23
dir: staging/src/k8s.io/client-go dir: staging/src/k8s.io/client-go
name: release-1.23 name: release-1.23
go: 1.17.3
dependencies: dependencies:
- repository: apimachinery - repository: apimachinery
branch: release-1.23 branch: release-1.23
@ -230,6 +234,7 @@ rules:
branch: release-1.23 branch: release-1.23
dir: staging/src/k8s.io/component-base dir: staging/src/k8s.io/component-base
name: release-1.23 name: release-1.23
go: 1.17.3
dependencies: dependencies:
- repository: apimachinery - repository: apimachinery
branch: release-1.23 branch: release-1.23
@ -292,6 +297,7 @@ rules:
branch: release-1.23 branch: release-1.23
dir: staging/src/k8s.io/component-helpers dir: staging/src/k8s.io/component-helpers
name: release-1.23 name: release-1.23
go: 1.17.3
dependencies: dependencies:
- repository: apimachinery - repository: apimachinery
branch: release-1.23 branch: release-1.23
@ -362,6 +368,7 @@ rules:
branch: release-1.23 branch: release-1.23
dir: staging/src/k8s.io/apiserver dir: staging/src/k8s.io/apiserver
name: release-1.23 name: release-1.23
go: 1.17.3
dependencies: dependencies:
- repository: apimachinery - repository: apimachinery
branch: release-1.23 branch: release-1.23
@ -449,6 +456,7 @@ rules:
branch: release-1.23 branch: release-1.23
dir: staging/src/k8s.io/kube-aggregator dir: staging/src/k8s.io/kube-aggregator
name: release-1.23 name: release-1.23
go: 1.17.3
dependencies: dependencies:
- repository: apimachinery - repository: apimachinery
branch: release-1.23 branch: release-1.23
@ -560,6 +568,7 @@ rules:
branch: release-1.23 branch: release-1.23
dir: staging/src/k8s.io/sample-apiserver dir: staging/src/k8s.io/sample-apiserver
name: release-1.23 name: release-1.23
go: 1.17.3
dependencies: dependencies:
- repository: apimachinery - repository: apimachinery
branch: release-1.23 branch: release-1.23
@ -660,6 +669,7 @@ rules:
branch: release-1.23 branch: release-1.23
dir: staging/src/k8s.io/sample-controller dir: staging/src/k8s.io/sample-controller
name: release-1.23 name: release-1.23
go: 1.17.3
dependencies: dependencies:
- repository: apimachinery - repository: apimachinery
branch: release-1.23 branch: release-1.23
@ -760,6 +770,7 @@ rules:
branch: release-1.23 branch: release-1.23
dir: staging/src/k8s.io/apiextensions-apiserver dir: staging/src/k8s.io/apiextensions-apiserver
name: release-1.23 name: release-1.23
go: 1.17.3
dependencies: dependencies:
- repository: apimachinery - repository: apimachinery
branch: release-1.23 branch: release-1.23
@ -838,6 +849,7 @@ rules:
branch: release-1.23 branch: release-1.23
dir: staging/src/k8s.io/metrics dir: staging/src/k8s.io/metrics
name: release-1.23 name: release-1.23
go: 1.17.3
dependencies: dependencies:
- repository: apimachinery - repository: apimachinery
branch: release-1.23 branch: release-1.23
@ -902,6 +914,7 @@ rules:
branch: release-1.23 branch: release-1.23
dir: staging/src/k8s.io/cli-runtime dir: staging/src/k8s.io/cli-runtime
name: release-1.23 name: release-1.23
go: 1.17.3
dependencies: dependencies:
- repository: api - repository: api
branch: release-1.23 branch: release-1.23
@ -972,6 +985,7 @@ rules:
branch: release-1.23 branch: release-1.23
dir: staging/src/k8s.io/sample-cli-plugin dir: staging/src/k8s.io/sample-cli-plugin
name: release-1.23 name: release-1.23
go: 1.17.3
dependencies: dependencies:
- repository: api - repository: api
branch: release-1.23 branch: release-1.23
@ -1044,6 +1058,7 @@ rules:
branch: release-1.23 branch: release-1.23
dir: staging/src/k8s.io/kube-proxy dir: staging/src/k8s.io/kube-proxy
name: release-1.23 name: release-1.23
go: 1.17.3
dependencies: dependencies:
- repository: apimachinery - repository: apimachinery
branch: release-1.23 branch: release-1.23
@ -1116,6 +1131,7 @@ rules:
branch: release-1.23 branch: release-1.23
dir: staging/src/k8s.io/kubelet dir: staging/src/k8s.io/kubelet
name: release-1.23 name: release-1.23
go: 1.17.3
dependencies: dependencies:
- repository: apimachinery - repository: apimachinery
branch: release-1.23 branch: release-1.23
@ -1188,6 +1204,7 @@ rules:
branch: release-1.23 branch: release-1.23
dir: staging/src/k8s.io/kube-scheduler dir: staging/src/k8s.io/kube-scheduler
name: release-1.23 name: release-1.23
go: 1.17.3
dependencies: dependencies:
- repository: apimachinery - repository: apimachinery
branch: release-1.23 branch: release-1.23
@ -1268,6 +1285,7 @@ rules:
branch: release-1.23 branch: release-1.23
dir: staging/src/k8s.io/controller-manager dir: staging/src/k8s.io/controller-manager
name: release-1.23 name: release-1.23
go: 1.17.3
dependencies: dependencies:
- repository: api - repository: api
branch: release-1.23 branch: release-1.23
@ -1366,6 +1384,7 @@ rules:
branch: release-1.23 branch: release-1.23
dir: staging/src/k8s.io/cloud-provider dir: staging/src/k8s.io/cloud-provider
name: release-1.23 name: release-1.23
go: 1.17.3
dependencies: dependencies:
- repository: api - repository: api
branch: release-1.23 branch: release-1.23
@ -1476,6 +1495,7 @@ rules:
branch: release-1.23 branch: release-1.23
dir: staging/src/k8s.io/kube-controller-manager dir: staging/src/k8s.io/kube-controller-manager
name: release-1.23 name: release-1.23
go: 1.17.3
dependencies: dependencies:
- repository: apimachinery - repository: apimachinery
branch: release-1.23 branch: release-1.23
@ -1540,6 +1560,7 @@ rules:
branch: release-1.23 branch: release-1.23
dir: staging/src/k8s.io/cluster-bootstrap dir: staging/src/k8s.io/cluster-bootstrap
name: release-1.23 name: release-1.23
go: 1.17.3
dependencies: dependencies:
- repository: apimachinery - repository: apimachinery
branch: release-1.23 branch: release-1.23
@ -1592,6 +1613,7 @@ rules:
branch: release-1.23 branch: release-1.23
dir: staging/src/k8s.io/csi-translation-lib dir: staging/src/k8s.io/csi-translation-lib
name: release-1.23 name: release-1.23
go: 1.17.3
dependencies: dependencies:
- repository: api - repository: api
branch: release-1.23 branch: release-1.23
@ -1624,6 +1646,7 @@ rules:
branch: release-1.23 branch: release-1.23
dir: staging/src/k8s.io/mount-utils dir: staging/src/k8s.io/mount-utils
name: release-1.23 name: release-1.23
go: 1.17.3
- destination: legacy-cloud-providers - destination: legacy-cloud-providers
library: true library: true
@ -1731,6 +1754,7 @@ rules:
branch: release-1.23 branch: release-1.23
dir: staging/src/k8s.io/legacy-cloud-providers dir: staging/src/k8s.io/legacy-cloud-providers
name: release-1.23 name: release-1.23
go: 1.17.3
dependencies: dependencies:
- repository: api - repository: api
branch: release-1.23 branch: release-1.23
@ -1779,6 +1803,7 @@ rules:
branch: release-1.23 branch: release-1.23
dir: staging/src/k8s.io/cri-api dir: staging/src/k8s.io/cri-api
name: release-1.23 name: release-1.23
go: 1.17.3
- destination: kubectl - destination: kubectl
library: true library: true
@ -1874,6 +1899,7 @@ rules:
branch: release-1.23 branch: release-1.23
dir: staging/src/k8s.io/kubectl dir: staging/src/k8s.io/kubectl
name: release-1.23 name: release-1.23
go: 1.17.3
dependencies: dependencies:
- repository: api - repository: api
branch: release-1.23 branch: release-1.23
@ -1930,6 +1956,7 @@ rules:
branch: release-1.23 branch: release-1.23
dir: staging/src/k8s.io/pod-security-admission dir: staging/src/k8s.io/pod-security-admission
name: release-1.23 name: release-1.23
go: 1.17.3
dependencies: dependencies:
- repository: api - repository: api
branch: release-1.23 branch: release-1.23

View File

@ -16,7 +16,7 @@ REGISTRY ?= k8s.gcr.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.17.3 GOLANG_VERSION=1.17.4
export export
ifndef WHAT ifndef WHAT