From 7a13b11af0efa63230b8f645940488c20679c8b4 Mon Sep 17 00:00:00 2001 From: Alexander Zielenski Date: Thu, 7 Sep 2023 12:12:20 -0700 Subject: [PATCH] update e2e import restrictions --- test/e2e/framework/.import-restrictions | 37 ++++++++++++++++++++++++- test/e2e_node/.import-restrictions | 1 + 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/test/e2e/framework/.import-restrictions b/test/e2e/framework/.import-restrictions index f3070eeed85..894b9749b0a 100644 --- a/test/e2e/framework/.import-restrictions +++ b/test/e2e/framework/.import-restrictions @@ -11,14 +11,49 @@ rules: - selectorRegexp: ^[a-z]+(/|$) allowedPrefixes: [ "" ] - # Ginkgo + Gomega. + # stdlib x and proto + - selectorRegexp: ^golang.org/x|^google.golang.org/protobuf + allowedPrefixes: [ "" ] + + # Ginkgo + Gomega - selectorRegexp: github.com/onsi/(ginkgo|gomega)|^k8s[.]io/kubernetes/test/(e2e/framework/internal/|utils) allowedPrefixes: [ "" ] + # kube-openapi + - selectorRegexp: ^k8s.io/kube-openapi + allowedPrefixes: [ "" ] + + # Public SIG Repos + - selectorRegexp: ^sigs.k8s.io/(json|yaml|structured-merge-diff) + allowedPrefixes: [ "" ] + # some of the shared test helpers (but not E2E sub-packages!) - selectorRegexp: ^k8s[.]io/kubernetes/test/(e2e/framework/internal/|utils) allowedPrefixes: [ "" ] + # Third party deps + - selectorRegexp: ^github.com/|^gopkg.in + allowedPrefixes: [ + "gopkg.in/inf.v0", + "github.com/davecgh/go-spew/spew", + "github.com/evanphx/json-patch", + "github.com/go-logr/logr", + "github.com/gogo/protobuf/proto", + "github.com/gogo/protobuf/sortkeys", + "github.com/golang/protobuf/proto", + "github.com/google/gnostic-models/openapiv2", + "github.com/google/gnostic-models/openapiv3", + "github.com/google/go-cmp/cmp", + "github.com/google/go-cmp/cmp/cmpopts", + "github.com/google/gofuzz", + "github.com/google/uuid", + "github.com/imdario/mergo", + "github.com/spf13/cobra", + "github.com/spf13/pflag", + "github.com/stretchr/testify/assert", + "github.com/stretchr/testify/require" + ] + # Everything else isn't. # # In particular importing any test/e2e/framework/* package would be a diff --git a/test/e2e_node/.import-restrictions b/test/e2e_node/.import-restrictions index 6a13ca73797..a4fbc3e2e2d 100644 --- a/test/e2e_node/.import-restrictions +++ b/test/e2e_node/.import-restrictions @@ -5,6 +5,7 @@ rules: - k8s.io/kubernetes/test/e2e/common - k8s.io/kubernetes/test/e2e/dra/test-driver/app - k8s.io/kubernetes/test/e2e/framework + - k8s.io/kubernetes/test/e2e/storage/utils - k8s.io/kubernetes/test/e2e/network/common - k8s.io/kubernetes/test/e2e/perftype - k8s.io/kubernetes/test/e2e/testing-manifests