Skip to content

Commit 8884df4

Browse files
aknot242aknot242
authored
Merge branch 'main' into main
2 parents eb99c34 + f14e910 commit 8884df4

File tree

113 files changed

+281
-280
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

113 files changed

+281
-280
lines changed

‎cmd/nginx-ingress/main.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,18 @@ import (
1313
"time"
1414

1515
"github.com/golang/glog"
16-
"github.com/nginxinc/kubernetes-ingress/internal/configs"
17-
"github.com/nginxinc/kubernetes-ingress/internal/configs/version1"
18-
"github.com/nginxinc/kubernetes-ingress/internal/configs/version2"
19-
"github.com/nginxinc/kubernetes-ingress/internal/healthcheck"
20-
"github.com/nginxinc/kubernetes-ingress/internal/k8s"
21-
"github.com/nginxinc/kubernetes-ingress/internal/k8s/secrets"
22-
"github.com/nginxinc/kubernetes-ingress/internal/metrics"
23-
"github.com/nginxinc/kubernetes-ingress/internal/metrics/collectors"
24-
"github.com/nginxinc/kubernetes-ingress/internal/nginx"
25-
cr_validation "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/validation"
26-
k8s_nginx "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned"
27-
conf_scheme "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/scheme"
16+
"github.com/nginxinc/kubernetes-ingress/v3/internal/configs"
17+
"github.com/nginxinc/kubernetes-ingress/v3/internal/configs/version1"
18+
"github.com/nginxinc/kubernetes-ingress/v3/internal/configs/version2"
19+
"github.com/nginxinc/kubernetes-ingress/v3/internal/healthcheck"
20+
"github.com/nginxinc/kubernetes-ingress/v3/internal/k8s"
21+
"github.com/nginxinc/kubernetes-ingress/v3/internal/k8s/secrets"
22+
"github.com/nginxinc/kubernetes-ingress/v3/internal/metrics"
23+
"github.com/nginxinc/kubernetes-ingress/v3/internal/metrics/collectors"
24+
"github.com/nginxinc/kubernetes-ingress/v3/internal/nginx"
25+
cr_validation "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/validation"
26+
k8s_nginx "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned"
27+
conf_scheme "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned/scheme"
2828
"github.com/nginxinc/nginx-plus-go-client/client"
2929
nginxCollector "github.com/nginxinc/nginx-prometheus-exporter/collector"
3030
"github.com/prometheus/client_golang/prometheus"

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module github.com/nginxinc/kubernetes-ingress
1+
module github.com/nginxinc/kubernetes-ingress/v3
22

33
go 1.21
44

‎internal/certmanager/cm_controller.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ import (
3636
"k8s.io/client-go/tools/record"
3737
"k8s.io/client-go/util/workqueue"
3838

39-
conf_v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1"
40-
k8s_nginx "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned"
41-
vsinformers "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions"
42-
listers_v1 "github.com/nginxinc/kubernetes-ingress/pkg/client/listers/configuration/v1"
39+
conf_v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1"
40+
k8s_nginx "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned"
41+
vsinformers "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/informers/externalversions"
42+
listers_v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/listers/configuration/v1"
4343
)
4444

4545
const (

‎internal/certmanager/cm_controller_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ import (
2424
cmapi "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1"
2525
cmclient "github.com/cert-manager/cert-manager/pkg/client/clientset/versioned"
2626
controllerpkg "github.com/cert-manager/cert-manager/pkg/controller"
27-
testpkg "github.com/nginxinc/kubernetes-ingress/internal/certmanager/test_files"
27+
testpkg "github.com/nginxinc/kubernetes-ingress/v3/internal/certmanager/test_files"
2828
"github.com/stretchr/testify/assert"
2929
"github.com/stretchr/testify/require"
3030
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3131
"k8s.io/apimachinery/pkg/runtime"
3232
"k8s.io/client-go/util/workqueue"
3333

34-
vsapi "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1"
35-
k8s_nginx "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned"
34+
vsapi "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1"
35+
k8s_nginx "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned"
3636
)
3737

3838
func Test_controller_Register(t *testing.T) {

‎internal/certmanager/helper.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
cmapi "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1"
2929
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3030

31-
vsapi "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1"
31+
vsapi "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1"
3232
)
3333

3434
var (

‎internal/certmanager/helper_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
"github.com/stretchr/testify/assert"
2727
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2828

29-
vsapi "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1"
29+
vsapi "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1"
3030
)
3131

3232
func Test_translateVsSpec(t *testing.T) {

‎internal/certmanager/sync.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ import (
3737
"k8s.io/apimachinery/pkg/runtime/schema"
3838
"k8s.io/client-go/tools/record"
3939

40-
vsapi "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1"
40+
vsapi "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1"
4141
)
4242

4343
const (

‎internal/certmanager/sync_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ import (
3030
"k8s.io/apimachinery/pkg/types"
3131
coretesting "k8s.io/client-go/testing"
3232

33-
testpkg "github.com/nginxinc/kubernetes-ingress/internal/certmanager/test_files"
34-
vsapi "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1"
33+
testpkg "github.com/nginxinc/kubernetes-ingress/v3/internal/certmanager/test_files"
34+
vsapi "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1"
3535
)
3636

3737
func TestSync(t *testing.T) {

‎internal/certmanager/test_files/context_builder.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ import (
3838
cmfake "github.com/cert-manager/cert-manager/pkg/client/clientset/versioned/fake"
3939
informers "github.com/cert-manager/cert-manager/pkg/client/informers/externalversions"
4040
"github.com/cert-manager/cert-manager/pkg/util"
41-
k8s_nginx "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned"
42-
vsfake "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/fake"
43-
vsinformers "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions"
41+
k8s_nginx "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned"
42+
vsfake "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned/fake"
43+
vsinformers "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/informers/externalversions"
4444
)
4545

4646
// Builder is a structure used to construct new Contexts for use during tests.

‎internal/configs/config_params.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package configs
22

3-
import conf_v1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1alpha1"
3+
import conf_v1alpha1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1alpha1"
44

55
// ConfigParams holds NGINX configuration parameters that affect the main NGINX config
66
// as well as configs for Ingress resources.

0 commit comments

Comments
 (0)