mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-30 15:05:27 +00:00
Merge pull request #95776 from justaugustus/go115
[go1.15] Update to go1.15.5
This commit is contained in:
Kubernetes Prow Robot
GitHub
commit
ad2bf99f9b
@ -1 +1 @@
|
||||
v1.15.2-1
|
||||
v1.15.5-1
|
||||
|
||||
@ -94,7 +94,7 @@ readonly KUBE_CONTAINER_RSYNC_PORT=8730
|
||||
# $1 - server architecture
|
||||
kube::build::get_docker_wrapped_binaries() {
|
||||
local debian_iptables_version=buster-v1.3.0
|
||||
local go_runner_version=buster-v2.0.1
|
||||
local go_runner_version=buster-v2.2.2
|
||||
### If you change any of these lists, please also update DOCKERIZED_BINARIES
|
||||
### in build/BUILD. And kube::golang::server_image_targets
|
||||
local targets=(
|
||||
|
||||
@ -17,7 +17,7 @@ dependencies:
|
||||
|
||||
# Bazel
|
||||
- name: "repo-infra"
|
||||
version: 0.1.1
|
||||
version: 0.1.3
|
||||
refPaths:
|
||||
- path: build/root/WORKSPACE
|
||||
match: strip_prefix = "repo-infra-\d+.\d+.\d+"
|
||||
@ -99,18 +99,20 @@ dependencies:
|
||||
|
||||
# Golang
|
||||
- name: "golang: upstream version"
|
||||
version: 1.15.2
|
||||
version: 1.15.5
|
||||
refPaths:
|
||||
- path: build/build-image/cross/VERSION
|
||||
- path: build/root/WORKSPACE
|
||||
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
|
||||
match: GOLANG_VERSION=\d+.\d+(alpha|beta|rc)?\.?\d+
|
||||
- path: staging/publishing/rules.yaml
|
||||
match: 'default-go-version\: \d+.\d+(alpha|beta|rc)?\.?(\d+)?'
|
||||
|
||||
- name: "k8s.gcr.io/kube-cross: dependents"
|
||||
version: v1.15.2-1
|
||||
version: v1.15.5-1
|
||||
refPaths:
|
||||
- path: build/build-image/cross/VERSION
|
||||
- path: test/images/sample-apiserver/Makefile
|
||||
@ -144,7 +146,7 @@ dependencies:
|
||||
match: configs\[DebianIptables\] = Config{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: buster-v2.0.1
|
||||
version: buster-v2.2.2
|
||||
refPaths:
|
||||
- path: build/common.sh
|
||||
match: go_runner_version=
|
||||
|
||||
@ -5,10 +5,10 @@ load("//build:workspace_mirror.bzl", "mirror")
|
||||
|
||||
http_archive(
|
||||
name = "io_k8s_repo_infra",
|
||||
strip_prefix = "repo-infra-0.1.1",
|
||||
sha256 = "6c916da43b701e2947f147f3791b3355d8a342dd6cb81887b7d6db184879e387",
|
||||
strip_prefix = "repo-infra-0.1.3",
|
||||
sha256 = "46933bedbd22bc6a26ec6116d0d3e1475ad6b23447648d19abd6493241323311",
|
||||
urls = [
|
||||
"https://github.com/kubernetes/repo-infra/archive/v0.1.1.tar.gz",
|
||||
"https://github.com/kubernetes/repo-infra/archive/v0.1.3.tar.gz",
|
||||
],
|
||||
)
|
||||
|
||||
@ -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
|
||||
# by kubernetes/repo-infra
|
||||
repo_infra_configure(
|
||||
go_version = "1.15.2",
|
||||
go_version = "1.15.5",
|
||||
minimum_bazel_version = "2.2.0",
|
||||
)
|
||||
|
||||
|
||||
@ -102,15 +102,15 @@ _DEBIAN_IPTABLES_DIGEST = {
|
||||
# Use skopeo to find these values: https://github.com/containers/skopeo
|
||||
#
|
||||
# Example
|
||||
# Manifest: skopeo inspect docker://gcr.io/k8s-staging-build-image/go-runner:buster-v2.0.1
|
||||
# Arches: skopeo inspect --raw docker://gcr.io/k8s-staging-build-image/go-runner:buster-v2.0.1
|
||||
# Manifest: skopeo inspect docker://gcr.io/k8s-staging-build-image/go-runner:buster-v2.2.2
|
||||
# Arches: skopeo inspect --raw docker://gcr.io/k8s-staging-build-image/go-runner:buster-v2.2.2
|
||||
_GO_RUNNER_DIGEST = {
|
||||
"manifest": "sha256:687c17db2f5cd4aea13faa7ae56bee639a5b11f380c431a9800205624f53541c",
|
||||
"amd64": "sha256:b02bdb3444b1e7fb14cb5b60174f0e8f0a087ff4c294352e6c31c17da99a4ee2",
|
||||
"arm": "sha256:0d7563c814c0cd88bc5937b6e606d266409b5b7cee2deb6c04c6dcb6d7daaa5d",
|
||||
"arm64": "sha256:78f42645ddfd2ab9dfc4053834aa0042c82c8c550f9f61a2a76fd9f1791e5308",
|
||||
"ppc64le": "sha256:93e3ca63df801a5c1ad15bdbb9c50fa38e5db3479a92d8f4516c00dfd736f227",
|
||||
"s390x": "sha256:d7ed7bd8d58a6570504f14a50d502c2df97f944378f9f5306519f3379cb92fe2",
|
||||
"manifest": "sha256:384e84aa715aed583798a77b92b78747f786f238a3bf9a43419d80029ecb3cf8",
|
||||
"amd64": "sha256:38f0621075389afe17c29f60715123469b5ee9aa18a34532eca3613e945486cb",
|
||||
"arm": "sha256:2e70823f577cb81a22f5974d276171568bd71dd0407b0bd46f4c66d8fc46a3b7",
|
||||
"arm64": "sha256:c69c669947d5b60ce4e64069b24c9021799f8354521a7d0cbff68adc96db8726",
|
||||
"ppc64le": "sha256:1a794556fafbc240a3ea5c8a0b42b63c6a3f4ef157b5120c6c10e934b70a6d63",
|
||||
"s390x": "sha256:ff594a58928755e3fdb1c8e25d453515adfce01b6c9035f9ffc01015c886f82d",
|
||||
}
|
||||
|
||||
def _digest(d, arch):
|
||||
@ -127,7 +127,7 @@ def image_dependencies():
|
||||
digest = _digest(_GO_RUNNER_DIGEST, arch),
|
||||
registry = "k8s.gcr.io/build-image",
|
||||
repository = "go-runner",
|
||||
tag = "buster-v2.0.1", # ignored, but kept here for documentation
|
||||
tag = "buster-v2.2.2", # ignored, but kept here for documentation
|
||||
)
|
||||
|
||||
container_pull(
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# 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 /
|
||||
RUN CGO_ENABLED=0 GOOS=linux GO111MODULE=on go build -a -ldflags "-w" -o /elasticsearch_logging_discovery /elasticsearch_logging_discovery.go
|
||||
|
||||
|
||||
@ -12,5 +12,5 @@ require (
|
||||
gotest.tools v2.2.0+incompatible
|
||||
gotest.tools/gotestsum v0.3.5
|
||||
honnef.co/go/tools v0.0.1-2020.1.4
|
||||
k8s.io/repo-infra v0.1.1
|
||||
k8s.io/repo-infra v0.1.3
|
||||
)
|
||||
|
||||
@ -713,8 +713,8 @@ honnef.co/go/tools v0.0.1-2020.1.4 h1:UoveltGrhghAA7ePc+e+QYDHXrBps2PqFZiHkGR/xK
|
||||
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
|
||||
k8s.io/klog/v2 v2.3.0 h1:WmkrnW7fdrm0/DMClc+HIxtftvxVIPAhlVwMQo5yLco=
|
||||
k8s.io/klog/v2 v2.3.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
|
||||
k8s.io/repo-infra v0.1.1 h1:gGVxusj+TfqEQmLQGg3bzhpQlHrB0RSVM94HyU7Jg9I=
|
||||
k8s.io/repo-infra v0.1.1/go.mod h1:WfvjbUCy0f1fsyHq6sF825VYMfAh9pQdkYCa35OZRJc=
|
||||
k8s.io/repo-infra v0.1.3 h1:+HpCvZOn7aOSSZLbrp03fTd5V9VmPcucUm7Cu2bES1w=
|
||||
k8s.io/repo-infra v0.1.3/go.mod h1:WfvjbUCy0f1fsyHq6sF825VYMfAh9pQdkYCa35OZRJc=
|
||||
mvdan.cc/gofumpt v0.0.0-20200709182408-4fd085cb6d5f/go.mod h1:9VQ397fNXEnF84t90W4r4TRCQK+pg9f8ugVfyj+S26w=
|
||||
mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed h1:WX1yoOaKQfddO/mLzdV4wptyWgoH/6hwLs7QHTixo0I=
|
||||
mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed/go.mod h1:Xkxe497xwlCKkIaQYRfC7CSLworTXY9RMqwhhCm+8Nc=
|
||||
|
||||
@ -4,7 +4,7 @@ recursive-delete-patterns:
|
||||
- BUILD.bazel
|
||||
- "*/BUILD.bazel"
|
||||
- Gopkg.toml
|
||||
default-go-version: 1.15.2
|
||||
default-go-version: 1.15.5
|
||||
rules:
|
||||
- destination: code-generator
|
||||
branches:
|
||||
@ -26,7 +26,7 @@ rules:
|
||||
branch: release-1.19
|
||||
dir: staging/src/k8s.io/code-generator
|
||||
name: release-1.19
|
||||
go: 1.15.2
|
||||
go: 1.15.5
|
||||
|
||||
- destination: apimachinery
|
||||
library: true
|
||||
@ -49,7 +49,7 @@ rules:
|
||||
branch: release-1.19
|
||||
dir: staging/src/k8s.io/apimachinery
|
||||
name: release-1.19
|
||||
go: 1.15.2
|
||||
go: 1.15.5
|
||||
|
||||
- destination: api
|
||||
library: true
|
||||
@ -81,7 +81,7 @@ rules:
|
||||
branch: release-1.19
|
||||
dir: staging/src/k8s.io/api
|
||||
name: release-1.19
|
||||
go: 1.15.2
|
||||
go: 1.15.5
|
||||
dependencies:
|
||||
- repository: apimachinery
|
||||
branch: release-1.19
|
||||
@ -122,7 +122,7 @@ rules:
|
||||
branch: release-1.19
|
||||
dir: staging/src/k8s.io/client-go
|
||||
name: release-1.19
|
||||
go: 1.15.2
|
||||
go: 1.15.5
|
||||
dependencies:
|
||||
- repository: apimachinery
|
||||
branch: release-1.19
|
||||
@ -175,7 +175,7 @@ rules:
|
||||
branch: release-1.19
|
||||
dir: staging/src/k8s.io/component-base
|
||||
name: release-1.19
|
||||
go: 1.15.2
|
||||
go: 1.15.5
|
||||
dependencies:
|
||||
- repository: apimachinery
|
||||
branch: release-1.19
|
||||
@ -247,7 +247,7 @@ rules:
|
||||
branch: release-1.19
|
||||
dir: staging/src/k8s.io/apiserver
|
||||
name: release-1.19
|
||||
go: 1.15.2
|
||||
go: 1.15.5
|
||||
dependencies:
|
||||
- repository: apimachinery
|
||||
branch: release-1.19
|
||||
@ -317,7 +317,7 @@ rules:
|
||||
branch: release-1.19
|
||||
dir: staging/src/k8s.io/kube-aggregator
|
||||
name: release-1.19
|
||||
go: 1.15.2
|
||||
go: 1.15.5
|
||||
dependencies:
|
||||
- repository: apimachinery
|
||||
branch: release-1.19
|
||||
@ -397,7 +397,7 @@ rules:
|
||||
branch: release-1.19
|
||||
dir: staging/src/k8s.io/sample-apiserver
|
||||
name: release-1.19
|
||||
go: 1.15.2
|
||||
go: 1.15.5
|
||||
dependencies:
|
||||
- repository: apimachinery
|
||||
branch: release-1.19
|
||||
@ -470,7 +470,7 @@ rules:
|
||||
branch: release-1.19
|
||||
dir: staging/src/k8s.io/sample-controller
|
||||
name: release-1.19
|
||||
go: 1.15.2
|
||||
go: 1.15.5
|
||||
dependencies:
|
||||
- repository: apimachinery
|
||||
branch: release-1.19
|
||||
@ -551,7 +551,7 @@ rules:
|
||||
branch: release-1.19
|
||||
dir: staging/src/k8s.io/apiextensions-apiserver
|
||||
name: release-1.19
|
||||
go: 1.15.2
|
||||
go: 1.15.5
|
||||
dependencies:
|
||||
- repository: apimachinery
|
||||
branch: release-1.19
|
||||
@ -616,7 +616,7 @@ rules:
|
||||
branch: release-1.19
|
||||
dir: staging/src/k8s.io/metrics
|
||||
name: release-1.19
|
||||
go: 1.15.2
|
||||
go: 1.15.5
|
||||
dependencies:
|
||||
- repository: apimachinery
|
||||
branch: release-1.19
|
||||
@ -669,7 +669,7 @@ rules:
|
||||
branch: release-1.19
|
||||
dir: staging/src/k8s.io/cli-runtime
|
||||
name: release-1.19
|
||||
go: 1.15.2
|
||||
go: 1.15.5
|
||||
dependencies:
|
||||
- repository: api
|
||||
branch: release-1.19
|
||||
@ -726,7 +726,7 @@ rules:
|
||||
branch: release-1.19
|
||||
dir: staging/src/k8s.io/sample-cli-plugin
|
||||
name: release-1.19
|
||||
go: 1.15.2
|
||||
go: 1.15.5
|
||||
dependencies:
|
||||
- repository: api
|
||||
branch: release-1.19
|
||||
@ -785,7 +785,7 @@ rules:
|
||||
branch: release-1.19
|
||||
dir: staging/src/k8s.io/kube-proxy
|
||||
name: release-1.19
|
||||
go: 1.15.2
|
||||
go: 1.15.5
|
||||
dependencies:
|
||||
- repository: apimachinery
|
||||
branch: release-1.19
|
||||
@ -836,7 +836,7 @@ rules:
|
||||
branch: release-1.19
|
||||
dir: staging/src/k8s.io/kubelet
|
||||
name: release-1.19
|
||||
go: 1.15.2
|
||||
go: 1.15.5
|
||||
dependencies:
|
||||
- repository: apimachinery
|
||||
branch: release-1.19
|
||||
@ -895,7 +895,7 @@ rules:
|
||||
branch: release-1.19
|
||||
dir: staging/src/k8s.io/kube-scheduler
|
||||
name: release-1.19
|
||||
go: 1.15.2
|
||||
go: 1.15.5
|
||||
dependencies:
|
||||
- repository: apimachinery
|
||||
branch: release-1.19
|
||||
@ -928,7 +928,7 @@ rules:
|
||||
branch: release-1.19
|
||||
dir: staging/src/k8s.io/controller-manager
|
||||
name: release-1.19
|
||||
go: 1.15.2
|
||||
go: 1.15.5
|
||||
|
||||
- destination: cloud-provider
|
||||
library: true
|
||||
@ -978,7 +978,7 @@ rules:
|
||||
branch: release-1.19
|
||||
dir: staging/src/k8s.io/cloud-provider
|
||||
name: release-1.19
|
||||
go: 1.15.2
|
||||
go: 1.15.5
|
||||
dependencies:
|
||||
- repository: api
|
||||
branch: release-1.19
|
||||
@ -1043,7 +1043,7 @@ rules:
|
||||
branch: release-1.19
|
||||
dir: staging/src/k8s.io/kube-controller-manager
|
||||
name: release-1.19
|
||||
go: 1.15.2
|
||||
go: 1.15.5
|
||||
dependencies:
|
||||
- repository: apimachinery
|
||||
branch: release-1.19
|
||||
@ -1090,7 +1090,7 @@ rules:
|
||||
branch: release-1.19
|
||||
dir: staging/src/k8s.io/cluster-bootstrap
|
||||
name: release-1.19
|
||||
go: 1.15.2
|
||||
go: 1.15.5
|
||||
dependencies:
|
||||
- repository: apimachinery
|
||||
branch: release-1.19
|
||||
@ -1141,7 +1141,7 @@ rules:
|
||||
branch: release-1.19
|
||||
dir: staging/src/k8s.io/csi-translation-lib
|
||||
name: release-1.19
|
||||
go: 1.15.2
|
||||
go: 1.15.5
|
||||
dependencies:
|
||||
- repository: api
|
||||
branch: release-1.19
|
||||
@ -1222,7 +1222,7 @@ rules:
|
||||
branch: release-1.19
|
||||
dir: staging/src/k8s.io/legacy-cloud-providers
|
||||
name: release-1.19
|
||||
go: 1.15.2
|
||||
go: 1.15.5
|
||||
dependencies:
|
||||
- repository: api
|
||||
branch: release-1.19
|
||||
@ -1278,7 +1278,7 @@ rules:
|
||||
branch: release-1.19
|
||||
dir: staging/src/k8s.io/cri-api
|
||||
name: release-1.19
|
||||
go: 1.15.2
|
||||
go: 1.15.5
|
||||
|
||||
- destination: kubectl
|
||||
library: true
|
||||
@ -1348,7 +1348,7 @@ rules:
|
||||
branch: release-1.19
|
||||
dir: staging/src/k8s.io/kubectl
|
||||
name: release-1.19
|
||||
go: 1.15.2
|
||||
go: 1.15.5
|
||||
dependencies:
|
||||
- repository: api
|
||||
branch: release-1.19
|
||||
|
||||
@ -16,7 +16,7 @@ REGISTRY ?= gcr.io/kubernetes-e2e-test-images
|
||||
GOARM ?= 7
|
||||
DOCKER_CERT_BASE_PATH ?=
|
||||
QEMUVERSION=v5.1.0-2
|
||||
GOLANG_VERSION=1.15.2
|
||||
GOLANG_VERSION=1.15.5
|
||||
export
|
||||
|
||||
ifndef WHAT
|
||||
|
||||
@ -24,7 +24,7 @@ export
|
||||
# Get without building to populate module cache
|
||||
# Then, get with OS/ARCH-specific env to build
|
||||
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 "\
|
||||
mkdir -p /go/src /go/bin && \
|
||||
GO111MODULE=on go get -d k8s.io/sample-apiserver@v0.17.0 && \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user