mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-20 18:31:15 +00:00
[go1.16] Update to go1.16
Signed-off-by: Stephen Augustus <foo@auggie.dev>
This commit is contained in:
parent
ef47564f46
commit
274133fe11
@ -1 +1 @@
|
|||||||
v1.15.8-1
|
v1.16.0-1
|
||||||
|
@ -101,7 +101,7 @@ dependencies:
|
|||||||
|
|
||||||
# Golang
|
# Golang
|
||||||
- name: "golang: upstream version"
|
- name: "golang: upstream version"
|
||||||
version: 1.15.8
|
version: 1.16
|
||||||
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
|
||||||
@ -111,8 +111,18 @@ dependencies:
|
|||||||
- path: staging/publishing/rules.yaml
|
- path: staging/publishing/rules.yaml
|
||||||
match: 'default-go-version\: \d+.\d+(alpha|beta|rc)?\.?(\d+)?'
|
match: 'default-go-version\: \d+.\d+(alpha|beta|rc)?\.?(\d+)?'
|
||||||
|
|
||||||
|
# Golang pre-releases are denoted as `1.y<pre-release stage>.z`
|
||||||
|
# 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
|
||||||
|
refPaths:
|
||||||
|
- path: build/build-image/cross/VERSION
|
||||||
|
|
||||||
- name: "k8s.gcr.io/kube-cross: dependents"
|
- name: "k8s.gcr.io/kube-cross: dependents"
|
||||||
version: v1.15.8-1
|
version: v1.16.0-1
|
||||||
refPaths:
|
refPaths:
|
||||||
- path: build/build-image/cross/VERSION
|
- path: build/build-image/cross/VERSION
|
||||||
- path: test/images/sample-apiserver/Makefile
|
- path: test/images/sample-apiserver/Makefile
|
||||||
|
@ -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.15.8 AS builder
|
FROM golang:1.16 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
|
||||||
|
|
||||||
|
@ -16,7 +16,7 @@ REGISTRY ?= gcr.io/kubernetes-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.15.8
|
GOLANG_VERSION=1.16
|
||||||
export
|
export
|
||||||
|
|
||||||
ifndef WHAT
|
ifndef WHAT
|
||||||
|
@ -24,7 +24,7 @@ export
|
|||||||
# Get without building to populate module cache
|
# Get without building to populate module cache
|
||||||
# Then, get with OS/ARCH-specific env to build
|
# Then, get with OS/ARCH-specific env to build
|
||||||
bin:
|
bin:
|
||||||
docker run --rm -i -v "${TARGET}:${TARGET}:Z" k8s.gcr.io/build-image/kube-cross:v1.15.8-1 \
|
docker run --rm -i -v "${TARGET}:${TARGET}:Z" k8s.gcr.io/build-image/kube-cross:v1.16.0-1 \
|
||||||
/bin/bash -c "\
|
/bin/bash -c "\
|
||||||
mkdir -p /go/src /go/bin && \
|
mkdir -p /go/src /go/bin && \
|
||||||
GO111MODULE=on go get -d k8s.io/sample-apiserver@v0.17.0 && \
|
GO111MODULE=on go get -d k8s.io/sample-apiserver@v0.17.0 && \
|
||||||
|
Loading…
Reference in New Issue
Block a user