support v1 apis

Signed-off-by: Fernando Cainelli <[email protected]>
getyourguide · Sep 4, 2024 · 6308687 · 6308687
1 parent 2ab6e68
commit 6308687
Show file tree

Hide file tree

Showing 5 changed files with 107 additions and 107 deletions.
diff --git a/examples/delegate_virtualservice.yml b/examples/delegate_virtualservice.yml
@@ -1,5 +1,5 @@
 ---
-apiVersion: networking.istio.io/v1alpha3
+apiVersion: networking.istio.io/v1
 kind: VirtualService
 metadata:
   name: merchants

diff --git a/examples/multidocument_virtualservice.yml b/examples/multidocument_virtualservice.yml
@@ -23,7 +23,7 @@ spec:
           set:
             x-custom-header: ok
 ---
-apiVersion: networking.istio.io/v1alpha3
+apiVersion: networking.istio.io/v1beta1
 kind: VirtualService
 metadata:
   name: example

diff --git a/internal/pkg/parser/virtualservice.go b/internal/pkg/parser/virtualservice.go
@@ -4,14 +4,14 @@ import (
 	"fmt"
 	"os"
 
-	networking "istio.io/api/networking/v1alpha3"
-	v1alpha3 "istio.io/client-go/pkg/apis/networking/v1alpha3"
+	networking "istio.io/api/networking/v1"
+	v1 "istio.io/client-go/pkg/apis/networking/v1"
 	"istio.io/istio/pilot/pkg/config/kube/crd"
 	"istio.io/istio/pkg/config/schema/gvk"
 )
 
-func ParseVirtualServices(files []string) ([]*v1alpha3.VirtualService, error) {
-	out := []*v1alpha3.VirtualService{}
+func ParseVirtualServices(files []string) ([]*v1.VirtualService, error) {
+	out := []*v1.VirtualService{}
 	for _, file := range files {
 		fileContent, err := os.ReadFile(file)
 		if err != nil {
@@ -29,7 +29,7 @@ func ParseVirtualServices(files []string) ([]*v1alpha3.VirtualService, error) {
 			if !ok {
 				return nil, fmt.Errorf("failed to convert spec in %q to VirtualService: %w", file, err)
 			}
-			vs := &v1alpha3.VirtualService{
+			vs := &v1.VirtualService{
 				ObjectMeta: c.ToObjectMeta(),
 				Spec:       *spec, //nolint as deep copying mess up with reflect.DeepEqual comparison.
 			}

diff --git a/internal/pkg/unit/unit.go b/internal/pkg/unit/unit.go
@@ -9,8 +9,8 @@ import (
 	"slices"
 
 	"github.com/getyourguide/istio-config-validator/internal/pkg/parser"
-	networkingv1alpha3 "istio.io/api/networking/v1alpha3"
-	v1alpha3 "istio.io/client-go/pkg/apis/networking/v1alpha3"
+	networking "istio.io/api/networking/v1"
+	v1 "istio.io/client-go/pkg/apis/networking/v1"
 )
 
 // Run is the entrypoint to run all unit tests defined in test cases
@@ -56,7 +56,7 @@ func Run(testfiles, configfiles []string, strict bool) ([]string, []string, erro
 						return summary, details, fmt.Errorf("error getting delegate virtual service: %v", err)
 					}
 					checkHosts = false
-					route, err = GetRoute(input, []*v1alpha3.VirtualService{vs}, checkHosts)
+					route, err = GetRoute(input, []*v1.VirtualService{vs}, checkHosts)
 					if err != nil {
 						details = append(details, fmt.Sprintf("FAIL input:[%v]", input))
 						return summary, details, fmt.Errorf("error getting destinations for delegate %v: %v", route.Delegate, err)
@@ -100,7 +100,7 @@ func Run(testfiles, configfiles []string, strict bool) ([]string, []string, erro
 }
 
 // GetRoute returns the route that matched a given input.
-func GetRoute(input parser.Input, virtualServices []*v1alpha3.VirtualService, checkHosts bool) (*networkingv1alpha3.HTTPRoute, error) {
+func GetRoute(input parser.Input, virtualServices []*v1.VirtualService, checkHosts bool) (*networking.HTTPRoute, error) {
 	for _, vs := range virtualServices {
 		spec := &vs.Spec
 		if checkHosts && !slices.Contains(spec.Hosts, input.Authority) {
@@ -113,19 +113,19 @@ func GetRoute(input parser.Input, virtualServices []*v1alpha3.VirtualService, ch
 			}
 			for _, matchBlock := range httpRoute.Match {
 				if match, err := matchRequest(input, matchBlock); err != nil {
-					return &networkingv1alpha3.HTTPRoute{}, err
+					return &networking.HTTPRoute{}, err
 				} else if match {
 					return httpRoute, nil
 				}
 			}
 		}
 	}
 
-	return &networkingv1alpha3.HTTPRoute{}, nil
+	return &networking.HTTPRoute{}, nil
 }
 
 // GetDelegatedVirtualService returns the virtualservice matching namespace/name matching the delegate argument.
-func GetDelegatedVirtualService(delegate *networkingv1alpha3.Delegate, virtualServices []*v1alpha3.VirtualService) (*v1alpha3.VirtualService, error) {
+func GetDelegatedVirtualService(delegate *networking.Delegate, virtualServices []*v1.VirtualService) (*v1.VirtualService, error) {
 	for _, vs := range virtualServices {
 		if vs.Name == delegate.Name {
 			if delegate.Namespace != "" && vs.Namespace != delegate.Namespace {