From e7c1353ce3402a60c3afdfb6fff2f4fc73e3d6c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A5=9A=E5=B2=B3?= Date: Tue, 8 Nov 2022 15:56:56 +0800 Subject: [PATCH] try to remove the v1beta1 ingress MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 楚岳 --- pkg/velaql/providers/query/handler_test.go | 111 +++++++++++++-------- references/cli/velaql_test.go | 111 +++++++++++++-------- 2 files changed, 136 insertions(+), 86 deletions(-) diff --git a/pkg/velaql/providers/query/handler_test.go b/pkg/velaql/providers/query/handler_test.go index 24d7f0754..7ec68d595 100644 --- a/pkg/velaql/providers/query/handler_test.go +++ b/pkg/velaql/providers/query/handler_test.go @@ -26,7 +26,7 @@ import ( . "github.com/onsi/gomega" v1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" - networkv1beta1 "k8s.io/api/networking/v1beta1" + networkv1 "k8s.io/api/networking/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime/schema" @@ -743,25 +743,30 @@ options: { } } - var prefixbeta = networkv1beta1.PathTypePrefix + var prefixbeta = networkv1.PathTypePrefix testIngress := []client.Object{ - &networkv1beta1.Ingress{ + &networkv1.Ingress{ ObjectMeta: metav1.ObjectMeta{ Name: "ingress-http", Namespace: "default", }, - Spec: networkv1beta1.IngressSpec{ - Rules: []networkv1beta1.IngressRule{ + Spec: networkv1.IngressSpec{ + Rules: []networkv1.IngressRule{ { Host: "ingress.domain", - IngressRuleValue: networkv1beta1.IngressRuleValue{ - HTTP: &networkv1beta1.HTTPIngressRuleValue{ - Paths: []networkv1beta1.HTTPIngressPath{ + IngressRuleValue: networkv1.IngressRuleValue{ + HTTP: &networkv1.HTTPIngressRuleValue{ + Paths: []networkv1.HTTPIngressPath{ { Path: "/", - Backend: networkv1beta1.IngressBackend{ - ServiceName: "clusterip", - ServicePort: intstr.FromInt(80), + Backend: networkv1.IngressBackend{ + Service: &networkv1.IngressServiceBackend{ + Name: "clusterip", + Port: networkv1.ServiceBackendPort{ + Name: "Http", + Number: 80, + }, + }, }, PathType: &prefixbeta, }, @@ -772,28 +777,33 @@ options: { }, }, }, - &networkv1beta1.Ingress{ + &networkv1.Ingress{ ObjectMeta: metav1.ObjectMeta{ Name: "ingress-https", Namespace: "default", }, - Spec: networkv1beta1.IngressSpec{ - TLS: []networkv1beta1.IngressTLS{ + Spec: networkv1.IngressSpec{ + TLS: []networkv1.IngressTLS{ { SecretName: "https-secret", }, }, - Rules: []networkv1beta1.IngressRule{ + Rules: []networkv1.IngressRule{ { Host: "ingress.domain.https", - IngressRuleValue: networkv1beta1.IngressRuleValue{ - HTTP: &networkv1beta1.HTTPIngressRuleValue{ - Paths: []networkv1beta1.HTTPIngressPath{ + IngressRuleValue: networkv1.IngressRuleValue{ + HTTP: &networkv1.HTTPIngressRuleValue{ + Paths: []networkv1.HTTPIngressPath{ { Path: "/", - Backend: networkv1beta1.IngressBackend{ - ServiceName: "clusterip", - ServicePort: intstr.FromInt(80), + Backend: networkv1.IngressBackend{ + Service: &networkv1.IngressServiceBackend{ + Name: "clusterip", + Port: networkv1.ServiceBackendPort{ + Name: "Http", + Number: 80, + }, + }, }, PathType: &prefixbeta, }, @@ -804,36 +814,46 @@ options: { }, }, }, - &networkv1beta1.Ingress{ + &networkv1.Ingress{ ObjectMeta: metav1.ObjectMeta{ Name: "ingress-paths", Namespace: "default", }, - Spec: networkv1beta1.IngressSpec{ - TLS: []networkv1beta1.IngressTLS{ + Spec: networkv1.IngressSpec{ + TLS: []networkv1.IngressTLS{ { SecretName: "https-secret", }, }, - Rules: []networkv1beta1.IngressRule{ + Rules: []networkv1.IngressRule{ { Host: "ingress.domain.path", - IngressRuleValue: networkv1beta1.IngressRuleValue{ - HTTP: &networkv1beta1.HTTPIngressRuleValue{ - Paths: []networkv1beta1.HTTPIngressPath{ + IngressRuleValue: networkv1.IngressRuleValue{ + HTTP: &networkv1.HTTPIngressRuleValue{ + Paths: []networkv1.HTTPIngressPath{ { Path: "/test", - Backend: networkv1beta1.IngressBackend{ - ServiceName: "clusterip", - ServicePort: intstr.FromInt(80), + Backend: networkv1.IngressBackend{ + Service: &networkv1.IngressServiceBackend{ + Name: "clusterip", + Port: networkv1.ServiceBackendPort{ + Name: "Http", + Number: 80, + }, + }, }, PathType: &prefixbeta, }, { Path: "/test2", - Backend: networkv1beta1.IngressBackend{ - ServiceName: "clusterip", - ServicePort: intstr.FromInt(80), + Backend: networkv1.IngressBackend{ + Service: &networkv1.IngressServiceBackend{ + Name: "clusterip", + Port: networkv1.ServiceBackendPort{ + Name: "Http", + Number: 80, + }, + }, }, PathType: &prefixbeta, }, @@ -844,7 +864,7 @@ options: { }, }, }, - &networkv1beta1.Ingress{ + &networkv1.Ingress{ TypeMeta: metav1.TypeMeta{ APIVersion: "networking.k8s.io/v1beta1", }, @@ -856,18 +876,23 @@ options: { "helm.toolkit.fluxcd.io/namespace": "default", }, }, - Spec: networkv1beta1.IngressSpec{ - Rules: []networkv1beta1.IngressRule{ + Spec: networkv1.IngressSpec{ + Rules: []networkv1.IngressRule{ { Host: "ingress.domain.helm", - IngressRuleValue: networkv1beta1.IngressRuleValue{ - HTTP: &networkv1beta1.HTTPIngressRuleValue{ - Paths: []networkv1beta1.HTTPIngressPath{ + IngressRuleValue: networkv1.IngressRuleValue{ + HTTP: &networkv1.HTTPIngressRuleValue{ + Paths: []networkv1.HTTPIngressPath{ { Path: "/", - Backend: networkv1beta1.IngressBackend{ - ServiceName: "clusterip", - ServicePort: intstr.FromInt(80), + Backend: networkv1.IngressBackend{ + Service: &networkv1.IngressServiceBackend{ + Name: "clusterip", + Port: networkv1.ServiceBackendPort{ + Name: "Http", + Number: 80, + }, + }, }, PathType: &prefixbeta, }, diff --git a/references/cli/velaql_test.go b/references/cli/velaql_test.go index 14656c981..aeddab06d 100644 --- a/references/cli/velaql_test.go +++ b/references/cli/velaql_test.go @@ -30,7 +30,7 @@ import ( . "github.com/onsi/gomega" "github.com/spf13/cobra" corev1 "k8s.io/api/core/v1" - networkv1beta1 "k8s.io/api/networking/v1beta1" + networkv1 "k8s.io/api/networking/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" pkgtypes "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/intstr" @@ -267,25 +267,30 @@ var _ = Describe("Test velaQL", func() { Expect(err).Should(BeNil()) } } - var prefixbeta = networkv1beta1.PathTypePrefix + var prefixbeta = networkv1.PathTypePrefix testIngress := []client.Object{ - &networkv1beta1.Ingress{ + &networkv1.Ingress{ ObjectMeta: metav1.ObjectMeta{ Name: "ingress-http", Namespace: "default", }, - Spec: networkv1beta1.IngressSpec{ - Rules: []networkv1beta1.IngressRule{ + Spec: networkv1.IngressSpec{ + Rules: []networkv1.IngressRule{ { Host: "ingress.domain", - IngressRuleValue: networkv1beta1.IngressRuleValue{ - HTTP: &networkv1beta1.HTTPIngressRuleValue{ - Paths: []networkv1beta1.HTTPIngressPath{ + IngressRuleValue: networkv1.IngressRuleValue{ + HTTP: &networkv1.HTTPIngressRuleValue{ + Paths: []networkv1.HTTPIngressPath{ { Path: "/", - Backend: networkv1beta1.IngressBackend{ - ServiceName: "clusterip", - ServicePort: intstr.FromInt(80), + Backend: networkv1.IngressBackend{ + Service: &networkv1.IngressServiceBackend{ + Name: "clusterip", + Port: networkv1.ServiceBackendPort{ + Name: "Http", + Number: 80, + }, + }, }, PathType: &prefixbeta, }, @@ -296,28 +301,33 @@ var _ = Describe("Test velaQL", func() { }, }, }, - &networkv1beta1.Ingress{ + &networkv1.Ingress{ ObjectMeta: metav1.ObjectMeta{ Name: "ingress-https", Namespace: "default", }, - Spec: networkv1beta1.IngressSpec{ - TLS: []networkv1beta1.IngressTLS{ + Spec: networkv1.IngressSpec{ + TLS: []networkv1.IngressTLS{ { SecretName: "https-secret", }, }, - Rules: []networkv1beta1.IngressRule{ + Rules: []networkv1.IngressRule{ { Host: "ingress.domain.https", - IngressRuleValue: networkv1beta1.IngressRuleValue{ - HTTP: &networkv1beta1.HTTPIngressRuleValue{ - Paths: []networkv1beta1.HTTPIngressPath{ + IngressRuleValue: networkv1.IngressRuleValue{ + HTTP: &networkv1.HTTPIngressRuleValue{ + Paths: []networkv1.HTTPIngressPath{ { Path: "/", - Backend: networkv1beta1.IngressBackend{ - ServiceName: "clusterip", - ServicePort: intstr.FromInt(80), + Backend: networkv1.IngressBackend{ + Service: &networkv1.IngressServiceBackend{ + Name: "clusterip", + Port: networkv1.ServiceBackendPort{ + Name: "Http", + Number: 80, + }, + }, }, PathType: &prefixbeta, }, @@ -328,36 +338,46 @@ var _ = Describe("Test velaQL", func() { }, }, }, - &networkv1beta1.Ingress{ + &networkv1.Ingress{ ObjectMeta: metav1.ObjectMeta{ Name: "ingress-paths", Namespace: "default", }, - Spec: networkv1beta1.IngressSpec{ - TLS: []networkv1beta1.IngressTLS{ + Spec: networkv1.IngressSpec{ + TLS: []networkv1.IngressTLS{ { SecretName: "https-secret", }, }, - Rules: []networkv1beta1.IngressRule{ + Rules: []networkv1.IngressRule{ { Host: "ingress.domain.path", - IngressRuleValue: networkv1beta1.IngressRuleValue{ - HTTP: &networkv1beta1.HTTPIngressRuleValue{ - Paths: []networkv1beta1.HTTPIngressPath{ + IngressRuleValue: networkv1.IngressRuleValue{ + HTTP: &networkv1.HTTPIngressRuleValue{ + Paths: []networkv1.HTTPIngressPath{ { Path: "/test", - Backend: networkv1beta1.IngressBackend{ - ServiceName: "clusterip", - ServicePort: intstr.FromInt(80), + Backend: networkv1.IngressBackend{ + Service: &networkv1.IngressServiceBackend{ + Name: "clusterip", + Port: networkv1.ServiceBackendPort{ + Name: "Http", + Number: 80, + }, + }, }, PathType: &prefixbeta, }, { Path: "/test2", - Backend: networkv1beta1.IngressBackend{ - ServiceName: "clusterip", - ServicePort: intstr.FromInt(80), + Backend: networkv1.IngressBackend{ + Service: &networkv1.IngressServiceBackend{ + Name: "clusterip", + Port: networkv1.ServiceBackendPort{ + Name: "Http", + Number: 80, + }, + }, }, PathType: &prefixbeta, }, @@ -368,7 +388,7 @@ var _ = Describe("Test velaQL", func() { }, }, }, - &networkv1beta1.Ingress{ + &networkv1.Ingress{ TypeMeta: metav1.TypeMeta{ APIVersion: "networking.k8s.io/v1beta1", }, @@ -380,18 +400,23 @@ var _ = Describe("Test velaQL", func() { "helm.toolkit.fluxcd.io/namespace": "default", }, }, - Spec: networkv1beta1.IngressSpec{ - Rules: []networkv1beta1.IngressRule{ + Spec: networkv1.IngressSpec{ + Rules: []networkv1.IngressRule{ { Host: "ingress.domain.helm", - IngressRuleValue: networkv1beta1.IngressRuleValue{ - HTTP: &networkv1beta1.HTTPIngressRuleValue{ - Paths: []networkv1beta1.HTTPIngressPath{ + IngressRuleValue: networkv1.IngressRuleValue{ + HTTP: &networkv1.HTTPIngressRuleValue{ + Paths: []networkv1.HTTPIngressPath{ { Path: "/", - Backend: networkv1beta1.IngressBackend{ - ServiceName: "clusterip", - ServicePort: intstr.FromInt(80), + Backend: networkv1.IngressBackend{ + Service: &networkv1.IngressServiceBackend{ + Name: "clusterip", + Port: networkv1.ServiceBackendPort{ + Name: "Http", + Number: 80, + }, + }, }, PathType: &prefixbeta, },