From 11ef7836190224010e64636921742fbd88e723b4 Mon Sep 17 00:00:00 2001 From: Sergii Leshchenko Date: Tue, 9 Mar 2021 16:03:25 +0200 Subject: [PATCH] Fix check if ImagePuller API is installed --- pkg/deploy/kubernetes_image_puller.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkg/deploy/kubernetes_image_puller.go b/pkg/deploy/kubernetes_image_puller.go index 32c40da155..3cbf5678e5 100644 --- a/pkg/deploy/kubernetes_image_puller.go +++ b/pkg/deploy/kubernetes_image_puller.go @@ -257,22 +257,24 @@ func SubscriptionsAreEqual(expected *operatorsv1alpha1.Subscription, actual *ope // foundKubernetesImagePullerAPI - true if the server discovers the che.eclipse.org API // error - any error returned by the call to discoveryClient.ServerGroups() func CheckNeededImagePullerApis(ctx *DeployContext) (bool, bool, bool, error) { - groupList, err := ctx.ClusterAPI.DiscoveryClient.ServerGroups() + groupList, resourcesList, err := ctx.ClusterAPI.DiscoveryClient.ServerGroupsAndResources() if err != nil { return false, false, false, err } - groups := groupList.Groups foundPackagesAPI := false foundOperatorsAPI := false foundKubernetesImagePullerAPI := false - for _, group := range groups { + for _, group := range groupList { if group.Name == packagesv1.SchemeGroupVersion.Group { foundPackagesAPI = true } if group.Name == operatorsv1alpha1.SchemeGroupVersion.Group { foundOperatorsAPI = true } - if group.Name == chev1alpha1.SchemeGroupVersion.Group { + } + + for _, r := range resourcesList { + if r.Kind == "KubernetesImagePuller" { foundKubernetesImagePullerAPI = true } }