Skip to content

Commit 695c306

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#82809 from liggitt/go-1.13-no-modules
update to use go1.13.4
2 parents e328029 + 297570e commit 695c306

File tree

949 files changed

+77192
-28178
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

949 files changed

+77192
-28178
lines changed

‎build/build-image/cross/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# This file creates a standard build environment for building cross
1616
# platform go binary for the architecture kubernetes cares about.
1717

18-
FROM golang:1.12.12
18+
FROM golang:1.13.4
1919

2020
ENV GOARM 7
2121
ENV KUBE_DYNAMIC_CROSSPLATFORMS \

‎build/build-image/cross/VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v1.12.12-1
1+
v1.13.4-1

‎build/dependencies.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ dependencies:
3434

3535

3636
- name: "golang"
37-
version: 1.12.12
37+
version: 1.13.4
3838
refPaths:
3939
- path: build/build-image/cross/Dockerfile
4040
match: "golang:"

‎build/root/WORKSPACE‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,16 @@ http_archive(
4444

4545
http_archive(
4646
name = "io_bazel_rules_go",
47-
sha256 = "b480589f57e8b09f4b0892437b9afe889e0d6660e92f5d53d3f0546c01e67ca5",
48-
urls = mirror("https://github.com/bazelbuild/rules_go/releases/download/v0.19.7/rules_go-v0.19.7.tar.gz"),
47+
sha256 = "9976c2572587aa71f81b502cc870ef8058f6de37f5fcfaade6a5996934b4a324",
48+
urls = mirror("https://github.com/bazelbuild/rules_go/releases/download/v0.19.8/rules_go-v0.19.8.tar.gz"),
4949
)
5050

5151
load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
5252

5353
go_rules_dependencies()
5454

5555
go_register_toolchains(
56-
go_version = "1.12.12",
56+
go_version = "1.13.4",
5757
)
5858

5959
http_archive(

‎build/tools.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,5 @@ import (
3737
_ "k8s.io/gengo/examples/import-boss/generators"
3838
_ "k8s.io/gengo/examples/set-gen/generators"
3939
_ "k8s.io/kube-openapi/cmd/openapi-gen"
40-
_ "k8s.io/repo-infra/kazel"
40+
_ "k8s.io/repo-infra/cmd/kazel"
4141
)

‎cmd/kube-proxy/app/BUILD‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,13 @@ go_library(
104104
"//staging/src/k8s.io/apimachinery/pkg/util/net:go_default_library",
105105
"//vendor/k8s.io/utils/net:go_default_library",
106106
],
107+
"@io_bazel_rules_go//go/platform:ios": [
108+
"//pkg/proxy/metrics:go_default_library",
109+
"//pkg/util/node:go_default_library",
110+
"//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
111+
"//staging/src/k8s.io/apimachinery/pkg/util/net:go_default_library",
112+
"//vendor/k8s.io/utils/net:go_default_library",
113+
],
107114
"@io_bazel_rules_go//go/platform:linux": [
108115
"//pkg/proxy/metrics:go_default_library",
109116
"//pkg/util/node:go_default_library",
@@ -187,6 +194,9 @@ go_test(
187194
"@io_bazel_rules_go//go/platform:freebsd": [
188195
"//pkg/proxy/ipvs:go_default_library",
189196
],
197+
"@io_bazel_rules_go//go/platform:ios": [
198+
"//pkg/proxy/ipvs:go_default_library",
199+
],
190200
"@io_bazel_rules_go//go/platform:linux": [
191201
"//pkg/proxy/ipvs:go_default_library",
192202
],

‎cmd/kubeadm/app/preflight/BUILD‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ go_library(
3434
"//vendor/k8s.io/utils/exec:go_default_library",
3535
"//vendor/k8s.io/utils/net:go_default_library",
3636
] + select({
37+
"@io_bazel_rules_go//go/platform:android": [
38+
"//cmd/kubeadm/app/util:go_default_library",
39+
],
3740
"@io_bazel_rules_go//go/platform:linux": [
3841
"//cmd/kubeadm/app/util:go_default_library",
3942
],

‎cmd/kubelet/app/BUILD‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,9 @@ go_library(
146146
"//vendor/k8s.io/klog:go_default_library",
147147
"//vendor/k8s.io/utils/exec:go_default_library",
148148
] + select({
149+
"@io_bazel_rules_go//go/platform:android": [
150+
"//vendor/k8s.io/utils/inotify:go_default_library",
151+
],
149152
"@io_bazel_rules_go//go/platform:linux": [
150153
"//vendor/k8s.io/utils/inotify:go_default_library",
151154
],

‎cmd/kubelet/app/options/BUILD‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,15 @@ go_library(
4242
"//vendor/github.com/spf13/pflag:go_default_library",
4343
"//vendor/k8s.io/klog:go_default_library",
4444
] + select({
45+
"@io_bazel_rules_go//go/platform:android": [
46+
"//vendor/github.com/google/cadvisor/container/common:go_default_library",
47+
"//vendor/github.com/google/cadvisor/container/containerd:go_default_library",
48+
"//vendor/github.com/google/cadvisor/container/docker:go_default_library",
49+
"//vendor/github.com/google/cadvisor/container/raw:go_default_library",
50+
"//vendor/github.com/google/cadvisor/machine:go_default_library",
51+
"//vendor/github.com/google/cadvisor/manager:go_default_library",
52+
"//vendor/github.com/google/cadvisor/storage:go_default_library",
53+
],
4554
"@io_bazel_rules_go//go/platform:linux": [
4655
"//vendor/github.com/google/cadvisor/container/common:go_default_library",
4756
"//vendor/github.com/google/cadvisor/container/containerd:go_default_library",

‎go.mod‎

Lines changed: 98 additions & 30 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)