Skip to content

Commit

Permalink
[go1.17] Update to go1.17.1
Browse files Browse the repository at this point in the history
Signed-off-by: Carlos Panato <[email protected]>
  • Loading branch information
cpanato committed Sep 14, 2021
1 parent 95391ad commit 132c706
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion build/build-image/cross/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v1.23.0-go1.17-buster.0
v1.23.0-go1.17.1-buster.0
2 changes: 1 addition & 1 deletion build/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,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.7
readonly __default_go_runner_version=v2.3.1-go1.17-buster.0
readonly __default_go_runner_version=v2.3.1-go1.17.1-buster.0
readonly __default_setcap_version=buster-v2.0.4

# These are the base images for the Docker-wrapped binaries.
Expand Down
8 changes: 4 additions & 4 deletions build/dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ dependencies:

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

- name: "golang: etcd release version"
version: 1.16.7
version: 1.16.8
refPaths:
- path: cluster/images/etcd/Makefile
match: 'GOLANG_VERSION\?=\d+.\d+(alpha|beta|rc)?\.?(\d+)?'

- name: "k8s.gcr.io/kube-cross: dependents"
version: v1.23.0-go1.17-buster.0
version: v1.23.0-go1.17.1-buster.0
refPaths:
- path: build/build-image/cross/VERSION

Expand Down Expand Up @@ -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-]+)*))?)"}

- name: "k8s.gcr.io/go-runner: dependents"
version: v2.3.1-go1.17-buster.0
version: v2.3.1-go1.17.1-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
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM golang:1.17 AS builder
FROM golang:1.17.1 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 cluster/images/etcd/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ endif
# This option is for running docker manifest command
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?=1.16.7
GOLANG_VERSION?=1.16.8
GOARM?=7
TEMP_DIR:=$(shell mktemp -d)

Expand Down
2 changes: 1 addition & 1 deletion staging/publishing/rules.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ recursive-delete-patterns:
- BUILD.bazel
- "*/BUILD.bazel"
- Gopkg.toml
default-go-version: 1.17
default-go-version: 1.17.1
rules:
- destination: code-generator
branches:
Expand Down
2 changes: 1 addition & 1 deletion test/images/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ REGISTRY ?= k8s.gcr.io/e2e-test-images
GOARM ?= 7
DOCKER_CERT_BASE_PATH ?=
QEMUVERSION=v5.1.0-2
GOLANG_VERSION=1.17
GOLANG_VERSION=1.17.1
export

ifndef WHAT
Expand Down

0 comments on commit 132c706

Please sign in to comment.