github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 04:33:26 +00:00
Code Issues Projects Releases Wiki Activity

[go1.15] Update to go1.15.5

Browse Source 
Signed-off-by: Stephen Augustus <saugustus@vmware.com>
This commit is contained in:
Stephen Augustus 2020-10-21 17:45:43 -04:00
parent 1c89ce14c0
commit 2407a70cc7
6 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/build-image/cross/VERSION
View File

@ -1 +1 @@
v1.15.2-1 v1.15.5-1

6
build/dependencies.yaml
View File

@ -99,18 +99,20 @@ dependencies:
# Golang # Golang
- name: "golang: upstream version" - name: "golang: upstream version"
version: 1.15.2 version: 1.15.5
refPaths: refPaths:
- path: build/build-image/cross/VERSION - path: build/build-image/cross/VERSION
- path: build/root/WORKSPACE - path: build/root/WORKSPACE
match: (override_)?go_version = "\d+.\d+(alpha|beta|rc)?\.?\d+" match: (override_)?go_version = "\d+.\d+(alpha|beta|rc)?\.?\d+"
- path: cluster/addons/fluentd-elasticsearch/es-image/Dockerfile
match: 'FROM golang\:\d+.\d+(alpha|beta|rc)?\.?(\d+)?'
- 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+
- 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+)?'
- name: "k8s.gcr.io/kube-cross: dependents" - name: "k8s.gcr.io/kube-cross: dependents"
version: v1.15.2-1 version: v1.15.5-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

2
build/root/WORKSPACE
View File

@ -23,7 +23,7 @@ load("@io_k8s_repo_infra//:repos.bzl", repo_infra_configure = "configure", repo_
# 'override_go_version': used to specify an alternate go version provided # 'override_go_version': used to specify an alternate go version provided
# by kubernetes/repo-infra # by kubernetes/repo-infra
repo_infra_configure( repo_infra_configure(
go_version = "1.15.2", go_version = "1.15.5",
minimum_bazel_version = "2.2.0", minimum_bazel_version = "2.2.0",
) )

2
cluster/addons/fluentd-elasticsearch/es-image/Dockerfile
View File

@ -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.3 AS builder FROM golang:1.15.5 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

2
test/images/Makefile
View File

@ -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.2 GOLANG_VERSION=1.15.5
export export
ifndef WHAT ifndef WHAT

2
test/images/sample-apiserver/Makefile
View File

@ -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 -it -v "${TARGET}:${TARGET}:Z" k8s.gcr.io/build-image/kube-cross:v1.15.2-1 \ docker run --rm -it -v "${TARGET}:${TARGET}:Z" k8s.gcr.io/build-image/kube-cross:v1.15.5-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 && \