github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #105563 from mengjiao-liu/go1172

Browse Source 
[go1.17] Update to go1.17.2
This commit is contained in:
Kubernetes Prow Robot
2021-10-14 03:25:19 -07:00
committed by GitHub
parent 548e37278c 19e8852154
commit d09ce7be1c
7 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/build-image/cross/VERSION
View File

@@ -1 +1 @@
v1.23.0-go1.17.1-bullseye.1 v1.23.0-go1.17.2-bullseye.0

2
build/common.sh
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.0.0 readonly __default_debian_iptables_version=bullseye-v1.0.0
readonly __default_go_runner_version=v2.3.1-go1.17.1-bullseye.0 readonly __default_go_runner_version=v2.3.1-go1.17.2-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.

8
build/dependencies.yaml
View File

@@ -85,7 +85,7 @@ dependencies:
# Golang # Golang
- name: "golang: upstream version" - name: "golang: upstream version"
version: 1.17.1 version: 1.17.2
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
@@ -108,13 +108,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.8 version: 1.16.9
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.1-bullseye.1 version: v1.23.0-go1.17.2-bullseye.0
refPaths: refPaths:
- path: build/build-image/cross/VERSION - path: build/build-image/cross/VERSION
@@ -144,7 +144,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.1-bullseye.0 version: v2.3.1-go1.17.2-bullseye.0
refPaths: refPaths:
- path: build/common.sh - path: build/common.sh
match: __default_go_runner_version= match: __default_go_runner_version=

2
cluster/addons/fluentd-elasticsearch/es-image/Dockerfile
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.1 AS builder FROM golang:1.17.2 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

2
cluster/images/etcd/Makefile
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.8 GOLANG_VERSION?=1.16.9
GOARM?=7 GOARM?=7
TEMP_DIR:=$(shell mktemp -d) TEMP_DIR:=$(shell mktemp -d)

2
staging/publishing/rules.yaml
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.1 default-go-version: 1.17.2
rules: rules:
- destination: code-generator - destination: code-generator
branches: branches:

2
test/images/Makefile
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.1 GOLANG_VERSION=1.17.2
export export
ifndef WHAT ifndef WHAT