stop running get ca from service account test for ocp 1.24 or above

Signed-off-by: zhujian <[email protected]>
stolostron · Nov 10, 2023 · 25e85cf · 25e85cf
1 parent 4471917
commit 25e85cf
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 8 deletions.
diff --git a/test/e2e/e2e_suite_test.go b/test/e2e/e2e_suite_test.go
@@ -8,17 +8,19 @@ import (
 	"github.com/onsi/ginkgo/v2"
 	"github.com/onsi/gomega"
 	openshiftclientset "github.com/openshift/client-go/config/clientset/versioned"
-	"github.com/stolostron/cluster-lifecycle-api/helpers/imageregistry"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
-	"github.com/stolostron/multicloud-operators-foundation/test/e2e/util"
-
 	hiveclient "github.com/openshift/hive/pkg/client/clientset/versioned"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/version"
+	"k8s.io/client-go/discovery"
 	"k8s.io/client-go/dynamic"
 	"k8s.io/client-go/kubernetes"
 	apiregistrationclient "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1"
+
+	"github.com/stolostron/cluster-lifecycle-api/helpers/imageregistry"
 	addonv1alpha1client "open-cluster-management.io/api/client/addon/clientset/versioned"
 	clusterclient "open-cluster-management.io/api/client/cluster/clientset/versioned"
+
+	"github.com/stolostron/multicloud-operators-foundation/test/e2e/util"
 )
 
 func TestE2E(t *testing.T) {
@@ -33,6 +35,7 @@ const (
 
 var (
 	dynamicClient         dynamic.Interface
+	discoveryClient       discovery.DiscoveryInterface
 	kubeClient            kubernetes.Interface
 	hiveClient            hiveclient.Interface
 	clusterClient         clusterclient.Interface
@@ -42,8 +45,8 @@ var (
 	imageRegistryClient   imageregistry.Interface
 	defaultManagedCluster string
 	foundationNS          string
-	deployedByACM         = false
 	isOcp                 = false
+	hubVersionInfo        *version.Info
 )
 
 // This suite is sensitive to the following environment variables:
@@ -66,6 +69,9 @@ var _ = ginkgo.BeforeSuite(func() {
 	dynamicClient, err = util.NewDynamicClient()
 	gomega.Expect(err).ToNot(gomega.HaveOccurred())
 
+	discoveryClient, err = util.NewDiscoveryClient()
+	gomega.Expect(err).ToNot(gomega.HaveOccurred())
+
 	kubeClient, err = util.NewKubeClient()
 	gomega.Expect(err).ToNot(gomega.HaveOccurred())
 
@@ -79,6 +85,8 @@ var _ = ginkgo.BeforeSuite(func() {
 	gomega.Expect(err).ToNot(gomega.HaveOccurred())
 
 	imageRegistryClient, err = util.NewImageRegistryClient()
+	gomega.Expect(err).ToNot(gomega.HaveOccurred())
+
 	cfg, err := util.NewKubeConfig()
 	gomega.Expect(err).ToNot(gomega.HaveOccurred())
 	addonClient, err = addonv1alpha1client.NewForConfig(cfg)
@@ -93,6 +101,13 @@ var _ = ginkgo.BeforeSuite(func() {
 		gomega.Expect(err).ToNot(gomega.HaveOccurred())
 	}
 
+	hubVersionInfo, err = discoveryClient.ServerVersion()
+	gomega.Expect(err).ToNot(gomega.HaveOccurred())
+
+	if hubVersionInfo != nil {
+		ginkgo.By("hub version: " + hubVersionInfo.String())
+	}
+
 	gomega.Eventually(func() error {
 		_, err = kubeClient.AppsV1().Deployments("open-cluster-management-agent-addon").Get(context.TODO(), "klusterlet-addon-workmgr", metav1.GetOptions{})
 		return err

diff --git a/test/e2e/managedcluster_test.go b/test/e2e/managedcluster_test.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"net/url"
 	"reflect"
+	"strconv"
 
 	"github.com/onsi/ginkgo/v2"
 	"github.com/onsi/gomega"
@@ -156,8 +157,24 @@ var _ = ginkgo.Describe("Testing ManagedCluster", func() {
 		})
 
 		ginkgo.It("Get CA from service account", func() {
-			//Only need to test this case in ocp
+			// Only need to test this case in ocp (kubernetes version < 1.24)
 			if !isOcp {
+				ginkgo.By("hub is not ocp, skip running this test")
+				return
+			}
+
+			if hubVersionInfo == nil {
+				ginkgo.By("hub version is nil, skip running this test")
+				return
+			}
+			major, err := strconv.Atoi(hubVersionInfo.Major)
+			gomega.Expect(err).ToNot(gomega.HaveOccurred())
+			minor, err := strconv.Atoi(hubVersionInfo.Minor)
+			gomega.Expect(err).ToNot(gomega.HaveOccurred())
+
+			// check if the hub version is 1.24 or above
+			if major != 1 || minor >= 24 {
+				ginkgo.By(fmt.Sprintf("hub version is %s, skip running this test", hubVersionInfo.String()))
 				return
 			}
 			serviceAccountCa, err := utils.GetCAFromServiceAccount(context.TODO(), kubeClient)

diff --git a/test/e2e/util/util.go b/test/e2e/util/util.go
@@ -16,9 +16,9 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/client-go/discovery"
 	"k8s.io/client-go/dynamic"
 	"k8s.io/client-go/kubernetes"
-
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 	apiregistrationclient "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1"
@@ -131,6 +131,20 @@ func NewDynamicClient() (dynamic.Interface, error) {
 	return dynamicClient, nil
 }
 
+func NewDiscoveryClient() (discovery.DiscoveryInterface, error) {
+	kubeConfigFile, err := getKubeConfigFile()
+	if err != nil {
+		return nil, err
+	}
+
+	cfg, err := clientcmd.BuildConfigFromFlags("", kubeConfigFile)
+	if err != nil {
+		return nil, err
+	}
+
+	return discovery.NewDiscoveryClientForConfig(cfg)
+}
+
 func NewDynamicClientWithImpersonate(user string, groups []string) (dynamic.Interface, error) {
 	kubeConfigFile, err := getKubeConfigFile()
 	if err != nil {