third_party/go: bump kubernetes to 1.19.3

Change-Id: Id9245765936997088e94135fde409ff4c1539bba
changes/95/495/1
q3k 2020-11-03 19:34:42 +01:00
parent 99ce53c79a
commit c3f36e9bf1
4 changed files with 99 additions and 24 deletions

0
third_party/go/kubernetes/BUILD vendored Normal file
View File

12
third_party/go/kubernetes/build.patch vendored Normal file
View File

@ -0,0 +1,12 @@
diff -ur io_k8s_kubernetes.orig/cmd/kubectl/BUILD io_k8s_kubernetes/cmd/kubectl/BUILD
--- io_k8s_kubernetes.orig/cmd/kubectl/BUILD 2020-11-03 19:03:44.743068034 +0100
+++ io_k8s_kubernetes/cmd/kubectl/BUILD 2020-11-03 19:06:34.078298939 +0100
@@ -3,7 +3,7 @@
"go_binary",
"go_library",
)
-load("//staging/src/k8s.io/component-base/version:def.bzl", "version_x_defs")
+load("@hscloud//third_party/go/kubernetes:version.bzl", "version_x_defs")
go_binary(
name = "kubectl",

23
third_party/go/kubernetes/version.bzl vendored Normal file
View File

@ -0,0 +1,23 @@
def version_x_defs():
stamp_pkgs = [
"k8s.io/component-base/version",
"k8s.io/client-go/pkg/version",
]
# This should match the list of vars in kube::version::ldflags
# It should also match the list of vars set in hack/print-workspace-status.sh.
stamp_vars = [
"buildDate",
"gitCommit",
"gitMajor",
"gitMinor",
"gitTreeState",
"gitVersion",
]
# Generate the cross-product.
x_defs = {}
for pkg in stamp_pkgs:
for var in stamp_vars:
x_defs["%s.%s" % (pkg, var)] = "{%s}" % var
return x_defs

View File

@ -10,10 +10,10 @@ def go_repositories():
go_repository(
name = "io_k8s_kubernetes",
importpath = "k8s.io/kubernetes",
# Get from HTTP instead, this repository is _big_
urls = ["https://github.com/kubernetes/kubernetes/archive/v1.16.0.tar.gz"],
sha256 = "a8b2ee84ce38fa14404d7e56daa87aa2f2fb13e0114fb1150f294c992ab3f36c",
strip_prefix = "kubernetes-1.16.0",
patch_args = ["-p1"],
patches = ["//third_party/go/kubernetes:build.patch"],
sum = "h1:V6ohBHSxTkrPRyfVp8tbdEsgi9nfVN49xlUVkQseass=",
version = "v1.19.3",
)
go_repository(
@ -26,7 +26,7 @@ def go_repositories():
name = "com_github_bitnami_kubecfg",
importpath = "github.com/bitnami/kubecfg",
vcs = "git",
commit = "dddf366990f581132cd046c723d73a2357de2dc8",
commit = "b6817a94492c561ed61a44eeea2d92dcf2e6b8c0",
remote = "https://github.com/q3k/kubecfg",
)
@ -246,27 +246,30 @@ def go_repositories():
go_repository(
name = "io_k8s_client_go",
commit = "0a8a1d7b7fae",
importpath = "k8s.io/client-go",
build_extra_args = [
"-known_import=github.com/Azure/go-autorest",
"-known_import=github.com/googleapis/gnostic",
],
importpath = "k8s.io/client-go",
sum = "h1:ctqR1nQ52NUs6LpI0w+a5U+xjYwflFwA13OJKcicMxg=",
version = "v0.19.3",
)
go_repository(
name = "io_k8s_apimachinery",
build_file_proto_mode = "disable",
commit = "731dcecc205498f52a21b12e311af095efb4b188",
importpath = "k8s.io/apimachinery",
patches = ["//third_party/go/k8s-apimachinery:fix-kubernetes-bug-87675.patch"],
patch_args = ["-p1"],
patches = ["//third_party/go/k8s-apimachinery:fix-kubernetes-bug-87675.patch"],
sum = "h1:bpIQXlKjB4cB/oNpnNnV+BybGPR7iP5oYpsOTEJ4hgc=",
version = "v0.19.3",
)
go_repository(
name = "io_k8s_klog",
importpath = "k8s.io/klog",
tag = "v1.0.0",
sum = "h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=",
version = "v1.0.0",
)
go_repository(
@ -277,17 +280,19 @@ def go_repositories():
go_repository(
name = "com_github_googleapis_gnostic",
commit = "15cf44e552f9",
importpath = "github.com/googleapis/gnostic",
build_file_generation = "on",
build_file_proto_mode = "disable",
importpath = "github.com/googleapis/gnostic",
sum = "h1:2qsuRm+bzgwSIKikigPASa2GhW8H2Dn4Qq7UxD8K/48=",
version = "v0.5.3",
)
go_repository(
name = "io_k8s_api",
build_file_proto_mode = "disable",
commit = "bbc9463b57e5",
importpath = "k8s.io/api",
sum = "h1:GN6ntFnv44Vptj/b+OnMW7FmzkpDoIDLZRvKX3XH9aU=",
version = "v0.19.3",
)
go_repository(
@ -834,7 +839,8 @@ def go_repositories():
go_repository(
name = "com_github_spf13_cobra",
importpath = "github.com/spf13/cobra",
tag = "v0.0.5",
sum = "h1:6m/oheQuQ13N9ks4hubMG6BnvwOeaJrqSPLahSnczz8=",
version = "v1.0.0",
)
go_repository(
@ -888,15 +894,17 @@ def go_repositories():
go_repository(
name = "io_k8s_apiextensions_apiserver",
build_file_proto_mode = "disable",
commit = "b615a37f53e7",
importpath = "k8s.io/apiextensions-apiserver",
sum = "h1:WZxBypSHW4SdXHbdPTS/Jy7L2la6Niggs8BuU5o+avo=",
version = "v0.19.3",
)
go_repository(
name = "io_k8s_kube_openapi",
commit = "30be4d16710a",
importpath = "k8s.io/kube-openapi",
build_extra_args = ["-known_import=github.com/googleapis/gnostic"],
importpath = "k8s.io/kube-openapi",
sum = "h1:mNpvQf4lkIHNOXCoM+Veu/UXwA56Yx1J7hY1Tvcs/oM=",
version = "v0.0.0-20200923155610-8b5066479488",
)
go_repository(
@ -1130,7 +1138,8 @@ def go_repositories():
go_repository(
name = "com_github_go_logr_logr",
importpath = "github.com/go-logr/logr",
tag = "v0.1.0",
sum = "h1:QvGt2nLcHH0WK9orKa+ppBPAxREcH364nPUedEpK0TY=",
version = "v0.2.0",
)
go_repository(
@ -1465,26 +1474,30 @@ def go_repositories():
go_repository(
name = "io_k8s_apiserver",
commit = "f2537b84c964",
importpath = "k8s.io/apiserver",
sum = "h1:H7KUbLD74rh8NOPMLBJPSEG3Djqcv6Zxn5Ud0AL5u/k=",
version = "v0.19.3",
)
go_repository(
name = "io_k8s_cli_runtime",
commit = "ec04ad4dbd24",
importpath = "k8s.io/cli-runtime",
sum = "h1:vZUTphJIvlh7+867cXiLmyzoCAuQdukbPLIad6eEajQ=",
version = "v0.19.3",
)
go_repository(
name = "io_k8s_code_generator",
commit = "2a85f169f05f",
importpath = "k8s.io/code-generator",
sum = "h1:fTrTpJ8PZog5oo6MmeZtveo89emjQZHiw0ieybz1RSs=",
version = "v0.19.3",
)
go_repository(
name = "io_k8s_component_base",
commit = "ea09a2678486",
importpath = "k8s.io/component-base",
sum = "h1:c+DzDNAQFlaoyX+yv8YuWi8xmlQvvY5DnJGbaz5U74o=",
version = "v0.19.3",
)
go_repository(
@ -1495,14 +1508,17 @@ def go_repositories():
go_repository(
name = "io_k8s_kubectl",
commit = "fbc5d36fee2d",
importpath = "k8s.io/kubectl",
sum = "h1:T8IHHpg+uRIfn34wqJ8wHG5bbH+VV5FNPtJ+jKcho1U=",
version = "v0.19.3",
)
go_repository(
name = "io_k8s_metrics",
commit = "dea8d0e6b550",
build_file_proto_mode = "disable",
importpath = "k8s.io/metrics",
sum = "h1:p/goUqtdCslX76mSNowzZkNxiKzNRQW4bUP02U34+QQ=",
version = "v0.19.3",
)
go_repository(
@ -1741,3 +1757,27 @@ def go_repositories():
sum = "h1:GfShSQ+2DojR7GRI5wPByszs93zHXW2zOT0SuHadW6A=",
version = "v0.0.0-20200923134324-eb52cbb4fb83",
)
go_repository(
name = "io_k8s_klog_v2",
importpath = "k8s.io/klog/v2",
sum = "h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ=",
version = "v2.4.0",
)
go_repository(
name = "io_k8s_sigs_structured_merge_diff_v4",
importpath = "sigs.k8s.io/structured-merge-diff/v4",
sum = "h1:YXTMot5Qz/X1iBRJhAt+vI+HVttY0WkSqqhKxQ0xVbA=",
version = "v4.0.1",
)
go_repository(
name = "in_gopkg_yaml_v3",
importpath = "gopkg.in/yaml.v3",
sum = "h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ=",
version = "v3.0.0-20200615113413-eeeca48fe776",
)
go_repository(
name = "com_github_moby_term",
importpath = "github.com/moby/term",
sum = "h1:K6V0Kwa5efKo60sqbTk1FOBbltdyX9Klw2a9+lKhA18=",
version = "v0.0.0-20201101162038-25d840ce174a",
)