Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Convert to use V1 Ingress API #1416

Merged
merged 4 commits into from
May 4, 2021
Merged

Convert to use V1 Ingress API #1416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
958a68e
Use v1.ServiceBackendPort instead of IntOrString
swetharepakula Apr 26, 2021
7cb7e39
Update test adapter client to networking.k8s.io/v1
swetharepakula Apr 26, 2021
d06cb42
Use networking.k8s.io/v1 API
swetharepakula Apr 26, 2021
fd1d362
Handle non-service backends
swetharepakula Apr 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmd/e2e-test/affinity_beta_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"fmt"
"testing"

networkingv1 "k8s.io/api/networking/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/client-go/util/retry"
"k8s.io/ingress-gce/pkg/annotations"
Expand Down Expand Up @@ -78,7 +78,7 @@ func TestAffinityBeta(t *testing.T) {
t.Logf("Echo service created (%s/%s)", s.Namespace, svcName)

ing := fuzz.NewIngressBuilder(s.Namespace, "ingress-1", "").
AddPath("test.com", "/", svcName, intstr.FromInt(80)).
AddPath("test.com", "/", svcName, networkingv1.ServiceBackendPort{Number: 80}).
Build()
crud := adapter.IngressCRUD{C: Framework.Clientset}
if _, err := crud.Create(ing); err != nil {
Expand Down
6 changes: 3 additions & 3 deletions cmd/e2e-test/affinity_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"testing"
"time"

"k8s.io/apimachinery/pkg/util/intstr"
v1 "k8s.io/api/networking/v1"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/client-go/util/retry"
"k8s.io/ingress-gce/pkg/annotations"
Expand Down Expand Up @@ -103,7 +103,7 @@ func TestAffinity(t *testing.T) {
t.Logf("Echo service created (%s/%s)", s.Namespace, "service-1")

ing := fuzz.NewIngressBuilder(s.Namespace, "ingress-1", "").
AddPath("test.com", "/", "service-1", intstr.FromInt(80)).
AddPath("test.com", "/", "service-1", v1.ServiceBackendPort{Number: 80}).
Build()
crud := adapter.IngressCRUD{C: Framework.Clientset}
if _, err := crud.Create(ing); err != nil {
Expand Down Expand Up @@ -241,7 +241,7 @@ func TestILBSA(t *testing.T) {
t.Logf("Echo service created (%s/%s)", s.Namespace, "service-1")

ing := fuzz.NewIngressBuilder(s.Namespace, "ingress-1", "").
AddPath("test.com", "/", "service-1", intstr.FromInt(80)).
AddPath("test.com", "/", "service-1", v1.ServiceBackendPort{Number: 80}).
ConfigureForILB().
Build()
crud := adapter.IngressCRUD{C: Framework.Clientset}
Expand Down
10 changes: 5 additions & 5 deletions cmd/e2e-test/app_protocols_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"context"
"testing"

"k8s.io/apimachinery/pkg/util/intstr"
v1 "k8s.io/api/networking/v1"
"k8s.io/ingress-gce/pkg/annotations"
"k8s.io/ingress-gce/pkg/e2e"
"k8s.io/ingress-gce/pkg/e2e/adapter"
Expand Down Expand Up @@ -60,8 +60,8 @@ func TestAppProtocol(t *testing.T) {
t.Logf("Echo service created (%s/%s)", s.Namespace, "service-1")

ing := fuzz.NewIngressBuilder(s.Namespace, "ingress-1", "").
DefaultBackend("service-1", intstr.FromString("https-port")).
AddPath("test.com", "/", "service-1", intstr.FromString("https-port")).
DefaultBackend("service-1", v1.ServiceBackendPort{Name: "https-port"}).
AddPath("test.com", "/", "service-1", v1.ServiceBackendPort{Name: "https-port"}).
Build()
crud := adapter.IngressCRUD{C: Framework.Clientset}
if _, err := crud.Create(ing); err != nil {
Expand Down Expand Up @@ -130,8 +130,8 @@ func TestAppProtocolTransition(t *testing.T) {
t.Logf("Echo service created (%s/%s)", s.Namespace, "service-1")

ing := fuzz.NewIngressBuilder(s.Namespace, "ingress-1", "").
DefaultBackend("service-1", intstr.FromString("https-port")).
AddPath("test.com", "/", "service-1", intstr.FromString("https-port")).
DefaultBackend("service-1", v1.ServiceBackendPort{Name: "https-port"}).
AddPath("test.com", "/", "service-1", v1.ServiceBackendPort{Name: "https-port"}).
Build()
crud := adapter.IngressCRUD{C: Framework.Clientset}
if _, err := crud.Create(ing); err != nil {
Expand Down
4 changes: 2 additions & 2 deletions cmd/e2e-test/backend_config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ import (

v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/ingress-gce/pkg/e2e/adapter"

networkingv1 "k8s.io/api/networking/v1"
"k8s.io/ingress-gce/pkg/annotations"
backendconfigv1 "k8s.io/ingress-gce/pkg/apis/backendconfig/v1"
"k8s.io/ingress-gce/pkg/e2e"
Expand Down Expand Up @@ -104,7 +104,7 @@ func TestBackendConfigNegatives(t *testing.T) {
t.Fatalf("e2e.CreateEchoService(s, service-1, %q) = _, _, %v, want _, _, nil", tc.svcAnnotations, err)
}

port80 := intstr.FromInt(80)
port80 := networkingv1.ServiceBackendPort{Number: 80}
testIng := fuzz.NewIngressBuilder(s.Namespace, "ingress-1", "").
AddPath("test.com", "/", "service-1", port80).
Build()
Expand Down
4 changes: 2 additions & 2 deletions cmd/e2e-test/basic_https_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"fmt"
"testing"

"k8s.io/apimachinery/pkg/util/intstr"
v1 "k8s.io/api/networking/v1"
"k8s.io/ingress-gce/pkg/e2e"
"k8s.io/ingress-gce/pkg/e2e/adapter"
"k8s.io/ingress-gce/pkg/fuzz"
Expand All @@ -30,7 +30,7 @@ import (
func TestBasicHTTPS(t *testing.T) {
t.Parallel()

port80 := intstr.FromInt(80)
port80 := v1.ServiceBackendPort{Number: 80}

for _, tc := range []struct {
desc string
Expand Down
17 changes: 8 additions & 9 deletions cmd/e2e-test/basic_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ import (
"fmt"
"testing"

"k8s.io/api/networking/v1beta1"
"k8s.io/apimachinery/pkg/util/intstr"
v1 "k8s.io/api/networking/v1"
"k8s.io/ingress-gce/pkg/e2e"
"k8s.io/ingress-gce/pkg/e2e/adapter"
"k8s.io/ingress-gce/pkg/fuzz"
Expand All @@ -41,11 +40,11 @@ func TestBasic(t *testing.T) {
func testBasicOS(t *testing.T, os e2e.OS) {
t.Parallel()

port80 := intstr.FromInt(80)
port80 := v1.ServiceBackendPort{Number: 80}

for _, tc := range []struct {
desc string
ing *v1beta1.Ingress
ing *v1.Ingress
}{
{
desc: "http default backend",
Expand Down Expand Up @@ -126,7 +125,7 @@ func TestBasicStaticIP(t *testing.T) {
defer e2e.DeleteGCPAddress(s, addrName, "")

testIng := fuzz.NewIngressBuilder(s.Namespace, "ingress-1", "").
DefaultBackend("service-1", intstr.FromInt(80)).
DefaultBackend("service-1", v1.ServiceBackendPort{Number: 80}).
AddStaticIP(addrName, false).
Build()
crud := adapter.IngressCRUD{C: Framework.Clientset}
Expand Down Expand Up @@ -166,11 +165,11 @@ func TestBasicStaticIP(t *testing.T) {
func TestEdge(t *testing.T) {
t.Parallel()

port80 := intstr.FromInt(80)
port80 := v1.ServiceBackendPort{Number: 80}

for _, tc := range []struct {
desc string
ing *v1beta1.Ingress
ing *v1.Ingress
}{
{
desc: "long ingress name",
Expand Down Expand Up @@ -223,7 +222,7 @@ func TestEdge(t *testing.T) {
// deleted. This also tests that necessary GCP frontend resources exist.
func TestFrontendResourceDeletion(t *testing.T) {
t.Parallel()
port80 := intstr.FromInt(80)
port80 := v1.ServiceBackendPort{Number: 80}
svcName := "service-1"
host := "foo.com"

Expand Down Expand Up @@ -319,7 +318,7 @@ func TestFrontendResourceDeletion(t *testing.T) {
ingBuilder = ingBuilder.SetAllowHttp(true)
}
if tc.disableHTTPS {
ingBuilder.SetTLS([]v1beta1.IngressTLS{
ingBuilder.SetTLS([]v1.IngressTLS{
{
Hosts: []string{},
SecretName: cert.Name,
Expand Down
4 changes: 2 additions & 2 deletions cmd/e2e-test/cdn_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"reflect"
"testing"

"k8s.io/apimachinery/pkg/util/intstr"
v1 "k8s.io/api/networking/v1"
"k8s.io/ingress-gce/pkg/annotations"
backendconfig "k8s.io/ingress-gce/pkg/apis/backendconfig/v1"
"k8s.io/ingress-gce/pkg/e2e"
Expand Down Expand Up @@ -90,7 +90,7 @@ func TestCDN(t *testing.T) {
t.Logf("Echo service created (%s/%s)", s.Namespace, "service-1")

ing := fuzz.NewIngressBuilder(s.Namespace, "ingress-1", "").
AddPath("test.com", "/", "service-1", intstr.FromInt(80)).
AddPath("test.com", "/", "service-1", v1.ServiceBackendPort{Number: 80}).
Build()
crud := adapter.IngressCRUD{C: Framework.Clientset}
if _, err := crud.Create(ing); err != nil {
Expand Down
10 changes: 5 additions & 5 deletions cmd/e2e-test/customrequestheaders_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ import (
"reflect"
"testing"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr"
v1 "k8s.io/api/networking/v1"
"k8s.io/ingress-gce/pkg/annotations"
backendconfig "k8s.io/ingress-gce/pkg/apis/backendconfig/v1"
"k8s.io/ingress-gce/pkg/e2e"
Expand All @@ -39,7 +38,7 @@ func TestCustomRequestHeaders(t *testing.T) {
t.Parallel()

ing := fuzz.NewIngressBuilder("", "ingress-1", "").
AddPath("test.com", "/", "service-1", intstr.FromInt(80)).
AddPath("test.com", "/", "service-1", v1.ServiceBackendPort{Number: 80}).
Build()

for _, tc := range []struct {
Expand Down Expand Up @@ -74,7 +73,8 @@ func TestCustomRequestHeaders(t *testing.T) {
}
t.Logf("Echo service created (%s/%s)", s.Namespace, "service-1")

if _, err := Framework.Clientset.NetworkingV1beta1().Ingresses(s.Namespace).Create(context.TODO(), ing, metav1.CreateOptions{}); err != nil {
crud := adapter.IngressCRUD{C: Framework.Clientset}
if _, err := crud.Create(ing); err != nil {
t.Fatalf("error creating Ingress spec: %v", err)
}
t.Logf("Ingress created (%s/%s)", s.Namespace, ing.Name)
Expand All @@ -98,7 +98,7 @@ func TestCustomRequestHeaders(t *testing.T) {
}

// Wait for GCLB resources to be deleted.
if err := Framework.Clientset.NetworkingV1beta1().Ingresses(s.Namespace).Delete(context.TODO(), ing.Name, metav1.DeleteOptions{}); err != nil {
if err := crud.Delete(ing.Namespace, ing.Name); err != nil {
t.Errorf("Delete(%q) = %v, want nil", ing.Name, err)
}

Expand Down
4 changes: 2 additions & 2 deletions cmd/e2e-test/draining_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"testing"
"time"

"k8s.io/apimachinery/pkg/util/intstr"
v1 "k8s.io/api/networking/v1"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/client-go/util/retry"
"k8s.io/ingress-gce/pkg/annotations"
Expand Down Expand Up @@ -85,7 +85,7 @@ func TestDraining(t *testing.T) {
t.Logf("Echo service created (%s/%s)", s.Namespace, "service-1")

ing := fuzz.NewIngressBuilder(s.Namespace, "ingress-1", "").
AddPath("test.com", "/", "service-1", intstr.FromInt(80)).
AddPath("test.com", "/", "service-1", v1.ServiceBackendPort{Number: 80}).
Build()
crud := adapter.IngressCRUD{C: Framework.Clientset}
if _, err := crud.Create(ing); err != nil {
Expand Down
8 changes: 4 additions & 4 deletions cmd/e2e-test/finalizer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"context"
"testing"

"k8s.io/apimachinery/pkg/util/intstr"
v1 "k8s.io/api/networking/v1"
"k8s.io/ingress-gce/pkg/e2e"
"k8s.io/ingress-gce/pkg/e2e/adapter"
"k8s.io/ingress-gce/pkg/fuzz"
Expand All @@ -32,7 +32,7 @@ import (
func TestFinalizer(t *testing.T) {
t.Parallel()
ctx := context.Background()
port80 := intstr.FromInt(80)
port80 := v1.ServiceBackendPort{Number: 80}
svcName := "service-1"
ing := fuzz.NewIngressBuilder("", "ingress-1", "").
AddPath("foo.com", "/", svcName, port80).
Expand Down Expand Up @@ -83,7 +83,7 @@ func TestFinalizer(t *testing.T) {
func TestFinalizerIngressClassChange(t *testing.T) {
t.Parallel()
ctx := context.Background()
port80 := intstr.FromInt(80)
port80 := v1.ServiceBackendPort{Number: 80}
svcName := "service-1"
ing := fuzz.NewIngressBuilder("", "ingress-1", "").
AddPath("foo.com", "/", svcName, port80).
Expand Down Expand Up @@ -143,7 +143,7 @@ func TestFinalizerIngressClassChange(t *testing.T) {
func TestFinalizerIngressesWithSharedResources(t *testing.T) {
t.Parallel()
ctx := context.Background()
port80 := intstr.FromInt(80)
port80 := v1.ServiceBackendPort{Number: 80}
svcName := "service-1"
ing := fuzz.NewIngressBuilder("", "ingress-1", "").
AddPath("foo.com", "/", svcName, port80).
Expand Down
4 changes: 2 additions & 2 deletions cmd/e2e-test/healthcheck_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"testing"

"github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud"
networkingv1 "k8s.io/api/networking/v1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/client-go/util/retry"
"k8s.io/ingress-gce/pkg/annotations"
Expand Down Expand Up @@ -98,7 +98,7 @@ func TestHealthCheck(t *testing.T) {
}

ing := fuzz.NewIngressBuilder(s.Namespace, "ingress-1", "").
DefaultBackend("service-1", intstr.FromInt(80)).
DefaultBackend("service-1", networkingv1.ServiceBackendPort{Number: 80}).
Build()
crud := adapter.IngressCRUD{C: Framework.Clientset}
if _, err := crud.Create(ing); err != nil {
Expand Down
4 changes: 2 additions & 2 deletions cmd/e2e-test/iap_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"context"
"testing"

"k8s.io/apimachinery/pkg/util/intstr"
v1 "k8s.io/api/networking/v1"
"k8s.io/ingress-gce/pkg/annotations"
backendconfig "k8s.io/ingress-gce/pkg/apis/backendconfig/v1"
"k8s.io/ingress-gce/pkg/e2e"
Expand Down Expand Up @@ -71,7 +71,7 @@ func TestIAP(t *testing.T) {
t.Logf("Echo service created (%s/%s)", s.Namespace, "service-1")

ing := fuzz.NewIngressBuilder(s.Namespace, "ingress-1", "").
AddPath("test.com", "/", "service-1", intstr.FromInt(80)).
AddPath("test.com", "/", "service-1", v1.ServiceBackendPort{Number: 80}).
Build()
crud := adapter.IngressCRUD{C: Framework.Clientset}
if _, err := crud.Create(ing); err != nil {
Expand Down
Loading