From 2e7e3f1aec45c8d177251aef7dce00ad942fad01 Mon Sep 17 00:00:00 2001 From: Kiran Meduri Date: Fri, 29 Oct 2021 13:55:51 -0700 Subject: [PATCH] Using default CRD version for appmesh GVR Signed-off-by: Kiran Meduri --- utils/appmesh/appmesh.go | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/utils/appmesh/appmesh.go b/utils/appmesh/appmesh.go index c8d4f0ebb8..e6a4620212 100644 --- a/utils/appmesh/appmesh.go +++ b/utils/appmesh/appmesh.go @@ -3,11 +3,14 @@ package istio import ( "context" + "github.com/argoproj/argo-rollouts/utils/defaults" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/dynamic" ) +const AppMeshCRDGroup = "appmesh.k8s.aws" + func DoesAppMeshExist(dynamicClient dynamic.Interface, namespace string) bool { _, err := dynamicClient.Resource(GetAppMeshVirtualServiceGVR()).Namespace(namespace).List(context.TODO(), metav1.ListOptions{Limit: 1}) if err != nil { @@ -18,24 +21,24 @@ func DoesAppMeshExist(dynamicClient dynamic.Interface, namespace string) bool { func GetAppMeshVirtualServiceGVR() schema.GroupVersionResource { return schema.GroupVersionResource{ - Group: "appmesh.k8s.aws", - Version: "v1beta2", + Group: AppMeshCRDGroup, + Version: defaults.GetAppMeshCRDVersion(), Resource: "virtualservices", } } func GetAppMeshVirtualRouterGVR() schema.GroupVersionResource { return schema.GroupVersionResource{ - Group: "appmesh.k8s.aws", - Version: "v1beta2", + Group: AppMeshCRDGroup, + Version: defaults.GetAppMeshCRDVersion(), Resource: "virtualrouters", } } func GetAppMeshVirtualNodeGVR() schema.GroupVersionResource { return schema.GroupVersionResource{ - Group: "appmesh.k8s.aws", - Version: "v1beta2", + Group: AppMeshCRDGroup, + Version: defaults.GetAppMeshCRDVersion(), Resource: "virtualnodes", } }