Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[1.21][go1.16] Update to go1.16.6 #103670

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/build-image/cross/VERSION
@@ -1 +1 @@
v1.16.5-1
v1.16.6-1
2 changes: 1 addition & 1 deletion build/common.sh
Expand Up @@ -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.2
readonly __default_go_runner_version=v2.3.1-go1.16.5-buster.0
readonly __default_go_runner_version=v2.3.1-go1.16.6-buster.0
readonly __default_setcap_version=buster-v2.0.1

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

# Golang
- name: "golang: upstream version"
version: 1.16.5
version: 1.16.6
refPaths:
- path: build/build-image/cross/VERSION
- path: cluster/addons/fluentd-elasticsearch/es-image/Dockerfile
Expand All @@ -124,7 +124,7 @@ dependencies:
match: minimum_go_version=go([0-9]+\.[0-9]+)

- name: "k8s.gcr.io/kube-cross: dependents"
version: v1.16.5-1
version: v1.16.6-1
refPaths:
- path: build/build-image/cross/VERSION
- path: test/images/sample-apiserver/Makefile
Expand Down Expand Up @@ -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.5-buster.0
version: v2.3.1-go1.16.6-buster.0
refPaths:
- path: build/common.sh
match: __default_go_runner_version=
Expand Down
2 changes: 1 addition & 1 deletion cluster/addons/fluentd-elasticsearch/es-image/Dockerfile
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM golang:1.16.5 AS builder
FROM golang:1.16.6 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

Expand Down
2 changes: 1 addition & 1 deletion staging/publishing/rules.yaml
Expand Up @@ -7,7 +7,7 @@ recursive-delete-patterns:
- BUILD.bazel
- "*/BUILD.bazel"
- Gopkg.toml
default-go-version: 1.16.5
default-go-version: 1.16.6
rules:
- destination: code-generator
branches:
Expand Down
2 changes: 1 addition & 1 deletion test/images/Makefile
Expand Up @@ -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.5
GOLANG_VERSION=1.16.6
export

ifndef WHAT
Expand Down
2 changes: 1 addition & 1 deletion test/images/sample-apiserver/Makefile
Expand Up @@ -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.5-1 \
docker run --rm -i -v "${TARGET}:${TARGET}:Z" k8s.gcr.io/build-image/kube-cross:v1.16.6-1 \
/bin/bash -c "\
mkdir -p /go/src /go/bin && \
GO111MODULE=on go get -d k8s.io/sample-apiserver@v0.17.0 && \
Expand Down