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

Rename package pkg to internal

Browse source
This commit is contained in:
Manuel de Brito Fontes 2017-11-07 19:02:12 -03:00
parent fb33c58d18
commit 73fe95722c
106 changed files with 171 additions and 184 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cmd/nginx/flags.go
View file

@ -27,9 +27,9 @@ import (
apiv1 "k8s.io/api/core/v1"
"k8s.io/ingress-nginx/pkg/ingress/controller"
ngx_config "k8s.io/ingress-nginx/pkg/ingress/controller/config"
ing_net "k8s.io/ingress-nginx/pkg/net"
"k8s.io/ingress-nginx/internal/ingress/controller"
ngx_config "k8s.io/ingress-nginx/internal/ingress/controller/config"
ing_net "k8s.io/ingress-nginx/internal/net"
)
const (

8
cmd/nginx/main.go
View file

@ -39,10 +39,10 @@ import (
"k8s.io/client-go/tools/clientcmd"
clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
"k8s.io/ingress-nginx/pkg/ingress"
"k8s.io/ingress-nginx/pkg/ingress/controller"
"k8s.io/ingress-nginx/pkg/k8s"
"k8s.io/ingress-nginx/pkg/net/ssl"
"k8s.io/ingress-nginx/internal/ingress"
"k8s.io/ingress-nginx/internal/ingress/controller"
"k8s.io/ingress-nginx/internal/k8s"
"k8s.io/ingress-nginx/internal/net/ssl"
"k8s.io/ingress-nginx/version"
)

0
pkg/file/file.go → internal/file/file.go
View file

0
pkg/file/file_test.go → internal/file/file_test.go
View file

2
pkg/ingress/annotations/alias/main.go → internal/ingress/annotations/alias/main.go
View file

@ -19,7 +19,7 @@ package alias
import (
extensions "k8s.io/api/extensions/v1beta1"
"k8s.io/ingress-nginx/pkg/ingress/annotations/parser"
"k8s.io/ingress-nginx/internal/ingress/annotations/parser"
)
const (

0
pkg/ingress/annotations/alias/main_test.go → internal/ingress/annotations/alias/main_test.go
View file

52
pkg/ingress/annotations/annotations.go → internal/ingress/annotations/annotations.go
View file

@ -23,32 +23,32 @@ import (
extensions "k8s.io/api/extensions/v1beta1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/ingress-nginx/pkg/ingress/annotations/alias"
"k8s.io/ingress-nginx/pkg/ingress/annotations/auth"
"k8s.io/ingress-nginx/pkg/ingress/annotations/authreq"
"k8s.io/ingress-nginx/pkg/ingress/annotations/authtls"
"k8s.io/ingress-nginx/pkg/ingress/annotations/clientbodybuffersize"
"k8s.io/ingress-nginx/pkg/ingress/annotations/cors"
"k8s.io/ingress-nginx/pkg/ingress/annotations/defaultbackend"
"k8s.io/ingress-nginx/pkg/ingress/annotations/healthcheck"
"k8s.io/ingress-nginx/pkg/ingress/annotations/ipwhitelist"
"k8s.io/ingress-nginx/pkg/ingress/annotations/parser"
"k8s.io/ingress-nginx/pkg/ingress/annotations/portinredirect"
"k8s.io/ingress-nginx/pkg/ingress/annotations/proxy"
"k8s.io/ingress-nginx/pkg/ingress/annotations/ratelimit"
"k8s.io/ingress-nginx/pkg/ingress/annotations/redirect"
"k8s.io/ingress-nginx/pkg/ingress/annotations/rewrite"
"k8s.io/ingress-nginx/pkg/ingress/annotations/secureupstream"
"k8s.io/ingress-nginx/pkg/ingress/annotations/serversnippet"
"k8s.io/ingress-nginx/pkg/ingress/annotations/serviceupstream"
"k8s.io/ingress-nginx/pkg/ingress/annotations/sessionaffinity"
"k8s.io/ingress-nginx/pkg/ingress/annotations/snippet"
"k8s.io/ingress-nginx/pkg/ingress/annotations/sslpassthrough"
"k8s.io/ingress-nginx/pkg/ingress/annotations/upstreamhashby"
"k8s.io/ingress-nginx/pkg/ingress/annotations/upstreamvhost"
"k8s.io/ingress-nginx/pkg/ingress/annotations/vtsfilterkey"
"k8s.io/ingress-nginx/pkg/ingress/errors"
"k8s.io/ingress-nginx/pkg/ingress/resolver"
"k8s.io/ingress-nginx/internal/ingress/annotations/alias"
"k8s.io/ingress-nginx/internal/ingress/annotations/auth"
"k8s.io/ingress-nginx/internal/ingress/annotations/authreq"
"k8s.io/ingress-nginx/internal/ingress/annotations/authtls"
"k8s.io/ingress-nginx/internal/ingress/annotations/clientbodybuffersize"
"k8s.io/ingress-nginx/internal/ingress/annotations/cors"
"k8s.io/ingress-nginx/internal/ingress/annotations/defaultbackend"
"k8s.io/ingress-nginx/internal/ingress/annotations/healthcheck"
"k8s.io/ingress-nginx/internal/ingress/annotations/ipwhitelist"
"k8s.io/ingress-nginx/internal/ingress/annotations/parser"
"k8s.io/ingress-nginx/internal/ingress/annotations/portinredirect"
"k8s.io/ingress-nginx/internal/ingress/annotations/proxy"
"k8s.io/ingress-nginx/internal/ingress/annotations/ratelimit"
"k8s.io/ingress-nginx/internal/ingress/annotations/redirect"
"k8s.io/ingress-nginx/internal/ingress/annotations/rewrite"
"k8s.io/ingress-nginx/internal/ingress/annotations/secureupstream"
"k8s.io/ingress-nginx/internal/ingress/annotations/serversnippet"
"k8s.io/ingress-nginx/internal/ingress/annotations/serviceupstream"
"k8s.io/ingress-nginx/internal/ingress/annotations/sessionaffinity"
"k8s.io/ingress-nginx/internal/ingress/annotations/snippet"
"k8s.io/ingress-nginx/internal/ingress/annotations/sslpassthrough"
"k8s.io/ingress-nginx/internal/ingress/annotations/upstreamhashby"
"k8s.io/ingress-nginx/internal/ingress/annotations/upstreamvhost"
"k8s.io/ingress-nginx/internal/ingress/annotations/vtsfilterkey"
"k8s.io/ingress-nginx/internal/ingress/errors"
"k8s.io/ingress-nginx/internal/ingress/resolver"
)
// DeniedKeyName name of the key that contains the reason to deny a location

21
pkg/ingress/annotations/annotations_test.go → internal/ingress/annotations/annotations_test.go
View file

@ -24,8 +24,8 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/ingress-nginx/pkg/ingress/defaults"
"k8s.io/ingress-nginx/pkg/ingress/resolver"
"k8s.io/ingress-nginx/internal/ingress/defaults"
"k8s.io/ingress-nginx/internal/ingress/resolver"
)
const (
@ -162,9 +162,8 @@ func TestSecureVerifyCACert(t *testing.T) {
for _, ann := range anns {
ing := buildIngress()
ing.SetAnnotations(ann.annotations)
res := ec.Extract(ing).SecureUpstream
if (res != nil && res.CACert.CAFileName != "") != ann.exists {
su := ec.Extract(ing).SecureUpstream
if (su.CACert.CAFileName != "") != ann.exists {
t.Errorf("Expected exists was %v on iteration %v", ann.exists, ann.it)
}
}
@ -189,10 +188,6 @@ func TestHealthCheck(t *testing.T) {
for _, foo := range fooAnns {
ing.SetAnnotations(foo.annotations)
r := ec.Extract(ing).HealthCheck
if r == nil {
t.Errorf("Returned nil but expected a healthcheck.Upstream")
continue
}
if r.FailTimeout != foo.euft {
t.Errorf("Returned %d but expected %d for FailTimeout", r.FailTimeout, foo.euft)
@ -273,10 +268,6 @@ func TestAffinitySession(t *testing.T) {
ing.SetAnnotations(foo.annotations)
r := ec.Extract(ing).SessionAffinity
t.Logf("Testing pass %v %v %v", foo.affinitytype, foo.hash, foo.name)
if r == nil {
t.Errorf("Returned nil but expected a SessionAffinity.AffinityConfig")
continue
}
if r.Cookie.Hash != foo.hash {
t.Errorf("Returned %v but expected %v for Hash", r.Cookie.Hash, foo.hash)
@ -311,10 +302,6 @@ func TestCors(t *testing.T) {
ing.SetAnnotations(foo.annotations)
r := ec.Extract(ing).CorsConfig
t.Logf("Testing pass %v %v %v %v %v", foo.corsenabled, foo.methods, foo.headers, foo.origin, foo.credentials)
if r == nil {
t.Errorf("Returned nil but expected a Cors.CorsConfig")
continue
}
if r.CorsEnabled != foo.corsenabled {
t.Errorf("Returned %v but expected %v for Cors Enabled", r.CorsEnabled, foo.corsenabled)

8
pkg/ingress/annotations/auth/main.go → internal/ingress/annotations/auth/main.go
View file

@ -27,10 +27,10 @@ import (
api "k8s.io/api/core/v1"
extensions "k8s.io/api/extensions/v1beta1"
"k8s.io/ingress-nginx/pkg/file"
"k8s.io/ingress-nginx/pkg/ingress/annotations/parser"
ing_errors "k8s.io/ingress-nginx/pkg/ingress/errors"
"k8s.io/ingress-nginx/pkg/ingress/resolver"
"k8s.io/ingress-nginx/internal/file"
"k8s.io/ingress-nginx/internal/ingress/annotations/parser"
ing_errors "k8s.io/ingress-nginx/internal/ingress/errors"
"k8s.io/ingress-nginx/internal/ingress/resolver"
)
const (

0
pkg/ingress/annotations/auth/main_test.go → internal/ingress/annotations/auth/main_test.go
View file

4
pkg/ingress/annotations/authreq/main.go → internal/ingress/annotations/authreq/main.go
View file

@ -23,8 +23,8 @@ import (
extensions "k8s.io/api/extensions/v1beta1"
"k8s.io/ingress-nginx/pkg/ingress/annotations/parser"
ing_errors "k8s.io/ingress-nginx/pkg/ingress/errors"
"k8s.io/ingress-nginx/internal/ingress/annotations/parser"
ing_errors "k8s.io/ingress-nginx/internal/ingress/errors"
)
const (

0
pkg/ingress/annotations/authreq/main_test.go → internal/ingress/annotations/authreq/main_test.go
View file

8
pkg/ingress/annotations/authtls/main.go → internal/ingress/annotations/authtls/main.go
View file

@ -22,10 +22,10 @@ import (
"regexp"
"k8s.io/ingress-nginx/pkg/ingress/annotations/parser"
ing_errors "k8s.io/ingress-nginx/pkg/ingress/errors"
"k8s.io/ingress-nginx/pkg/ingress/resolver"
"k8s.io/ingress-nginx/pkg/k8s"
"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/k8s"
)
const (

0
pkg/ingress/annotations/authtls/main_test.go → internal/ingress/annotations/authtls/main_test.go
View file

4
pkg/ingress/annotations/class/main.go → internal/ingress/annotations/class/main.go
View file

@ -20,8 +20,8 @@ import (
"github.com/golang/glog"
extensions "k8s.io/api/extensions/v1beta1"
"k8s.io/ingress-nginx/pkg/ingress/annotations/parser"
"k8s.io/ingress-nginx/pkg/ingress/errors"
"k8s.io/ingress-nginx/internal/ingress/annotations/parser"
"k8s.io/ingress-nginx/internal/ingress/errors"
)
const (

0
pkg/ingress/annotations/class/main_test.go → internal/ingress/annotations/class/main_test.go
View file

2
pkg/ingress/annotations/clientbodybuffersize/main.go → internal/ingress/annotations/clientbodybuffersize/main.go
View file

@ -19,7 +19,7 @@ package clientbodybuffersize
import (
extensions "k8s.io/api/extensions/v1beta1"
"k8s.io/ingress-nginx/pkg/ingress/annotations/parser"
"k8s.io/ingress-nginx/internal/ingress/annotations/parser"
)
const (

0
pkg/ingress/annotations/clientbodybuffersize/main_test.go → internal/ingress/annotations/clientbodybuffersize/main_test.go
View file

2
pkg/ingress/annotations/cors/main.go → internal/ingress/annotations/cors/main.go
View file

@ -21,7 +21,7 @@ import (
extensions "k8s.io/api/extensions/v1beta1"
"k8s.io/ingress-nginx/pkg/ingress/annotations/parser"
"k8s.io/ingress-nginx/internal/ingress/annotations/parser"
)
const (

0
pkg/ingress/annotations/cors/main_test.go → internal/ingress/annotations/cors/main_test.go
View file

4
pkg/ingress/annotations/defaultbackend/main.go → internal/ingress/annotations/defaultbackend/main.go
View file

@ -22,8 +22,8 @@ import (
"github.com/pkg/errors"
extensions "k8s.io/api/extensions/v1beta1"
"k8s.io/ingress-nginx/pkg/ingress/annotations/parser"
"k8s.io/ingress-nginx/pkg/ingress/resolver"
"k8s.io/ingress-nginx/internal/ingress/annotations/parser"
"k8s.io/ingress-nginx/internal/ingress/resolver"
)
const (

4
pkg/ingress/annotations/healthcheck/main.go → internal/ingress/annotations/healthcheck/main.go
View file

@ -19,8 +19,8 @@ package healthcheck
import (
extensions "k8s.io/api/extensions/v1beta1"
"k8s.io/ingress-nginx/pkg/ingress/annotations/parser"
"k8s.io/ingress-nginx/pkg/ingress/resolver"
"k8s.io/ingress-nginx/internal/ingress/annotations/parser"
"k8s.io/ingress-nginx/internal/ingress/resolver"
)
const (

2
pkg/ingress/annotations/healthcheck/main_test.go → internal/ingress/annotations/healthcheck/main_test.go
View file

@ -24,7 +24,7 @@ import (
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/ingress-nginx/pkg/ingress/defaults"
"k8s.io/ingress-nginx/internal/ingress/defaults"
)
func buildIngress() *extensions.Ingress {

8
pkg/ingress/annotations/ipwhitelist/main.go → internal/ingress/annotations/ipwhitelist/main.go
View file

@ -23,11 +23,11 @@ import (
"github.com/pkg/errors"
extensions "k8s.io/api/extensions/v1beta1"
"k8s.io/ingress-nginx/pkg/net"
"k8s.io/ingress-nginx/internal/net"
"k8s.io/ingress-nginx/pkg/ingress/annotations/parser"
ing_errors "k8s.io/ingress-nginx/pkg/ingress/errors"
"k8s.io/ingress-nginx/pkg/ingress/resolver"
"k8s.io/ingress-nginx/internal/ingress/annotations/parser"
ing_errors "k8s.io/ingress-nginx/internal/ingress/errors"
"k8s.io/ingress-nginx/internal/ingress/resolver"
)
const (

2
pkg/ingress/annotations/ipwhitelist/main_test.go → internal/ingress/annotations/ipwhitelist/main_test.go
View file

@ -24,7 +24,7 @@ import (
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/ingress-nginx/pkg/ingress/defaults"
"k8s.io/ingress-nginx/internal/ingress/defaults"
)
func buildIngress() *extensions.Ingress {

2
pkg/ingress/annotations/parser/main.go → internal/ingress/annotations/parser/main.go
View file

@ -21,7 +21,7 @@ import (
extensions "k8s.io/api/extensions/v1beta1"
"k8s.io/ingress-nginx/pkg/ingress/errors"
"k8s.io/ingress-nginx/internal/ingress/errors"
)
// IngressAnnotation has a method to parse annotations located in Ingress

0
pkg/ingress/annotations/parser/main_test.go → internal/ingress/annotations/parser/main_test.go
View file

4
pkg/ingress/annotations/portinredirect/main.go → internal/ingress/annotations/portinredirect/main.go
View file

@ -19,8 +19,8 @@ package portinredirect
import (
extensions "k8s.io/api/extensions/v1beta1"
"k8s.io/ingress-nginx/pkg/ingress/annotations/parser"
"k8s.io/ingress-nginx/pkg/ingress/resolver"
"k8s.io/ingress-nginx/internal/ingress/annotations/parser"
"k8s.io/ingress-nginx/internal/ingress/resolver"
)
const (

2
pkg/ingress/annotations/portinredirect/main_test.go → internal/ingress/annotations/portinredirect/main_test.go
View file

@ -25,7 +25,7 @@ import (
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/ingress-nginx/pkg/ingress/defaults"
"k8s.io/ingress-nginx/internal/ingress/defaults"
)
func buildIngress() *extensions.Ingress {

4
pkg/ingress/annotations/proxy/main.go → internal/ingress/annotations/proxy/main.go
View file

@ -19,8 +19,8 @@ package proxy
import (
extensions "k8s.io/api/extensions/v1beta1"
"k8s.io/ingress-nginx/pkg/ingress/annotations/parser"
"k8s.io/ingress-nginx/pkg/ingress/resolver"
"k8s.io/ingress-nginx/internal/ingress/annotations/parser"
"k8s.io/ingress-nginx/internal/ingress/resolver"
)
const (

2
pkg/ingress/annotations/proxy/main_test.go → internal/ingress/annotations/proxy/main_test.go
View file

@ -24,7 +24,7 @@ import (
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/ingress-nginx/pkg/ingress/defaults"
"k8s.io/ingress-nginx/internal/ingress/defaults"
)
func buildIngress() *extensions.Ingress {

6
pkg/ingress/annotations/ratelimit/main.go → internal/ingress/annotations/ratelimit/main.go
View file

@ -24,9 +24,9 @@ import (
extensions "k8s.io/api/extensions/v1beta1"
"k8s.io/ingress-nginx/pkg/ingress/annotations/parser"
"k8s.io/ingress-nginx/pkg/ingress/resolver"
"k8s.io/ingress-nginx/pkg/net"
"k8s.io/ingress-nginx/internal/ingress/annotations/parser"
"k8s.io/ingress-nginx/internal/ingress/resolver"
"k8s.io/ingress-nginx/internal/net"
)
const (

2
pkg/ingress/annotations/ratelimit/main_test.go → internal/ingress/annotations/ratelimit/main_test.go
View file

@ -24,7 +24,7 @@ import (
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/ingress-nginx/pkg/ingress/defaults"
"k8s.io/ingress-nginx/internal/ingress/defaults"
)
func buildIngress() *extensions.Ingress {

4
pkg/ingress/annotations/redirect/redirect.go → internal/ingress/annotations/redirect/redirect.go
View file

@ -23,8 +23,8 @@ import (
extensions "k8s.io/api/extensions/v1beta1"
"k8s.io/ingress-nginx/pkg/ingress/annotations/parser"
"k8s.io/ingress-nginx/pkg/ingress/errors"
"k8s.io/ingress-nginx/internal/ingress/annotations/parser"
"k8s.io/ingress-nginx/internal/ingress/errors"
)
const (

4
pkg/ingress/annotations/rewrite/main.go → internal/ingress/annotations/rewrite/main.go
View file

@ -19,8 +19,8 @@ package rewrite
import (
extensions "k8s.io/api/extensions/v1beta1"
"k8s.io/ingress-nginx/pkg/ingress/annotations/parser"
"k8s.io/ingress-nginx/pkg/ingress/resolver"
"k8s.io/ingress-nginx/internal/ingress/annotations/parser"
"k8s.io/ingress-nginx/internal/ingress/resolver"
)
const (

2
pkg/ingress/annotations/rewrite/main_test.go → internal/ingress/annotations/rewrite/main_test.go
View file

@ -24,7 +24,7 @@ import (
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/ingress-nginx/pkg/ingress/defaults"
"k8s.io/ingress-nginx/internal/ingress/defaults"
)
const (

4
pkg/ingress/annotations/secureupstream/main.go → internal/ingress/annotations/secureupstream/main.go
View file

@ -22,8 +22,8 @@ import (
"github.com/pkg/errors"
extensions "k8s.io/api/extensions/v1beta1"
"k8s.io/ingress-nginx/pkg/ingress/annotations/parser"
"k8s.io/ingress-nginx/pkg/ingress/resolver"
"k8s.io/ingress-nginx/internal/ingress/annotations/parser"
"k8s.io/ingress-nginx/internal/ingress/resolver"
)
const (

2
pkg/ingress/annotations/secureupstream/main_test.go → internal/ingress/annotations/secureupstream/main_test.go
View file

@ -25,7 +25,7 @@ import (
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/ingress-nginx/pkg/ingress/resolver"
"k8s.io/ingress-nginx/internal/ingress/resolver"
)
func buildIngress() *extensions.Ingress {

2
pkg/ingress/annotations/serversnippet/main.go → internal/ingress/annotations/serversnippet/main.go
View file

@ -19,7 +19,7 @@ package serversnippet
import (
extensions "k8s.io/api/extensions/v1beta1"
"k8s.io/ingress-nginx/pkg/ingress/annotations/parser"
"k8s.io/ingress-nginx/internal/ingress/annotations/parser"
)
const (

0
pkg/ingress/annotations/serversnippet/main_test.go → internal/ingress/annotations/serversnippet/main_test.go
View file

2
pkg/ingress/annotations/serviceupstream/main.go → internal/ingress/annotations/serviceupstream/main.go
View file

@ -18,7 +18,7 @@ package serviceupstream
import (
extensions "k8s.io/api/extensions/v1beta1"
"k8s.io/ingress-nginx/pkg/ingress/annotations/parser"
"k8s.io/ingress-nginx/internal/ingress/annotations/parser"
)
const (

0
pkg/ingress/annotations/serviceupstream/main_test.go → internal/ingress/annotations/serviceupstream/main_test.go
View file

2
pkg/ingress/annotations/sessionaffinity/main.go → internal/ingress/annotations/sessionaffinity/main.go
View file

@ -23,7 +23,7 @@ import (
extensions "k8s.io/api/extensions/v1beta1"
"k8s.io/ingress-nginx/pkg/ingress/annotations/parser"
"k8s.io/ingress-nginx/internal/ingress/annotations/parser"
)
const (

0
pkg/ingress/annotations/sessionaffinity/main_test.go → internal/ingress/annotations/sessionaffinity/main_test.go
View file

2
pkg/ingress/annotations/snippet/main.go → internal/ingress/annotations/snippet/main.go
View file

@ -19,7 +19,7 @@ package snippet
import (
extensions "k8s.io/api/extensions/v1beta1"
"k8s.io/ingress-nginx/pkg/ingress/annotations/parser"
"k8s.io/ingress-nginx/internal/ingress/annotations/parser"
)
const (

0
pkg/ingress/annotations/snippet/main_test.go → internal/ingress/annotations/snippet/main_test.go
View file

4
pkg/ingress/annotations/sslpassthrough/main.go → internal/ingress/annotations/sslpassthrough/main.go
View file

@ -19,8 +19,8 @@ package sslpassthrough
import (
extensions "k8s.io/api/extensions/v1beta1"
"k8s.io/ingress-nginx/pkg/ingress/annotations/parser"
ing_errors "k8s.io/ingress-nginx/pkg/ingress/errors"
"k8s.io/ingress-nginx/internal/ingress/annotations/parser"
ing_errors "k8s.io/ingress-nginx/internal/ingress/errors"
)
const (

0
pkg/ingress/annotations/sslpassthrough/main_test.go → internal/ingress/annotations/sslpassthrough/main_test.go
View file

2
pkg/ingress/annotations/upstreamhashby/main.go → internal/ingress/annotations/upstreamhashby/main.go
View file

@ -19,7 +19,7 @@ package upstreamhashby
import (
extensions "k8s.io/api/extensions/v1beta1"
"k8s.io/ingress-nginx/pkg/ingress/annotations/parser"
"k8s.io/ingress-nginx/internal/ingress/annotations/parser"
)
const (

0
pkg/ingress/annotations/upstreamhashby/main_test.go → internal/ingress/annotations/upstreamhashby/main_test.go
View file

2
pkg/ingress/annotations/upstreamvhost/main.go → internal/ingress/annotations/upstreamvhost/main.go
View file

@ -19,7 +19,7 @@ package upstreamvhost
import (
extensions "k8s.io/api/extensions/v1beta1"
"k8s.io/ingress-nginx/pkg/ingress/annotations/parser"
"k8s.io/ingress-nginx/internal/ingress/annotations/parser"
)
const (

2
pkg/ingress/annotations/vtsfilterkey/main.go → internal/ingress/annotations/vtsfilterkey/main.go
View file

@ -19,7 +19,7 @@ package vtsfilterkey
import (
extensions "k8s.io/api/extensions/v1beta1"
"k8s.io/ingress-nginx/pkg/ingress/annotations/parser"
"k8s.io/ingress-nginx/internal/ingress/annotations/parser"
)
const (

8
pkg/ingress/controller/backend_ssl.go → internal/ingress/controller/backend_ssl.go
View file

@ -26,10 +26,10 @@ import (
apiv1 "k8s.io/api/core/v1"
extensions "k8s.io/api/extensions/v1beta1"
"k8s.io/ingress-nginx/pkg/ingress"
"k8s.io/ingress-nginx/pkg/ingress/annotations/class"
"k8s.io/ingress-nginx/pkg/ingress/annotations/parser"
"k8s.io/ingress-nginx/pkg/net/ssl"
"k8s.io/ingress-nginx/internal/ingress"
"k8s.io/ingress-nginx/internal/ingress/annotations/class"
"k8s.io/ingress-nginx/internal/ingress/annotations/parser"
"k8s.io/ingress-nginx/internal/net/ssl"
)
// syncSecret keeps in sync Secrets used by Ingress rules with the files on

8
pkg/ingress/controller/backend_ssl_test.go → internal/ingress/controller/backend_ssl_test.go
View file

@ -28,9 +28,9 @@ import (
cache_client "k8s.io/client-go/tools/cache"
"k8s.io/client-go/util/flowcontrol"
"k8s.io/ingress-nginx/pkg/ingress"
"k8s.io/ingress-nginx/pkg/ingress/store"
"k8s.io/ingress-nginx/pkg/task"
"k8s.io/ingress-nginx/internal/ingress"
"k8s.io/ingress-nginx/internal/ingress/store"
"k8s.io/ingress-nginx/internal/task"
"k8s.io/kubernetes/pkg/api"
)
@ -110,7 +110,7 @@ func buildGenericControllerForBackendSSL() *NGINXController {
Client: buildSimpleClientSetForBackendSSL(),
},
listers: buildListers(),
sslCertTracker: newSSLCertTracker(),
sslCertTracker: store.NewSSLCertTracker(),
}
gc.syncQueue = task.NewTaskQueue(gc.syncIngress)

0
pkg/ingress/controller/checker.go → internal/ingress/controller/checker.go
View file

2
pkg/ingress/controller/checker_test.go → internal/ingress/controller/checker_test.go
View file

@ -27,7 +27,7 @@ import (
"k8s.io/apiserver/pkg/server/healthz"
"k8s.io/kubernetes/pkg/util/filesystem"
ngx_config "k8s.io/ingress-nginx/pkg/ingress/controller/config"
ngx_config "k8s.io/ingress-nginx/internal/ingress/controller/config"
)
func TestNginxCheck(t *testing.T) {

4
pkg/ingress/controller/config/config.go → internal/ingress/controller/config/config.go
View file

@ -25,8 +25,8 @@ import (
apiv1 "k8s.io/api/core/v1"
"k8s.io/ingress-nginx/pkg/ingress"
"k8s.io/ingress-nginx/pkg/ingress/defaults"
"k8s.io/ingress-nginx/internal/ingress"
"k8s.io/ingress-nginx/internal/ingress/defaults"
)
const (

0
pkg/ingress/controller/config/config_test.go → internal/ingress/controller/config/config_test.go
View file

22
pkg/ingress/controller/controller.go → internal/ingress/controller/controller.go
View file

@ -36,17 +36,17 @@ import (
"k8s.io/apimachinery/pkg/util/sets"
clientset "k8s.io/client-go/kubernetes"
"k8s.io/ingress-nginx/pkg/ingress"
"k8s.io/ingress-nginx/pkg/ingress/annotations"
"k8s.io/ingress-nginx/pkg/ingress/annotations/class"
"k8s.io/ingress-nginx/pkg/ingress/annotations/healthcheck"
"k8s.io/ingress-nginx/pkg/ingress/annotations/parser"
"k8s.io/ingress-nginx/pkg/ingress/annotations/proxy"
ngx_config "k8s.io/ingress-nginx/pkg/ingress/controller/config"
"k8s.io/ingress-nginx/pkg/ingress/defaults"
"k8s.io/ingress-nginx/pkg/ingress/resolver"
"k8s.io/ingress-nginx/pkg/k8s"
"k8s.io/ingress-nginx/pkg/task"
"k8s.io/ingress-nginx/internal/ingress"
"k8s.io/ingress-nginx/internal/ingress/annotations"
"k8s.io/ingress-nginx/internal/ingress/annotations/class"
"k8s.io/ingress-nginx/internal/ingress/annotations/healthcheck"
"k8s.io/ingress-nginx/internal/ingress/annotations/parser"
"k8s.io/ingress-nginx/internal/ingress/annotations/proxy"
ngx_config "k8s.io/ingress-nginx/internal/ingress/controller/config"
"k8s.io/ingress-nginx/internal/ingress/defaults"
"k8s.io/ingress-nginx/internal/ingress/resolver"
"k8s.io/ingress-nginx/internal/k8s"
"k8s.io/ingress-nginx/internal/task"
)
const (

10
pkg/ingress/controller/listers.go → internal/ingress/controller/listers.go
View file

@ -29,9 +29,9 @@ import (
"k8s.io/client-go/tools/cache"
cache_client "k8s.io/client-go/tools/cache"
"k8s.io/ingress-nginx/pkg/ingress"
"k8s.io/ingress-nginx/pkg/ingress/annotations/class"
"k8s.io/ingress-nginx/pkg/ingress/annotations/parser"
"k8s.io/ingress-nginx/internal/ingress"
"k8s.io/ingress-nginx/internal/ingress/annotations/class"
"k8s.io/ingress-nginx/internal/ingress/annotations/parser"
)
type cacheController struct {
@ -62,9 +62,6 @@ func (c *cacheController) Run(stopCh chan struct{}) {
}
func (n *NGINXController) createListers(stopCh chan struct{}) (*ingress.StoreLister, *cacheController) {
// from here to the end of the method all the code is just boilerplate
// required to watch Ingress, Secrets, ConfigMaps and Endoints.
// This is used to detect new content, updates or removals and act accordingly
ingEventHandler := cache.ResourceEventHandlerFuncs{
AddFunc: func(obj interface{}) {
addIng := obj.(*extensions.Ingress)
@ -98,6 +95,7 @@ func (n *NGINXController) createListers(stopCh chan struct{}) (*ingress.StoreLis
return
}
n.recorder.Eventf(delIng, apiv1.EventTypeNormal, "DELETE", fmt.Sprintf("Ingress %s/%s", delIng.Namespace, delIng.Name))
n.listers.IngressAnnotation.Delete(delIng)
n.syncQueue.Enqueue(obj)
},
UpdateFunc: func(old, cur interface{}) {

0
pkg/ingress/controller/metric/collector/nginx.go → internal/ingress/controller/metric/collector/nginx.go
View file

0
pkg/ingress/controller/metric/collector/process.go → internal/ingress/controller/metric/collector/process.go
View file

0
pkg/ingress/controller/metric/collector/scrape.go → internal/ingress/controller/metric/collector/scrape.go
View file

0
pkg/ingress/controller/metric/collector/status.go → internal/ingress/controller/metric/collector/status.go
View file

0
pkg/ingress/controller/metric/collector/status_test.go → internal/ingress/controller/metric/collector/status_test.go
View file

0
pkg/ingress/controller/metric/collector/vts.go → internal/ingress/controller/metric/collector/vts.go
View file

2
pkg/ingress/controller/metrics.go → internal/ingress/controller/metrics.go
View file

@ -19,7 +19,7 @@ package controller
import (
"github.com/prometheus/client_golang/prometheus"
"k8s.io/ingress-nginx/pkg/ingress"
"k8s.io/ingress-nginx/internal/ingress"
)
const (

28
pkg/ingress/controller/nginx.go → internal/ingress/controller/nginx.go
View file

@ -42,20 +42,20 @@ import (
"k8s.io/client-go/util/flowcontrol"
"k8s.io/kubernetes/pkg/util/filesystem"
"k8s.io/ingress-nginx/pkg/ingress"
"k8s.io/ingress-nginx/pkg/ingress/annotations"
"k8s.io/ingress-nginx/pkg/ingress/annotations/class"
"k8s.io/ingress-nginx/pkg/ingress/annotations/parser"
ngx_config "k8s.io/ingress-nginx/pkg/ingress/controller/config"
"k8s.io/ingress-nginx/pkg/ingress/controller/process"
ngx_template "k8s.io/ingress-nginx/pkg/ingress/controller/template"
"k8s.io/ingress-nginx/pkg/ingress/defaults"
"k8s.io/ingress-nginx/pkg/ingress/status"
"k8s.io/ingress-nginx/pkg/ingress/store"
ing_net "k8s.io/ingress-nginx/pkg/net"
"k8s.io/ingress-nginx/pkg/net/dns"
"k8s.io/ingress-nginx/pkg/net/ssl"
"k8s.io/ingress-nginx/pkg/task"
"k8s.io/ingress-nginx/internal/ingress"
"k8s.io/ingress-nginx/internal/ingress/annotations"
"k8s.io/ingress-nginx/internal/ingress/annotations/class"
"k8s.io/ingress-nginx/internal/ingress/annotations/parser"
ngx_config "k8s.io/ingress-nginx/internal/ingress/controller/config"
"k8s.io/ingress-nginx/internal/ingress/controller/process"
ngx_template "k8s.io/ingress-nginx/internal/ingress/controller/template"
"k8s.io/ingress-nginx/internal/ingress/defaults"
"k8s.io/ingress-nginx/internal/ingress/status"
"k8s.io/ingress-nginx/internal/ingress/store"
ing_net "k8s.io/ingress-nginx/internal/net"
"k8s.io/ingress-nginx/internal/net/dns"
"k8s.io/ingress-nginx/internal/net/ssl"
"k8s.io/ingress-nginx/internal/task"
)
type statusModule string

0
pkg/ingress/controller/nginx_test.go → internal/ingress/controller/nginx_test.go
View file

0
pkg/ingress/controller/process/nginx.go → internal/ingress/controller/process/nginx.go
View file

0
pkg/ingress/controller/process/nginx_test.go → internal/ingress/controller/process/nginx_test.go
View file

2
pkg/ingress/controller/stat_collector.go → internal/ingress/controller/stat_collector.go
View file

@ -20,7 +20,7 @@ import (
"github.com/golang/glog"
"github.com/prometheus/client_golang/prometheus"
"k8s.io/ingress-nginx/pkg/ingress/controller/metric/collector"
"k8s.io/ingress-nginx/internal/ingress/controller/metric/collector"
)
const (

0
pkg/ingress/controller/tcp.go → internal/ingress/controller/tcp.go
View file

4
pkg/ingress/controller/template/configmap.go → internal/ingress/controller/template/configmap.go
View file

@ -26,8 +26,8 @@ import (
"github.com/mitchellh/mapstructure"
"k8s.io/ingress-nginx/pkg/ingress/controller/config"
ing_net "k8s.io/ingress-nginx/pkg/net"
"k8s.io/ingress-nginx/internal/ingress/controller/config"
ing_net "k8s.io/ingress-nginx/internal/net"
)
const (

2
pkg/ingress/controller/template/configmap_test.go → internal/ingress/controller/template/configmap_test.go
View file

@ -21,7 +21,7 @@ import (
"github.com/kylelemons/godebug/pretty"
"k8s.io/ingress-nginx/pkg/ingress/controller/config"
"k8s.io/ingress-nginx/internal/ingress/controller/config"
)
func TestFilterErrors(t *testing.T) {

14
pkg/ingress/controller/template/template.go → internal/ingress/controller/template/template.go
View file

@ -35,11 +35,11 @@ import (
extensions "k8s.io/api/extensions/v1beta1"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/ingress-nginx/pkg/ingress"
"k8s.io/ingress-nginx/pkg/ingress/annotations/ratelimit"
"k8s.io/ingress-nginx/pkg/ingress/controller/config"
ing_net "k8s.io/ingress-nginx/pkg/net"
"k8s.io/ingress-nginx/pkg/watch"
"k8s.io/ingress-nginx/internal/ingress"
"k8s.io/ingress-nginx/internal/ingress/annotations/ratelimit"
"k8s.io/ingress-nginx/internal/ingress/controller/config"
ing_net "k8s.io/ingress-nginx/internal/net"
"k8s.io/ingress-nginx/internal/watch"
)
const (
@ -115,7 +115,9 @@ func (t *Template) Write(conf config.TemplateConfig) ([]byte, error) {
return tmplBuf.Bytes(), nil
}
return outCmdBuf.Bytes(), nil
a := make([]byte, outCmdBuf.Len())
copy(a, outCmdBuf.Bytes())
return a, nil
}
var (

8
pkg/ingress/controller/template/template_test.go → internal/ingress/controller/template/template_test.go
View file

@ -26,10 +26,10 @@ import (
"strings"
"testing"
"k8s.io/ingress-nginx/pkg/ingress"
"k8s.io/ingress-nginx/pkg/ingress/annotations/authreq"
"k8s.io/ingress-nginx/pkg/ingress/annotations/rewrite"
"k8s.io/ingress-nginx/pkg/ingress/controller/config"
"k8s.io/ingress-nginx/internal/ingress"
"k8s.io/ingress-nginx/internal/ingress/annotations/authreq"
"k8s.io/ingress-nginx/internal/ingress/annotations/rewrite"
"k8s.io/ingress-nginx/internal/ingress/controller/config"
)
var (

2
pkg/ingress/controller/util.go → internal/ingress/controller/util.go
View file

@ -24,7 +24,7 @@ import (
api "k8s.io/api/core/v1"
"k8s.io/kubernetes/pkg/util/sysctl"
"k8s.io/ingress-nginx/pkg/ingress"
"k8s.io/ingress-nginx/internal/ingress"
)
// newUpstream creates an upstream without servers.

0
pkg/ingress/controller/util_test.go → internal/ingress/controller/util_test.go
View file

0
pkg/ingress/defaults/main.go → internal/ingress/defaults/main.go
View file

0
pkg/ingress/errors/errors.go → internal/ingress/errors/errors.go
View file

0
pkg/ingress/errors/errors_test.go → internal/ingress/errors/errors_test.go
View file

2
pkg/ingress/resolver/main.go → internal/ingress/resolver/main.go
View file

@ -19,7 +19,7 @@ package resolver
import (
apiv1 "k8s.io/api/core/v1"
"k8s.io/ingress-nginx/pkg/ingress/defaults"
"k8s.io/ingress-nginx/internal/ingress/defaults"
)
// DefaultBackend has a method that returns the backend

0
pkg/ingress/sort_ingress.go → internal/ingress/sort_ingress.go
View file

0
pkg/ingress/sort_ingress_test.go → internal/ingress/sort_ingress_test.go
View file

8
pkg/ingress/status/status.go → internal/ingress/status/status.go
View file

@ -40,10 +40,10 @@ import (
"k8s.io/client-go/tools/record"
"k8s.io/kubernetes/pkg/kubelet/util/sliceutils"
"k8s.io/ingress-nginx/pkg/ingress/annotations/class"
"k8s.io/ingress-nginx/pkg/ingress/store"
"k8s.io/ingress-nginx/pkg/k8s"
"k8s.io/ingress-nginx/pkg/task"
"k8s.io/ingress-nginx/internal/ingress/annotations/class"
"k8s.io/ingress-nginx/internal/ingress/store"
"k8s.io/ingress-nginx/internal/k8s"
"k8s.io/ingress-nginx/internal/task"
)
const (

8
pkg/ingress/status/status_test.go → internal/ingress/status/status_test.go
View file

@ -28,10 +28,10 @@ import (
"k8s.io/client-go/tools/cache"
"k8s.io/kubernetes/pkg/api"
"k8s.io/ingress-nginx/pkg/ingress/annotations/class"
"k8s.io/ingress-nginx/pkg/ingress/store"
"k8s.io/ingress-nginx/pkg/k8s"
"k8s.io/ingress-nginx/pkg/task"
"k8s.io/ingress-nginx/internal/ingress/annotations/class"
"k8s.io/ingress-nginx/internal/ingress/store"
"k8s.io/ingress-nginx/internal/k8s"
"k8s.io/ingress-nginx/internal/task"
)
func buildLoadBalancerIngressByIP() []apiv1.LoadBalancerIngress {

0
pkg/ingress/store/main.go → internal/ingress/store/main.go
View file

0
pkg/ingress/type_equals_test.go → internal/ingress/type_equals_test.go
View file

22
pkg/ingress/types.go → internal/ingress/types.go
View file

@ -23,17 +23,17 @@ import (
extensions "k8s.io/api/extensions/v1beta1"
"k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/ingress-nginx/pkg/ingress/annotations/auth"
"k8s.io/ingress-nginx/pkg/ingress/annotations/authreq"
"k8s.io/ingress-nginx/pkg/ingress/annotations/authtls"
"k8s.io/ingress-nginx/pkg/ingress/annotations/cors"
"k8s.io/ingress-nginx/pkg/ingress/annotations/ipwhitelist"
"k8s.io/ingress-nginx/pkg/ingress/annotations/proxy"
"k8s.io/ingress-nginx/pkg/ingress/annotations/ratelimit"
"k8s.io/ingress-nginx/pkg/ingress/annotations/redirect"
"k8s.io/ingress-nginx/pkg/ingress/annotations/rewrite"
"k8s.io/ingress-nginx/pkg/ingress/resolver"
"k8s.io/ingress-nginx/pkg/ingress/store"
"k8s.io/ingress-nginx/internal/ingress/annotations/auth"
"k8s.io/ingress-nginx/internal/ingress/annotations/authreq"
"k8s.io/ingress-nginx/internal/ingress/annotations/authtls"
"k8s.io/ingress-nginx/internal/ingress/annotations/cors"
"k8s.io/ingress-nginx/internal/ingress/annotations/ipwhitelist"
"k8s.io/ingress-nginx/internal/ingress/annotations/proxy"
"k8s.io/ingress-nginx/internal/ingress/annotations/ratelimit"
"k8s.io/ingress-nginx/internal/ingress/annotations/redirect"
"k8s.io/ingress-nginx/internal/ingress/annotations/rewrite"
"k8s.io/ingress-nginx/internal/ingress/resolver"
"k8s.io/ingress-nginx/internal/ingress/store"
)
var (

0
pkg/ingress/types_equals.go → internal/ingress/types_equals.go
View file

0
pkg/ingress/zz_generated.deepcopy.go → internal/ingress/zz_generated.deepcopy.go
View file

0
pkg/k8s/main.go → internal/k8s/main.go
View file

0
pkg/k8s/main_test.go → internal/k8s/main_test.go
View file

0
pkg/net/dns/dns.go → internal/net/dns/dns.go
View file

0
pkg/net/dns/dns_test.go → internal/net/dns/dns_test.go
View file

0
pkg/net/ipnet.go → internal/net/ipnet.go
View file

0
pkg/net/ipnet_test.go → internal/net/ipnet_test.go
View file

0
pkg/net/net.go → internal/net/net.go
View file

0
pkg/net/net_test.go → internal/net/net_test.go
View file

Some files were not shown because too many files have changed in this diff Show more