DevFW-CICD/ingress-nginx-helm
14
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: pkg imported more than once (#10048)

Browse source
This commit is contained in:
guangwu 2023-06-12 02:49:47 +08:00 committed by GitHub
parent 05e5956545
commit 114ae77fb7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 27 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
internal/ingress/controller/controller_test.go
View file

@ -33,7 +33,7 @@ import (
"github.com/eapache/channels" "github.com/eapache/channels"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
discoveryv1 "k8s.io/api/discovery/v1" discoveryv1 "k8s.io/api/discovery/v1"
networking "k8s.io/api/networking/v1" networking "k8s.io/api/networking/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@ -48,7 +48,6 @@ import (
"k8s.io/ingress-nginx/internal/ingress/annotations/parser" "k8s.io/ingress-nginx/internal/ingress/annotations/parser"
"k8s.io/ingress-nginx/internal/ingress/annotations/proxyssl" "k8s.io/ingress-nginx/internal/ingress/annotations/proxyssl"
"k8s.io/ingress-nginx/internal/ingress/annotations/sessionaffinity" "k8s.io/ingress-nginx/internal/ingress/annotations/sessionaffinity"
"k8s.io/ingress-nginx/internal/ingress/controller/config"
ngx_config "k8s.io/ingress-nginx/internal/ingress/controller/config" ngx_config "k8s.io/ingress-nginx/internal/ingress/controller/config"
"k8s.io/ingress-nginx/internal/ingress/controller/ingressclass" "k8s.io/ingress-nginx/internal/ingress/controller/ingressclass"
"k8s.io/ingress-nginx/internal/ingress/controller/store" "k8s.io/ingress-nginx/internal/ingress/controller/store"
@ -146,7 +145,7 @@ func (ntc testNginxTestCommand) Test(cfg string) ([]byte, error) {
type fakeTemplate struct{} type fakeTemplate struct{}
func (fakeTemplate) Write(conf config.TemplateConfig) ([]byte, error) { func (fakeTemplate) Write(conf ngx_config.TemplateConfig) ([]byte, error) {
r := []byte{} r := []byte{}
for _, s := range conf.Servers { for _, s := range conf.Servers {
if len(r) > 0 { if len(r) > 0 {
@ -1529,7 +1528,7 @@ func TestGetBackendServers(t *testing.T) {
testCases := []struct { testCases := []struct {
Ingresses []*ingress.Ingress Ingresses []*ingress.Ingress
Validate func(ingresses []*ingress.Ingress, upstreams []*ingress.Backend, servers []*ingress.Server) Validate func(ingresses []*ingress.Ingress, upstreams []*ingress.Backend, servers []*ingress.Server)
SetConfigMap func(namespace string) *v1.ConfigMap SetConfigMap func(namespace string) *corev1.ConfigMap
}{ }{
{ {
Ingresses: []*ingress.Ingress{ Ingresses: []*ingress.Ingress{
@ -2299,8 +2298,8 @@ func TestGetBackendServers(t *testing.T) {
t.Errorf("location cafilename should be '%s', got '%s'", ingresses[1].ParsedAnnotations.ProxySSL.CAFileName, s.Locations[0].ProxySSL.CAFileName) t.Errorf("location cafilename should be '%s', got '%s'", ingresses[1].ParsedAnnotations.ProxySSL.CAFileName, s.Locations[0].ProxySSL.CAFileName)
} }
}, },
SetConfigMap: func(ns string) *v1.ConfigMap { SetConfigMap: func(ns string) *corev1.ConfigMap {
return &v1.ConfigMap{ return &corev1.ConfigMap{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: "config", Name: "config",
SelfLink: fmt.Sprintf("/api/v1/namespaces/%s/configmaps/config", ns), SelfLink: fmt.Sprintf("/api/v1/namespaces/%s/configmaps/config", ns),
@ -2360,8 +2359,8 @@ func TestGetBackendServers(t *testing.T) {
t.Errorf("backend should be upstream-default-backend, got '%s'", s.Locations[0].Backend) t.Errorf("backend should be upstream-default-backend, got '%s'", s.Locations[0].Backend)
} }
}, },
SetConfigMap: func(ns string) *v1.ConfigMap { SetConfigMap: func(ns string) *corev1.ConfigMap {
return &v1.ConfigMap{ return &corev1.ConfigMap{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: "config", Name: "config",
SelfLink: fmt.Sprintf("/api/v1/namespaces/%s/configmaps/config", ns), SelfLink: fmt.Sprintf("/api/v1/namespaces/%s/configmaps/config", ns),
@ -2438,8 +2437,8 @@ func TestGetBackendServers(t *testing.T) {
} }
}, },
SetConfigMap: func(ns string) *v1.ConfigMap { SetConfigMap: func(ns string) *corev1.ConfigMap {
return &v1.ConfigMap{ return &corev1.ConfigMap{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: "config", Name: "config",
SelfLink: fmt.Sprintf("/api/v1/namespaces/%s/configmaps/config", ns), SelfLink: fmt.Sprintf("/api/v1/namespaces/%s/configmaps/config", ns),
@ -2459,8 +2458,8 @@ func TestGetBackendServers(t *testing.T) {
} }
} }
func testConfigMap(ns string) *v1.ConfigMap { func testConfigMap(ns string) *corev1.ConfigMap {
return &v1.ConfigMap{ return &corev1.ConfigMap{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: "config", Name: "config",
SelfLink: fmt.Sprintf("/api/v1/namespaces/%s/configmaps/config", ns), SelfLink: fmt.Sprintf("/api/v1/namespaces/%s/configmaps/config", ns),
@ -2469,11 +2468,11 @@ func testConfigMap(ns string) *v1.ConfigMap {
} }
func newNGINXController(t *testing.T) *NGINXController { func newNGINXController(t *testing.T) *NGINXController {
ns := v1.NamespaceDefault ns := corev1.NamespaceDefault
clientSet := fake.NewSimpleClientset() clientSet := fake.NewSimpleClientset()
configMap := &v1.ConfigMap{ configMap := &corev1.ConfigMap{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: "config", Name: "config",
SelfLink: fmt.Sprintf("/api/v1/namespaces/%s/configmaps/config", ns), SelfLink: fmt.Sprintf("/api/v1/namespaces/%s/configmaps/config", ns),
@ -2540,8 +2539,8 @@ func fakeX509Cert(dnsNames []string) *x509.Certificate {
} }
} }
func newDynamicNginxController(t *testing.T, setConfigMap func(string) *v1.ConfigMap) *NGINXController { func newDynamicNginxController(t *testing.T, setConfigMap func(string) *corev1.ConfigMap) *NGINXController {
ns := v1.NamespaceDefault ns := corev1.NamespaceDefault
clientSet := fake.NewSimpleClientset() clientSet := fake.NewSimpleClientset()
configMap := setConfigMap(ns) configMap := setConfigMap(ns)

3
internal/ingress/controller/store/store.go
View file

@ -36,7 +36,6 @@ import (
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"
k8sruntime "k8s.io/apimachinery/pkg/runtime" k8sruntime "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/runtime"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/client-go/informers" "k8s.io/client-go/informers"
clientset "k8s.io/client-go/kubernetes" clientset "k8s.io/client-go/kubernetes"
"k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/kubernetes/scheme"
@ -1138,7 +1137,7 @@ func (s *k8sStore) Run(stopCh chan struct{}) {
var runtimeScheme = k8sruntime.NewScheme() var runtimeScheme = k8sruntime.NewScheme()
func init() { func init() {
utilruntime.Must(networkingv1.AddToScheme(runtimeScheme)) runtime.Must(networkingv1.AddToScheme(runtimeScheme))
} }
func toIngress(obj interface{}) (*networkingv1.Ingress, bool) { func toIngress(obj interface{}) (*networkingv1.Ingress, bool) {

5
internal/net/ssl/ssl_test.go
View file

@ -20,7 +20,6 @@ import (
"bytes" "bytes"
"crypto" "crypto"
"crypto/rand" "crypto/rand"
cryptorand "crypto/rand"
"crypto/rsa" "crypto/rsa"
"crypto/tls" "crypto/tls"
"crypto/x509" "crypto/x509"
@ -336,7 +335,7 @@ const (
// newPrivateKey creates an RSA private key // newPrivateKey creates an RSA private key
func newPrivateKey() (*rsa.PrivateKey, error) { func newPrivateKey() (*rsa.PrivateKey, error) {
return rsa.GenerateKey(cryptorand.Reader, rsaKeySize) return rsa.GenerateKey(rand.Reader, rsaKeySize)
} }
// newSignedCert creates a signed certificate using the given CA certificate and key // newSignedCert creates a signed certificate using the given CA certificate and key
@ -365,7 +364,7 @@ func newSignedCert(cfg certutil.Config, key crypto.Signer, caCert *x509.Certific
KeyUsage: x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature, KeyUsage: x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature,
ExtKeyUsage: cfg.Usages, ExtKeyUsage: cfg.Usages,
} }
certDERBytes, err := x509.CreateCertificate(cryptorand.Reader, &certTmpl, caCert, key.Public(), caKey) certDERBytes, err := x509.CreateCertificate(rand.Reader, &certTmpl, caCert, key.Public(), caKey)
if err != nil { if err != nil {
return nil, err return nil, err
} }

7
test/e2e/annotations/grpc.go
View file

@ -29,7 +29,6 @@ import (
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/credentials" "google.golang.org/grpc/credentials"
"google.golang.org/grpc/metadata" "google.golang.org/grpc/metadata"
core "k8s.io/api/core/v1"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/intstr"
@ -70,7 +69,7 @@ var _ = framework.DescribeAnnotation("backend-protocol - GRPC", func() {
host := "echo" host := "echo"
svc := &core.Service{ svc := &corev1.Service{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: "grpcbin-test", Name: "grpcbin-test",
Namespace: f.Namespace, Namespace: f.Namespace,
@ -129,7 +128,7 @@ var _ = framework.DescribeAnnotation("backend-protocol - GRPC", func() {
host := "echo" host := "echo"
svc := &core.Service{ svc := &corev1.Service{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: "grpcbin-test", Name: "grpcbin-test",
Namespace: f.Namespace, Namespace: f.Namespace,
@ -201,7 +200,7 @@ var _ = framework.DescribeAnnotation("backend-protocol - GRPC", func() {
host := "echo" host := "echo"
svc := &core.Service{ svc := &corev1.Service{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: "grpcbin-test", Name: "grpcbin-test",
Namespace: f.Namespace, Namespace: f.Namespace,

14
test/e2e/framework/framework.go
View file

@ -27,7 +27,6 @@ import (
"github.com/onsi/ginkgo/v2" "github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
appsv1 "k8s.io/api/apps/v1" appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
networking "k8s.io/api/networking/v1" networking "k8s.io/api/networking/v1"
apiextcs "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" apiextcs "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
@ -38,7 +37,6 @@ import (
"k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes"
"k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/kubernetes/scheme"
"k8s.io/client-go/rest" "k8s.io/client-go/rest"
restclient "k8s.io/client-go/rest"
"k8s.io/klog/v2" "k8s.io/klog/v2"
) )
@ -62,13 +60,13 @@ type Framework struct {
// A Kubernetes and Service Catalog client // A Kubernetes and Service Catalog client
KubeClientSet kubernetes.Interface KubeClientSet kubernetes.Interface
KubeConfig *restclient.Config KubeConfig *rest.Config
APIExtensionsClientSet apiextcs.Interface APIExtensionsClientSet apiextcs.Interface
Namespace string Namespace string
IngressClass string IngressClass string
pod *corev1.Pod pod *v1.Pod
} }
// NewDefaultFramework makes a new framework and sets up a BeforeEach/AfterEach for // NewDefaultFramework makes a new framework and sets up a BeforeEach/AfterEach for
@ -233,7 +231,7 @@ func (f *Framework) GetURL(scheme RequestScheme) string {
} }
// GetIngressNGINXPod returns the ingress controller running pod // GetIngressNGINXPod returns the ingress controller running pod
func (f *Framework) GetIngressNGINXPod() *corev1.Pod { func (f *Framework) GetIngressNGINXPod() *v1.Pod {
return f.pod return f.pod
} }
@ -413,13 +411,13 @@ func (f *Framework) WaitForReload(fn func()) {
assert.Nil(ginkgo.GinkgoT(), err, "while waiting for ingress controller reload") assert.Nil(ginkgo.GinkgoT(), err, "while waiting for ingress controller reload")
} }
func getReloadCount(pod *corev1.Pod, namespace string, client kubernetes.Interface) int { func getReloadCount(pod *v1.Pod, namespace string, client kubernetes.Interface) int {
events, err := client.CoreV1().Events(namespace).Search(scheme.Scheme, pod) events, err := client.CoreV1().Events(namespace).Search(scheme.Scheme, pod)
assert.Nil(ginkgo.GinkgoT(), err, "obtaining NGINX Pod") assert.Nil(ginkgo.GinkgoT(), err, "obtaining NGINX Pod")
reloadCount := 0 reloadCount := 0
for _, e := range events.Items { for _, e := range events.Items {
if e.Reason == "RELOAD" && e.Type == corev1.EventTypeNormal { if e.Reason == "RELOAD" && e.Type == v1.EventTypeNormal {
reloadCount++ reloadCount++
} }
} }
@ -793,7 +791,7 @@ func Sleep(duration ...time.Duration) {
time.Sleep(sleepFor) time.Sleep(sleepFor)
} }
func loadConfig() (*restclient.Config, error) { func loadConfig() (*rest.Config, error) {
config, err := rest.InClusterConfig() config, err := rest.InClusterConfig()
if err != nil { if err != nil {
return nil, err return nil, err