Update Kubernetes to 1.18.0
Updates Kubernetes to 1.18.0 and removes patches that are no
longer needed. The directories themselves and the build code that deals
with patching is left intact since rebasing D389 and subsequent K8s work
would otherwise be unnecessarily complicated.
Test Plan: Should be covered by CI
X-Origin-Diff: phab/D470
GitOrigin-RevId: 5c7749926f0adcc8d58e3bff3ce6413bab1d797d
diff --git a/third_party/kubernetes/external.bzl b/third_party/kubernetes/external.bzl
index 77d7af2..66cb4f4 100644
--- a/third_party/kubernetes/external.bzl
+++ b/third_party/kubernetes/external.bzl
@@ -19,12 +19,12 @@
def kubernetes_external(name, version):
sums = {
"1.16.4": "3a49373ba56c73c282deb0cfa2ec7bfcc6bf46acb6992f01319eb703cbf68996",
+ "1.18.0": "d87be01d4c75ebf29f181fd6bfcfe7fdd097d9c519e50500e21e199f859e6226",
}
http_archive(
name = name,
patch_args = ["-p1"],
patches = [
- "//third_party/kubernetes/external:0001-avoid-unexpected-keyword-error-by-using-positional-p.patch",
],
sha256 = sums[version],
urls = ["https://dl.k8s.io/v%s/kubernetes-src.tar.gz" % version],
diff --git a/third_party/kubernetes/external/0001-avoid-unexpected-keyword-error-by-using-positional-p.patch b/third_party/kubernetes/external/0001-avoid-unexpected-keyword-error-by-using-positional-p.patch
deleted file mode 100644
index 5223bee..0000000
--- a/third_party/kubernetes/external/0001-avoid-unexpected-keyword-error-by-using-positional-p.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Copyright 2020 The Monogon Project Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-
-From d73ca1c4da53336442d2d256e70ce2acc45e4275 Mon Sep 17 00:00:00 2001
-From: Mostyn Bramley-Moore <mostynb@vewd.com>
-Date: Thu, 17 Oct 2019 14:00:18 +0200
-Subject: [PATCH] avoid unexpected keyword error by using positional parameters
-
-This avoids the following error, when building with bazel 1.0:
-...
- File "/home/user/kubernetes/build/code_generation.bzl", line 44, in go_pkg
- pkg.replace("staging/src/", "vendor/", maxsplit ...)
-unexpected keyword 'maxsplit', for call to method replace(old, new, maxsplit = None) of 'string'
-
-Fixes #81382
----
- build/code_generation.bzl | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/build/code_generation.bzl b/build/code_generation.bzl
-index eed223eb86..6feef4ba6e 100644
---- a/build/code_generation.bzl
-+++ b/build/code_generation.bzl
-@@ -41,7 +41,7 @@ def go_pkg(pkg):
- ...
- )
- """
-- return go_prefix + "/" + pkg.replace("staging/src/", "vendor/", maxsplit = 1)
-+ return go_prefix + "/" + pkg.replace("staging/src/", "vendor/", 1)
-
- def openapi_deps():
- deps = [
---
-2.20.1
-