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

Move util to specific package location

Browse source
This commit is contained in:
Ricardo Pchevuzinske Katz 2022-07-20 18:15:03 -03:00
parent 0cc43d5e52
commit 7304086202
11 changed files with 13 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
internal/ingress/annotations/authreq/main.go
View file

@ -28,7 +28,7 @@ import (
"k8s.io/ingress-nginx/internal/ingress/annotations/parser"
ing_errors "k8s.io/ingress-nginx/internal/ingress/errors"
"k8s.io/ingress-nginx/internal/ingress/resolver"
"k8s.io/ingress-nginx/internal/sets"
"k8s.io/ingress-nginx/pkg/util/sets"
)
// Config returns external authentication configuration for an Ingress rule

2
internal/ingress/annotations/globalratelimit/main.go
View file

@ -27,7 +27,7 @@ import (
ing_errors "k8s.io/ingress-nginx/internal/ingress/errors"
"k8s.io/ingress-nginx/internal/ingress/resolver"
"k8s.io/ingress-nginx/internal/net"
"k8s.io/ingress-nginx/internal/sets"
"k8s.io/ingress-nginx/pkg/util/sets"
)
const defaultKey = "$remote_addr"

2
internal/ingress/annotations/ipwhitelist/main.go
View file

@ -27,7 +27,7 @@ import (
"k8s.io/ingress-nginx/internal/ingress/annotations/parser"
ing_errors "k8s.io/ingress-nginx/internal/ingress/errors"
"k8s.io/ingress-nginx/internal/ingress/resolver"
"k8s.io/ingress-nginx/internal/sets"
"k8s.io/ingress-nginx/pkg/util/sets"
)
// SourceRange returns the CIDR

2
internal/ingress/annotations/ratelimit/main.go
View file

@ -26,7 +26,7 @@ import (
"k8s.io/ingress-nginx/internal/ingress/annotations/parser"
"k8s.io/ingress-nginx/internal/ingress/resolver"
"k8s.io/ingress-nginx/internal/net"
"k8s.io/ingress-nginx/internal/sets"
"k8s.io/ingress-nginx/pkg/util/sets"
)
const (

5
internal/ingress/controller/nginx.go
View file

@ -58,7 +58,6 @@ import (
"k8s.io/ingress-nginx/internal/net/ssl"
"k8s.io/ingress-nginx/internal/nginx"
"k8s.io/ingress-nginx/internal/task"
"k8s.io/ingress-nginx/internal/watch"
"k8s.io/ingress-nginx/pkg/util/file"
klog "k8s.io/klog/v2"
@ -172,7 +171,7 @@ func NewNGINXController(config *Configuration, mc metric.Collector) *NGINXContro
n.t = ngxTpl
_, err = watch.NewFileWatcher(nginx.TemplatePath, onTemplateChange)
_, err = file.NewFileWatcher(nginx.TemplatePath, onTemplateChange)
if err != nil {
klog.Fatalf("Error creating file watcher for %v: %v", nginx.TemplatePath, err)
}
@ -196,7 +195,7 @@ func NewNGINXController(config *Configuration, mc metric.Collector) *NGINXContro
}
for _, f := range filesToWatch {
_, err = watch.NewFileWatcher(f, func() {
_, err = file.NewFileWatcher(f, func() {
klog.InfoS("File changed detected. Reloading NGINX", "path", f)
n.syncQueue.EnqueueTask(task.GetDummyObject("file-change"))
})

2
internal/ingress/types_equals.go
View file

@ -17,7 +17,7 @@ limitations under the License.
package ingress
import (
"k8s.io/ingress-nginx/internal/sets"
"k8s.io/ingress-nginx/pkg/util/sets"
)
// Equal tests for equality between two Configuration types