third_party/com_k8s_io_kubernetes: replace import patch with gazelle:resolve
Change-Id: I677a5c8d2bd87589ea2287eeda08b437c664abb1
Reviewed-on: https://review.monogon.dev/c/monogon/+/4506
Reviewed-by: Lorenz Brun <lorenz@monogon.tech>
Tested-by: Jenkins CI
diff --git a/build/bazel/go.MODULE.bazel b/build/bazel/go.MODULE.bazel
index d8cff18..595e792 100644
--- a/build/bazel/go.MODULE.bazel
+++ b/build/bazel/go.MODULE.bazel
@@ -293,12 +293,12 @@
"k8s.io/kubernetes": {
"directives": [
"gazelle:proto disable",
+ "gazelle:resolve go source.monogon.dev/metropolis/node @monogon//metropolis/node",
],
"patches": [
"//third_party/com_k8s_io_kubernetes:k8s-native-metrics.patch",
"//third_party/com_k8s_io_kubernetes:k8s-removed-block-device-pseudo-locks.patch",
"//third_party/com_k8s_io_kubernetes:k8s-add-pause-build-file.patch",
- "//third_party/com_k8s_io_kubernetes:k8s-reserve-metropolis-ports-import.patch",
],
"pre_patches": [
"//third_party/com_k8s_io_kubernetes:k8s-drop-legacy-log-path.patch",
diff --git a/third_party/com_k8s_io_kubernetes/k8s-reserve-metropolis-ports-import.patch b/third_party/com_k8s_io_kubernetes/k8s-reserve-metropolis-ports-import.patch
deleted file mode 100644
index a1de08b..0000000
--- a/third_party/com_k8s_io_kubernetes/k8s-reserve-metropolis-ports-import.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/pkg/registry/core/service/portallocator/controller/BUILD.bazel b/pkg/registry/core/service/portallocator/controller/BUILD.bazel
-index fa870760490..0f67fe7eb9b 100644
---- a/pkg/registry/core/service/portallocator/controller/BUILD.bazel
-+++ b/pkg/registry/core/service/portallocator/controller/BUILD.bazel
-@@ -26,6 +26,7 @@
- "@io_k8s_client_go//util/retry",
- "@io_k8s_component_base//metrics",
- "@io_k8s_component_base//metrics/legacyregistry",
-+ "@monogon//metropolis/node",
- ],
- )
-