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

[go1.17] Update to go1.17 #103692

Merged
merged 7 commits into from Aug 25, 2021
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion build/build-image/cross/VERSION
@@ -1 +1 @@
v1.16.7-1
v1.23.0-go1.17-buster.0
2 changes: 1 addition & 1 deletion build/common.sh
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.6
readonly __default_go_runner_version=v2.3.1-go1.16.7-buster.0
readonly __default_go_runner_version=v2.3.1-go1.17-buster.0
readonly __default_setcap_version=buster-v2.0.4

# These are the base images for the Docker-wrapped binaries.
Expand Down
36 changes: 20 additions & 16 deletions build/dependencies.yaml
Expand Up @@ -20,10 +20,10 @@ dependencies:
- name: "cni"
version: 0.9.1
refPaths:
- path: cluster/gce/gci/configure.sh
match: DEFAULT_CNI_VERSION=
- path: cluster/gce/config-common.sh
match: WINDOWS_CNI_VERSION=
- path: cluster/gce/gci/configure.sh
match: DEFAULT_CNI_VERSION=
- path: test/e2e_node/remote/utils.go
match: cniVersion[\t\n\f\r ]*=

Expand All @@ -48,10 +48,10 @@ dependencies:
- name: "crictl"
version: 1.22.0
refPaths:
- path: cluster/gce/gci/configure.sh
match: DEFAULT_CRICTL_VERSION=
- path: cluster/gce/windows/k8s-node-setup.psm1
match: CRICTL_VERSION =
- path: cluster/gce/gci/configure.sh
match: DEFAULT_CRICTL_VERSION=

# Docker
- name: "docker"
Expand Down Expand Up @@ -85,32 +85,36 @@ dependencies:

# Golang
- name: "golang: upstream version"
version: 1.16.7
version: 1.17
refPaths:
- path: build/build-image/cross/VERSION
- path: cluster/addons/fluentd-elasticsearch/es-image/Dockerfile
match: 'FROM golang\:\d+.\d+(alpha|beta|rc)?\.?(\d+)?'
- path: test/images/Makefile
match: GOLANG_VERSION=\d+.\d+(alpha|beta|rc)?\.?\d+
- path: staging/publishing/rules.yaml
match: 'default-go-version\: \d+.\d+(alpha|beta|rc)?\.?(\d+)?'
- path: cluster/images/etcd/Makefile
match: 'GOLANG_VERSION\?=\d+.\d+(alpha|beta|rc)?\.?(\d+)?'
- path: test/images/Makefile
match: GOLANG_VERSION=\d+.\d+(alpha|beta|rc)?\.?\d+

# Golang pre-releases are denoted as `1.y<pre-release stage>.z`
# Golang pre-releases are denoted as `1.y<pre-release stage>`
# Example: go1.16rc1
#
# This entry is a stub of the major and minor version to allow dependency
# checks to pass when building Kubernetes using a pre-release of Golang.
- name: "golang: <major>.<minor>"
version: 1.16
# This entry is a stub of the major version to allow dependency checks to
# pass when building Kubernetes using a pre-release of Golang.
- name: "golang: 1.<major>"
version: 1.17
refPaths:
- path: build/build-image/cross/VERSION
- path: hack/lib/golang.sh
match: minimum_go_version=go([0-9]+\.[0-9]+)

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

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

Expand Down Expand Up @@ -138,7 +142,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.16.7-buster.0
version: v2.3.1-go1.17-buster.0
refPaths:
- path: build/common.sh
match: __default_go_runner_version=
Expand Down
1 change: 1 addition & 0 deletions build/tools.go
@@ -1,3 +1,4 @@
//go:build tools
// +build tools
liggitt marked this conversation as resolved.
Show resolved Hide resolved

/*
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.7 AS builder
FROM golang:1.17 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
1 change: 1 addition & 0 deletions cluster/images/etcd/migrate/integration_test.go
@@ -1,3 +1,4 @@
//go:build integration
// +build integration

/*
Expand Down
1 change: 1 addition & 0 deletions cluster/images/etcd/migrate/util_others.go
@@ -1,3 +1,4 @@
//go:build !windows
// +build !windows

/*
Expand Down
1 change: 1 addition & 0 deletions cluster/images/etcd/migrate/utils_windows.go
@@ -1,3 +1,4 @@
//go:build windows
// +build windows

/*
Expand Down
1 change: 1 addition & 0 deletions cmd/cloud-controller-manager/providers.go
@@ -1,3 +1,4 @@
//go:build !providerless
// +build !providerless

/*
Expand Down
1 change: 1 addition & 0 deletions cmd/kube-apiserver/app/options/globalflags_providerless.go
@@ -1,3 +1,4 @@
//go:build providerless
// +build providerless

/*
Expand Down
1 change: 1 addition & 0 deletions cmd/kube-apiserver/app/options/globalflags_providers.go
@@ -1,3 +1,4 @@
//go:build !providerless
// +build !providerless

/*
Expand Down
1 change: 1 addition & 0 deletions cmd/kube-controller-manager/app/flags_providerless.go
@@ -1,3 +1,4 @@
//go:build providerless
// +build providerless

/*
Expand Down
1 change: 1 addition & 0 deletions cmd/kube-controller-manager/app/flags_providers.go
@@ -1,3 +1,4 @@
//go:build !providerless
// +build !providerless

/*
Expand Down
1 change: 1 addition & 0 deletions cmd/kube-controller-manager/app/plugins_providerless.go
@@ -1,3 +1,4 @@
//go:build providerless
// +build providerless

/*
Expand Down
1 change: 1 addition & 0 deletions cmd/kube-controller-manager/app/plugins_providers.go
@@ -1,3 +1,4 @@
//go:build !providerless
// +build !providerless

/*
Expand Down
1 change: 1 addition & 0 deletions cmd/kube-proxy/app/init_others.go
@@ -1,3 +1,4 @@
//go:build !windows
// +build !windows

/*
Expand Down
1 change: 1 addition & 0 deletions cmd/kube-proxy/app/init_windows.go
@@ -1,3 +1,4 @@
//go:build windows
// +build windows

/*
Expand Down
1 change: 1 addition & 0 deletions cmd/kube-proxy/app/server_others.go
@@ -1,3 +1,4 @@
//go:build !windows
// +build !windows

/*
Expand Down
1 change: 1 addition & 0 deletions cmd/kube-proxy/app/server_others_test.go
@@ -1,3 +1,4 @@
//go:build !windows
// +build !windows

/*
Expand Down
1 change: 1 addition & 0 deletions cmd/kube-proxy/app/server_windows.go
@@ -1,3 +1,4 @@
//go:build windows
// +build windows

/*
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions cmd/kubeadm/app/apis/kubeadm/v1beta2/defaults_unix.go
@@ -1,3 +1,4 @@
//go:build !windows
// +build !windows

/*
Expand Down
1 change: 1 addition & 0 deletions cmd/kubeadm/app/apis/kubeadm/v1beta2/defaults_windows.go
@@ -1,3 +1,4 @@
//go:build windows
// +build windows

/*
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions cmd/kubeadm/app/apis/kubeadm/v1beta3/defaults_unix.go
@@ -1,3 +1,4 @@
//go:build !windows
// +build !windows

/*
Expand Down
1 change: 1 addition & 0 deletions cmd/kubeadm/app/apis/kubeadm/v1beta3/defaults_windows.go
@@ -1,3 +1,4 @@
//go:build windows
// +build windows

/*
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions cmd/kubeadm/app/apis/kubeadm/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions cmd/kubeadm/app/apis/output/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions cmd/kubeadm/app/cmd/phases/reset/unmount.go
@@ -1,3 +1,4 @@
//go:build !linux
// +build !linux

/*
Expand Down
1 change: 1 addition & 0 deletions cmd/kubeadm/app/cmd/phases/reset/unmount_linux.go
@@ -1,3 +1,4 @@
//go:build linux
// +build linux

/*
Expand Down
1 change: 1 addition & 0 deletions cmd/kubeadm/app/constants/constants_unix.go
@@ -1,3 +1,4 @@
//go:build !windows
// +build !windows

/*
Expand Down
1 change: 1 addition & 0 deletions cmd/kubeadm/app/constants/constants_windows.go
@@ -1,3 +1,4 @@
//go:build windows
// +build windows

/*
Expand Down
1 change: 1 addition & 0 deletions cmd/kubeadm/app/phases/copycerts/testutil_umask.go
@@ -1,3 +1,4 @@
//go:build darwin || linux
// +build darwin linux

/*
Expand Down
1 change: 1 addition & 0 deletions cmd/kubeadm/app/phases/copycerts/testutil_umask_noop.go
@@ -1,3 +1,4 @@
//go:build !darwin && !linux
// +build !darwin,!linux

/*
Expand Down
1 change: 1 addition & 0 deletions cmd/kubeadm/app/preflight/checks_darwin.go
@@ -1,3 +1,4 @@
//go:build darwin
// +build darwin

/*
Expand Down
1 change: 1 addition & 0 deletions cmd/kubeadm/app/preflight/checks_linux.go
@@ -1,3 +1,4 @@
//go:build linux
// +build linux

/*
Expand Down
1 change: 1 addition & 0 deletions cmd/kubeadm/app/preflight/checks_unix.go
@@ -1,3 +1,4 @@
//go:build !windows
// +build !windows

/*
Expand Down
1 change: 1 addition & 0 deletions cmd/kubeadm/app/preflight/checks_windows.go
@@ -1,3 +1,4 @@
//go:build windows
// +build windows

/*
Expand Down
1 change: 1 addition & 0 deletions cmd/kubeadm/app/util/chroot_unix.go
@@ -1,3 +1,4 @@
//go:build !windows
// +build !windows

/*
Expand Down
1 change: 1 addition & 0 deletions cmd/kubeadm/app/util/chroot_windows.go
@@ -1,3 +1,4 @@
//go:build windows
// +build windows

/*
Expand Down
1 change: 1 addition & 0 deletions cmd/kubeadm/app/util/initsystem/initsystem_unix.go
@@ -1,3 +1,4 @@
//go:build !windows
// +build !windows

/*
Expand Down
1 change: 1 addition & 0 deletions cmd/kubeadm/app/util/initsystem/initsystem_windows.go
@@ -1,3 +1,4 @@
//go:build windows
// +build windows

/*
Expand Down
1 change: 1 addition & 0 deletions cmd/kubeadm/app/util/runtime/runtime_unix.go
@@ -1,3 +1,4 @@
//go:build !windows
// +build !windows

/*
Expand Down
1 change: 1 addition & 0 deletions cmd/kubeadm/app/util/runtime/runtime_windows.go
@@ -1,3 +1,4 @@
//go:build windows
// +build windows

/*
Expand Down
1 change: 1 addition & 0 deletions cmd/kubeadm/app/util/staticpod/utils_linux.go
@@ -1,3 +1,4 @@
//go:build linux
// +build linux

/*
Expand Down
1 change: 1 addition & 0 deletions cmd/kubeadm/app/util/staticpod/utils_linux_test.go
@@ -1,3 +1,4 @@
//go:build linux
// +build linux

/*
Expand Down
1 change: 1 addition & 0 deletions cmd/kubeadm/app/util/staticpod/utils_others.go
@@ -1,3 +1,4 @@
//go:build !linux
// +build !linux

/*
Expand Down
1 change: 1 addition & 0 deletions cmd/kubeadm/app/util/users/users_linux.go
@@ -1,3 +1,4 @@
//go:build linux
// +build linux

/*
Expand Down
1 change: 1 addition & 0 deletions cmd/kubeadm/app/util/users/users_linux_test.go
@@ -1,3 +1,4 @@
//go:build linux
// +build linux

/*
Expand Down
1 change: 1 addition & 0 deletions cmd/kubeadm/app/util/users/users_other.go
@@ -1,3 +1,4 @@
//go:build !linux
// +build !linux

/*
Expand Down
1 change: 1 addition & 0 deletions cmd/kubelet/app/init_others.go
@@ -1,3 +1,4 @@
//go:build !windows
// +build !windows

/*
Expand Down
1 change: 1 addition & 0 deletions cmd/kubelet/app/init_windows.go
@@ -1,3 +1,4 @@
//go:build windows
// +build windows

/*
Expand Down
1 change: 1 addition & 0 deletions cmd/kubelet/app/options/globalflags_linux.go
@@ -1,3 +1,4 @@
//go:build linux
// +build linux

/*
Expand Down
1 change: 1 addition & 0 deletions cmd/kubelet/app/options/globalflags_other.go
@@ -1,3 +1,4 @@
//go:build !linux
// +build !linux

/*
Expand Down
1 change: 1 addition & 0 deletions cmd/kubelet/app/options/globalflags_providerless.go
@@ -1,3 +1,4 @@
//go:build providerless
// +build providerless

/*
Expand Down