From fac97f8a9bf913e540344e517d42d6173a3d1e4f Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Fri, 16 Apr 2021 19:41:42 -0400 Subject: [PATCH] [go1.16] Update to go1.16.3 Signed-off-by: Stephen Augustus --- build/build-image/cross/VERSION | 2 +- build/common.sh | 2 +- build/dependencies.yaml | 6 +++--- cluster/addons/fluentd-elasticsearch/es-image/Dockerfile | 2 +- staging/publishing/rules.yaml | 2 +- test/images/Makefile | 2 +- test/images/sample-apiserver/Makefile | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION index e6d24726bf7..1b4c08f5a2f 100644 --- a/build/build-image/cross/VERSION +++ b/build/build-image/cross/VERSION @@ -1 +1 @@ -v1.16.1-1 +v1.16.3-1 diff --git a/build/common.sh b/build/common.sh index ca9a7dda3e4..1995b7f4612 100755 --- a/build/common.sh +++ b/build/common.sh @@ -87,7 +87,7 @@ readonly KUBE_CONTAINER_RSYNC_PORT=8730 # These are the default versions (image tags) for their respective base images. readonly __default_debian_iptables_version=buster-v1.6.0 -readonly __default_go_runner_version=v2.3.1-go1.16.1-buster.0 +readonly __default_go_runner_version=v2.3.1-go1.16.3-buster.0 # These are the base images for the Docker-wrapped binaries. readonly KUBE_GORUNNER_IMAGE="${KUBE_GORUNNER_IMAGE:-$KUBE_BASE_IMAGE_REGISTRY/go-runner:$__default_go_runner_version}" diff --git a/build/dependencies.yaml b/build/dependencies.yaml index 4518adaf1f5..e723717b078 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -101,7 +101,7 @@ dependencies: # Golang - name: "golang: upstream version" - version: 1.16.1 + version: 1.16.3 refPaths: - path: build/build-image/cross/VERSION - path: cluster/addons/fluentd-elasticsearch/es-image/Dockerfile @@ -124,7 +124,7 @@ dependencies: match: minimum_go_version=go([0-9]+\.[0-9]+) - name: "k8s.gcr.io/kube-cross: dependents" - version: v1.16.1-1 + version: v1.16.3-1 refPaths: - path: build/build-image/cross/VERSION - path: test/images/sample-apiserver/Makefile @@ -154,7 +154,7 @@ dependencies: match: configs\[DebianIptables\] = Config{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" - version: v2.3.1-go1.16.1-buster.0 + version: v2.3.1-go1.16.3-buster.0 refPaths: - path: build/common.sh match: __default_go_runner_version= diff --git a/cluster/addons/fluentd-elasticsearch/es-image/Dockerfile b/cluster/addons/fluentd-elasticsearch/es-image/Dockerfile index 8c023c520e9..bc2b77667bf 100644 --- a/cluster/addons/fluentd-elasticsearch/es-image/Dockerfile +++ b/cluster/addons/fluentd-elasticsearch/es-image/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.16.1 AS builder +FROM golang:1.16.3 AS builder 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 diff --git a/staging/publishing/rules.yaml b/staging/publishing/rules.yaml index 7b67f8e30bc..d87c6af1475 100644 --- a/staging/publishing/rules.yaml +++ b/staging/publishing/rules.yaml @@ -7,7 +7,7 @@ recursive-delete-patterns: - BUILD.bazel - "*/BUILD.bazel" - Gopkg.toml -default-go-version: 1.16.1 +default-go-version: 1.16.3 rules: - destination: code-generator branches: diff --git a/test/images/Makefile b/test/images/Makefile index fb612d10a6d..3c35b55a4ec 100644 --- a/test/images/Makefile +++ b/test/images/Makefile @@ -16,7 +16,7 @@ REGISTRY ?= gcr.io/kubernetes-e2e-test-images GOARM ?= 7 DOCKER_CERT_BASE_PATH ?= QEMUVERSION=v5.1.0-2 -GOLANG_VERSION=1.16.1 +GOLANG_VERSION=1.16.3 export ifndef WHAT diff --git a/test/images/sample-apiserver/Makefile b/test/images/sample-apiserver/Makefile index d8d8d0b3f85..9c581f8b892 100644 --- a/test/images/sample-apiserver/Makefile +++ b/test/images/sample-apiserver/Makefile @@ -24,7 +24,7 @@ export # Get without building to populate module cache # Then, get with OS/ARCH-specific env to build bin: - docker run --rm -i -v "${TARGET}:${TARGET}:Z" k8s.gcr.io/build-image/kube-cross:v1.16.1-1 \ + docker run --rm -i -v "${TARGET}:${TARGET}:Z" k8s.gcr.io/build-image/kube-cross:v1.16.3-1 \ /bin/bash -c "\ mkdir -p /go/src /go/bin && \ GO111MODULE=on go get -d k8s.io/sample-apiserver@v0.17.0 && \