mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-20 10:20:51 +00:00
[go1.17] Update to go1.17
Signed-off-by: Stephen Augustus <foo@auggie.dev>
This commit is contained in:
parent
e1bfcbc873
commit
e8d2bff6ba
@ -1 +1 @@
|
|||||||
v1.16.7-1
|
v1.23.0-go1.17-buster.0
|
||||||
|
@ -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=buster-v1.6.6
|
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
|
readonly __default_setcap_version=buster-v2.0.4
|
||||||
|
|
||||||
# These are the base images for the Docker-wrapped binaries.
|
# These are the base images for the Docker-wrapped binaries.
|
||||||
|
@ -85,7 +85,7 @@ dependencies:
|
|||||||
|
|
||||||
# Golang
|
# Golang
|
||||||
- name: "golang: upstream version"
|
- name: "golang: upstream version"
|
||||||
version: 1.16.7
|
version: 1.17
|
||||||
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
|
||||||
@ -97,20 +97,20 @@ dependencies:
|
|||||||
- path: test/images/Makefile
|
- path: test/images/Makefile
|
||||||
match: GOLANG_VERSION=\d+.\d+(alpha|beta|rc)?\.?\d+
|
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
|
# Example: go1.16rc1
|
||||||
#
|
#
|
||||||
# This entry is a stub of the major and minor version to allow dependency
|
# This entry is a stub of the major version to allow dependency checks to
|
||||||
# checks to pass when building Kubernetes using a pre-release of Golang.
|
# pass when building Kubernetes using a pre-release of Golang.
|
||||||
- name: "golang: <major>.<minor>"
|
- name: "golang: 1.<major>"
|
||||||
version: 1.16
|
version: 1.17
|
||||||
refPaths:
|
refPaths:
|
||||||
- path: build/build-image/cross/VERSION
|
- path: build/build-image/cross/VERSION
|
||||||
- path: hack/lib/golang.sh
|
- path: hack/lib/golang.sh
|
||||||
match: minimum_go_version=go([0-9]+\.[0-9]+)
|
match: minimum_go_version=go([0-9]+\.[0-9]+)
|
||||||
|
|
||||||
- name: "k8s.gcr.io/kube-cross: dependents"
|
- name: "k8s.gcr.io/kube-cross: dependents"
|
||||||
version: v1.16.7-1
|
version: v1.23.0-go1.17-buster.0
|
||||||
refPaths:
|
refPaths:
|
||||||
- path: build/build-image/cross/VERSION
|
- path: build/build-image/cross/VERSION
|
||||||
|
|
||||||
@ -138,7 +138,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.16.7-buster.0
|
version: v2.3.1-go1.17-buster.0
|
||||||
refPaths:
|
refPaths:
|
||||||
- path: build/common.sh
|
- path: build/common.sh
|
||||||
match: __default_go_runner_version=
|
match: __default_go_runner_version=
|
||||||
|
@ -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.16.7 AS builder
|
FROM golang:1.17 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
|
||||||
|
|
||||||
|
@ -478,7 +478,7 @@ EOF
|
|||||||
local go_version
|
local go_version
|
||||||
IFS=" " read -ra go_version <<< "$(GOFLAGS='' go version)"
|
IFS=" " read -ra go_version <<< "$(GOFLAGS='' go version)"
|
||||||
local minimum_go_version
|
local minimum_go_version
|
||||||
minimum_go_version=go1.16.0
|
minimum_go_version=go1.17.0
|
||||||
if [[ "${minimum_go_version}" != $(echo -e "${minimum_go_version}\n${go_version[2]}" | sort -s -t. -k 1,1 -k 2,2n -k 3,3n | head -n1) && "${go_version[2]}" != "devel" ]]; then
|
if [[ "${minimum_go_version}" != $(echo -e "${minimum_go_version}\n${go_version[2]}" | sort -s -t. -k 1,1 -k 2,2n -k 3,3n | head -n1) && "${go_version[2]}" != "devel" ]]; then
|
||||||
kube::log::usage_from_stdin <<EOF
|
kube::log::usage_from_stdin <<EOF
|
||||||
Detected go version: ${go_version[*]}.
|
Detected go version: ${go_version[*]}.
|
||||||
|
@ -7,7 +7,7 @@ recursive-delete-patterns:
|
|||||||
- BUILD.bazel
|
- BUILD.bazel
|
||||||
- "*/BUILD.bazel"
|
- "*/BUILD.bazel"
|
||||||
- Gopkg.toml
|
- Gopkg.toml
|
||||||
default-go-version: 1.16.7
|
default-go-version: 1.17
|
||||||
rules:
|
rules:
|
||||||
- destination: code-generator
|
- destination: code-generator
|
||||||
branches:
|
branches:
|
||||||
|
@ -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.16.7
|
GOLANG_VERSION=1.17
|
||||||
export
|
export
|
||||||
|
|
||||||
ifndef WHAT
|
ifndef WHAT
|
||||||
|
Loading…
Reference in New Issue
Block a user