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

Move APIs to be used by both controller and configurer (#8854)

Browse source
This commit is contained in:
Ricardo Katz 2022-07-21 21:32:48 -03:00 • committed by GitHub
parent 4391474bf1
commit c86d50ecef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
30 changed files with 30 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

2
internal/ingress/controller/store/backend_ssl.go
View file

@ -24,7 +24,7 @@ import (
networking "k8s.io/api/networking/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/ingress-nginx/internal/ingress"
"k8s.io/ingress-nginx/pkg/apis/ingress"
klog "k8s.io/klog/v2"

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

@ -19,7 +19,7 @@ package store
import (
networking "k8s.io/api/networking/v1"
"k8s.io/client-go/tools/cache"
"k8s.io/ingress-nginx/internal/ingress"
"k8s.io/ingress-nginx/pkg/apis/ingress"
)
// IngressLister makes a Store that lists Ingress.

2
internal/ingress/controller/store/ingress_annotation.go
View file

@ -18,7 +18,7 @@ package store
import (
"k8s.io/client-go/tools/cache"
"k8s.io/ingress-nginx/internal/ingress"
"k8s.io/ingress-nginx/pkg/apis/ingress"
)
// IngressWithAnnotationsLister makes a Store that lists Ingress rules with annotations already parsed

2
internal/ingress/controller/store/local_secret.go
View file

@ -21,7 +21,7 @@ import (
"k8s.io/client-go/tools/cache"
"k8s.io/ingress-nginx/internal/ingress"
"k8s.io/ingress-nginx/pkg/apis/ingress"
)
// SSLCertTracker holds a store of referenced Secrets in Ingress rules

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

@ -48,7 +48,6 @@ import (
"k8s.io/ingress-nginx/pkg/util/file"
klog "k8s.io/klog/v2"
"k8s.io/ingress-nginx/internal/ingress"
"k8s.io/ingress-nginx/internal/ingress/annotations"
"k8s.io/ingress-nginx/internal/ingress/annotations/parser"
ngx_config "k8s.io/ingress-nginx/internal/ingress/controller/config"
@ -58,6 +57,7 @@ import (
"k8s.io/ingress-nginx/internal/ingress/errors"
"k8s.io/ingress-nginx/internal/ingress/resolver"
"k8s.io/ingress-nginx/internal/k8s"
"k8s.io/ingress-nginx/pkg/apis/ingress"
)
// IngressFilterFunc decides if an Ingress should be omitted or not

2
internal/ingress/controller/store/store_test.go
View file

@ -36,9 +36,9 @@ import (
"k8s.io/client-go/tools/cache"
"sigs.k8s.io/controller-runtime/pkg/envtest"
"k8s.io/ingress-nginx/internal/ingress"
"k8s.io/ingress-nginx/internal/ingress/annotations/parser"
"k8s.io/ingress-nginx/internal/ingress/controller/ingressclass"
"k8s.io/ingress-nginx/pkg/apis/ingress"
"k8s.io/ingress-nginx/test/e2e/framework"
)