From e03c1c0ced8b793c699e081c1c17b24eca96a1ee Mon Sep 17 00:00:00 2001 From: Wen Zhou Date: Fri, 8 Nov 2024 18:11:38 +0100 Subject: [PATCH] fix: lint Signed-off-by: Wen Zhou --- pkg/cluster/operator.go | 7 ++++--- pkg/feature/servicemesh/conditions.go | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkg/cluster/operator.go b/pkg/cluster/operator.go index aeaf9522601..5e2b0e7fe36 100644 --- a/pkg/cluster/operator.go +++ b/pkg/cluster/operator.go @@ -10,6 +10,7 @@ import ( ofapiv2 "github.com/operator-framework/api/pkg/operators/v2" apiextv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" "k8s.io/apimachinery/pkg/api/errors" + "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/wait" "sigs.k8s.io/controller-runtime/pkg/client" ) @@ -73,10 +74,10 @@ func OperatorExists(ctx context.Context, cli client.Client, operatorPrefix strin } // CustomResourceDefinitionExists checks if a CustomResourceDefinition with the given GVK exists. -func CustomResourceDefinitionExists(ctx context.Context, cli client.Client, crdName string) error { +func CustomResourceDefinitionExists(ctx context.Context, cli client.Client, crdGK schema.GroupKind) error { crd := &apiextv1.CustomResourceDefinition{} - resourceInterval, resourceTimeout := 5*time.Second, 1*time.Minute - name := strings.ToLower(crdName) + resourceInterval, resourceTimeout := 2*time.Second, 5*time.Second + name := strings.ToLower(fmt.Sprintf("%ss.%s", crdGK.Kind, crdGK.Group)) // we need plural form of the kind err := wait.PollUntilContextTimeout(ctx, resourceInterval, resourceTimeout, false, func(ctx context.Context) (bool, error) { err := cli.Get(ctx, client.ObjectKey{Name: name}, crd) diff --git a/pkg/feature/servicemesh/conditions.go b/pkg/feature/servicemesh/conditions.go index 3b37376e3b0..35d50737fbc 100644 --- a/pkg/feature/servicemesh/conditions.go +++ b/pkg/feature/servicemesh/conditions.go @@ -38,7 +38,7 @@ func EnsureServiceMeshOperatorInstalled(ctx context.Context, cli client.Client, return fmt.Errorf("failed to find the pre-requisite Service Mesh Operator subscription, please ensure Service Mesh Operator is installed. %w", err) } // Extra check SMCP CRD is installed and has become active. - if err := cluster.CustomResourceDefinitionExists(ctx, cli, gvk.ServiceMeshControlPlane.GroupKind().String()); err != nil { + if err := cluster.CustomResourceDefinitionExists(ctx, cli, gvk.ServiceMeshControlPlane.GroupKind()); err != nil { return fmt.Errorf("failed to find the Service Mesh Control Plane CRD, please ensure Service Mesh Operator is installed. %w", err) }