Skip to content

Commit 19793bd

Browse files
author
Luigi Bitonti
committed
Update k8s.io/utils dependency and use ebtables from there
1 parent db28b02 commit 19793bd

File tree

12 files changed

+44
-224
lines changed

12 files changed

+44
-224
lines changed

hack/.golint_failures

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,6 @@ pkg/security/podsecuritypolicy/util
183183
pkg/serviceaccount
184184
pkg/ssh
185185
pkg/util/config
186-
pkg/util/ebtables
187186
pkg/util/goroutinemap/exponentialbackoff
188187
pkg/util/labels # See previous effort in PR #80685
189188
pkg/util/oom

pkg/kubelet/dockershim/network/kubenet/BUILD

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ go_library(
2727
"//pkg/kubelet/dockershim/network:go_default_library",
2828
"//pkg/kubelet/dockershim/network/hostport:go_default_library",
2929
"//pkg/util/bandwidth:go_default_library",
30-
"//pkg/util/ebtables:go_default_library",
3130
"//pkg/util/iptables:go_default_library",
3231
"//pkg/util/sysctl:go_default_library",
3332
"//staging/src/k8s.io/apimachinery/pkg/util/errors:go_default_library",
@@ -42,6 +41,7 @@ go_library(
4241
"//vendor/k8s.io/klog/v2:go_default_library",
4342
"//vendor/k8s.io/utils/exec:go_default_library",
4443
"//vendor/k8s.io/utils/net:go_default_library",
44+
"//vendor/k8s.io/utils/net/ebtables:go_default_library",
4545
],
4646
"@io_bazel_rules_go//go/platform:darwin": [
4747
"//pkg/kubelet/apis/config:go_default_library",
@@ -80,7 +80,6 @@ go_library(
8080
"//pkg/kubelet/dockershim/network:go_default_library",
8181
"//pkg/kubelet/dockershim/network/hostport:go_default_library",
8282
"//pkg/util/bandwidth:go_default_library",
83-
"//pkg/util/ebtables:go_default_library",
8483
"//pkg/util/iptables:go_default_library",
8584
"//pkg/util/sysctl:go_default_library",
8685
"//staging/src/k8s.io/apimachinery/pkg/util/errors:go_default_library",
@@ -95,6 +94,7 @@ go_library(
9594
"//vendor/k8s.io/klog/v2:go_default_library",
9695
"//vendor/k8s.io/utils/exec:go_default_library",
9796
"//vendor/k8s.io/utils/net:go_default_library",
97+
"//vendor/k8s.io/utils/net/ebtables:go_default_library",
9898
],
9999
"@io_bazel_rules_go//go/platform:nacl": [
100100
"//pkg/kubelet/apis/config:go_default_library",

pkg/kubelet/dockershim/network/kubenet/kubenet_linux.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ import (
4141
"k8s.io/kubernetes/pkg/kubelet/dockershim/network"
4242
"k8s.io/kubernetes/pkg/kubelet/dockershim/network/hostport"
4343
"k8s.io/kubernetes/pkg/util/bandwidth"
44-
utilebtables "k8s.io/kubernetes/pkg/util/ebtables"
4544
utiliptables "k8s.io/kubernetes/pkg/util/iptables"
4645
utilsysctl "k8s.io/kubernetes/pkg/util/sysctl"
4746
utilexec "k8s.io/utils/exec"
47+
utilebtables "k8s.io/utils/net/ebtables"
4848

4949
utilfeature "k8s.io/apiserver/pkg/util/feature"
5050
kubefeatures "k8s.io/kubernetes/pkg/features"

pkg/util/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ filegroup(
1616
"//pkg/util/config:all-srcs",
1717
"//pkg/util/conntrack:all-srcs",
1818
"//pkg/util/coverage:all-srcs",
19-
"//pkg/util/ebtables:all-srcs",
2019
"//pkg/util/env:all-srcs",
2120
"//pkg/util/filesystem:all-srcs",
2221
"//pkg/util/flag:all-srcs",

pkg/util/ebtables/BUILD

Lines changed: 0 additions & 37 deletions
This file was deleted.

pkg/util/ebtables/OWNERS

Lines changed: 0 additions & 8 deletions
This file was deleted.

pkg/util/ebtables/ebtables_test.go

Lines changed: 0 additions & 169 deletions
This file was deleted.

test/e2e/framework/.import-restrictions

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,6 @@ rules:
206206
- k8s.io/kubernetes/pkg/util/config
207207
- k8s.io/kubernetes/pkg/util/configz
208208
- k8s.io/kubernetes/pkg/util/conntrack
209-
- k8s.io/kubernetes/pkg/util/ebtables
210209
- k8s.io/kubernetes/pkg/util/env
211210
- k8s.io/kubernetes/pkg/util/filesystem
212211
- k8s.io/kubernetes/pkg/util/flag

vendor/k8s.io/utils/net/BUILD

Lines changed: 4 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/k8s.io/utils/net/ebtables/BUILD

Lines changed: 24 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)