fix the e2e test and add cadata

Signed-off-by: Ryan Zhang <[email protected]>

Author: ryanzhang-oss

pkg/propertyprovider/azure/provider.go

@@ -19,6 +19,7 @@ package azure
 
 import (
 	"context"
+	"encoding/base64"
 	"fmt"
 	"sync"
 	"time"
@@ -112,6 +113,10 @@ type PropertyProvider struct {
 	// Cached cluster entry point.
 	clusterEntryPoint             string
 	clusterEntryPointObservedTime time.Time
+
+	// Cached cluster certificate authority data (base64 encoded).
+	clusterCertificateAuthority             string
+	clusterCertificateAuthorityObservedTime time.Time
 }
 
 // Verify that the Azure property provider implements the MetricProvider interface at compile time.
@@ -253,6 +258,15 @@ func (p *PropertyProvider) Start(ctx context.Context, config *rest.Config) error
 	p.clusterEntryPoint = config.Host
 	p.clusterEntryPointObservedTime = time.Now()
 
+	// Cache the cluster certificate authority data (base64 encoded).
+	if len(config.CAData) > 0 {
+		p.clusterCertificateAuthority = base64.StdEncoding.EncodeToString(config.CAData)
+		p.clusterCertificateAuthorityObservedTime = time.Now()
+		klog.V(2).Info("Cached cluster certificate authority data")
+	} else {
+		klog.V(2).Info("No certificate authority data available in rest.Config")
+	}
+
 	// Set up the node reconciler.
 	klog.V(2).Info("Setting up the node reconciler")
 	nodeReconciler := &controllers.NodeReconciler{
@@ -345,10 +359,20 @@ func (p *PropertyProvider) Collect(ctx context.Context) propertyprovider.Propert
 		p.collectAvailableResource(ctx, &resources)
 	}
 
-	// insert the cluster entry point property
-	properties[propertyprovider.ClusterEntryPointProperty] = clusterv1beta1.PropertyValue{
-		Value:           p.clusterEntryPoint,
-		ObservationTime: metav1.NewTime(p.clusterEntryPointObservedTime),
+	// insert the cluster entry point property (if available)
+	if p.clusterEntryPoint != "" {
+		properties[propertyprovider.ClusterEntryPointProperty] = clusterv1beta1.PropertyValue{
+			Value:           p.clusterEntryPoint,
+			ObservationTime: metav1.NewTime(p.clusterEntryPointObservedTime),
+		}
+	}
+
+	// insert the cluster certificate authority property (if available)
+	if p.clusterCertificateAuthority != "" {
+		properties[propertyprovider.ClusterCertificateAuthorityProperty] = clusterv1beta1.PropertyValue{
+			Value:           p.clusterCertificateAuthority,
+			ObservationTime: metav1.NewTime(p.clusterCertificateAuthorityObservedTime),
+		}
 	}
 
 	// Return the collection response.

pkg/propertyprovider/azure/provider_integration_test.go

@@ -40,7 +40,7 @@ import (
 var (
 	ignoreObservationTimeFieldInPropertyValue = cmpopts.IgnoreFields(clusterv1beta1.PropertyValue{}, "ObservationTime")
 	ignoreNonDeterministicProperty            = cmpopts.IgnoreMapEntries(func(k clusterv1beta1.PropertyName, v clusterv1beta1.PropertyValue) bool {
-		return k == propertyprovider.K8sVersionProperty || k == propertyprovider.ClusterEntryPointProperty
+		return k == propertyprovider.K8sVersionProperty || k == propertyprovider.ClusterEntryPointProperty || k == propertyprovider.ClusterCertificateAuthorityProperty
 	})
 )
 

pkg/propertyprovider/commons.go

@@ -30,6 +30,9 @@ const (
 	// ClusterEntryPointProperty is a property that describes the cluster entry point (API server endpoint).
 	ClusterEntryPointProperty = "k8s.io/cluster-entrypoint"
 
+	// ClusterCertificateAuthorityProperty is a property that describes the cluster's certificate authority data (base64 encoded).
+	ClusterCertificateAuthorityProperty = "k8s.io/cluster-certificate-authority-data"
+
 	// The resource properties.
 	// Total and allocatable CPU resource properties.
 	TotalCPUCapacityProperty       = "resources.kubernetes-fleet.io/total-cpu"

pkg/scheduler/scheduler.go

@@ -228,7 +228,9 @@ func (s *Scheduler) scheduleOnce(ctx context.Context, worker int) {
 	}
 
 	// Requeue if the scheduling cycle suggests so.
-	if res.Requeue { //nolint:golint //no lint SA1019 we need more time to fully migrate to RequeueAfter as we used these two fields separately.
+	//nolint:staticcheck
+	//lint:ignore SA1019 we need more time to fully migrate to RequeueAfter as we used these two fields separately.
+	if res.Requeue {
 		if res.RequeueAfter > 0 {
 			s.queue.AddAfter(placementKey, res.RequeueAfter)
 			observeSchedulingCycleMetrics(cycleStartTime, false, true)

pkg/utils/controller/controller.go

@@ -284,7 +284,9 @@ func (w *controller) reconcileHandler(ctx context.Context, key interface{}) {
 		w.queue.Forget(key)
 		w.queue.AddAfter(key, result.RequeueAfter)
 		metrics.FleetReconcileTotal.WithLabelValues(w.name, labelRequeueAfter).Inc()
-	case result.Requeue: //nolint:golint // SA1019 we need more time to fully migrate to RequeueAfter as we used these two fields separately.
+	//nolint:staticcheck
+	//lint:ignore SA1019 we need more time to fully migrate to RequeueAfter as we used these two fields separately.
+	case result.Requeue:
 		w.queue.AddRateLimited(key)
 		metrics.FleetReconcileTotal.WithLabelValues(w.name, labelRequeue).Inc()
 	default:

test/e2e/join_and_leave_test.go

@@ -479,61 +479,65 @@ var _ = Describe("Test member cluster join and leave without placement", Label("
 
 var _ = Describe("Test member cluster join and leave with clusterProfile", Label("joinleave"), Ordered, Serial, func() {
 	clusterProfileList := &clusterinventory.ClusterProfileList{}
-
-	It("Make sure we have all the cluster profiles", func() {
-		Eventually(func() error {
-			if err := hubClient.List(ctx, clusterProfileList, &client.ListOptions{Namespace: utils.FleetSystemNamespace}); err != nil {
-				return fmt.Errorf("failed to get cluster profiles: %w", err)
-			}
-
-			// create a map for easy lookup
-			cpMap := make(map[string]clusterinventory.ClusterProfile)
-			for idx := range clusterProfileList.Items {
-				cp := clusterProfileList.Items[idx]
-				cpMap[cp.Name] = cp
-			}
-			// make sure all the member clusters have a cluster profile
-			for idx := range allMemberClusterNames {
-				cp, ok := cpMap[allMemberClusterNames[idx]]
-				if !ok {
-					return fmt.Errorf("cluster profile for member cluster %s not found", allMemberClusterNames[idx])
+	Context("Test cluster profile and ", Label("joinleave"), Ordered, Serial, func() {
+		It("Make sure we have all the cluster profiles", func() {
+			Eventually(func() error {
+				if err := hubClient.List(ctx, clusterProfileList, &client.ListOptions{Namespace: utils.FleetSystemNamespace}); err != nil {
+					return fmt.Errorf("failed to get cluster profiles: %w", err)
 				}
-				if cp.Status.Version.Kubernetes == "" {
-					return fmt.Errorf("cluster profile %s Kubernetes version should not be empty", cp.Name)
-				}
-				if len(cp.Status.AccessProviders) != 1 {
-					return fmt.Errorf("cluster profile %s has no access providers %+v", cp.Name, cp.Status.AccessProviders)
-				}
-				if cp.Status.AccessProviders[0].Name != controller.ClusterManagerName {
-					return fmt.Errorf("cluster profile %s access provider name %s doesn't match expected %s", cp.Name, cp.Status.AccessProviders[0].Name, controller.ClusterManagerName)
+
+				// create a map for easy lookup
+				cpMap := make(map[string]clusterinventory.ClusterProfile)
+				for idx := range clusterProfileList.Items {
+					cp := clusterProfileList.Items[idx]
+					cpMap[cp.Name] = cp
 				}
-				if cp.Status.AccessProviders[0].Cluster.Server == "" {
-					return fmt.Errorf("cluster profile %s access provider server should not be empty", allMemberClusterNames[idx])
+				// make sure all the member clusters have a cluster profile
+				for idx := range allMemberClusterNames {
+					cp, ok := cpMap[allMemberClusterNames[idx]]
+					if !ok {
+						return fmt.Errorf("cluster profile for member cluster %s not found", allMemberClusterNames[idx])
+					}
+					if cp.Status.Version.Kubernetes == "" {
+						return fmt.Errorf("cluster profile %s Kubernetes version should not be empty", cp.Name)
+					}
+					if len(cp.Status.AccessProviders) != 1 {
+						return fmt.Errorf("cluster profile %s has no access providers %+v", cp.Name, cp.Status.AccessProviders)
+					}
+					if cp.Status.AccessProviders[0].Name != controller.ClusterManagerName {
+						return fmt.Errorf("cluster profile %s access provider name %s doesn't match expected %s", cp.Name, cp.Status.AccessProviders[0].Name, controller.ClusterManagerName)
+					}
+					if cp.Status.AccessProviders[0].Cluster.Server == "" {
+						return fmt.Errorf("cluster profile %s access provider server should not be empty", allMemberClusterNames[idx])
+					}
+					if len(cp.Status.AccessProviders[0].Cluster.CertificateAuthorityData) == 0 {
+						return fmt.Errorf("cluster profile %s access provider certificate authority data should not be empty", allMemberClusterNames[idx])
+					}
 				}
-			}
-			return nil
-		}, eventuallyDuration, eventuallyInterval).Should(Succeed(), "Failed to verify cluster profiles")
-	})
+				return nil
+			}, eventuallyDuration, eventuallyInterval).Should(Succeed(), "Failed to verify cluster profiles")
+		})
 
-	It("Delete member cluster CR associated to the member cluster to simulate member left", func() {
-		var mc clusterv1beta1.MemberCluster
-		Expect(hubClient.Get(ctx, types.NamespacedName{Name: memberCluster3WestProdName}, &mc)).To(Succeed(), "Failed to get member cluster")
-		Expect(hubClient.Delete(ctx, &mc)).Should(Succeed())
-	})
+		It("Delete member cluster CR associated to the member cluster to simulate member left", func() {
+			var mc clusterv1beta1.MemberCluster
+			Expect(hubClient.Get(ctx, types.NamespacedName{Name: memberCluster3WestProdName}, &mc)).To(Succeed(), "Failed to get member cluster")
+			Expect(hubClient.Delete(ctx, &mc)).Should(Succeed())
+		})
 
-	It("Make sure we delete the corresponding cluster profiles", func() {
-		Eventually(func() error {
-			if err := hubClient.List(ctx, clusterProfileList, &client.ListOptions{Namespace: utils.FleetSystemNamespace}); err != nil {
-				return fmt.Errorf("failed to get cluster profiles: %w", err)
-			}
-			for idx := range clusterProfileList.Items {
-				cp := clusterProfileList.Items[idx]
-				if cp.Name == memberCluster3WestProdName {
-					return fmt.Errorf("cluster profile for member cluster %s should be deleted", memberCluster3WestProdName)
+		It("Make sure we delete the corresponding cluster profiles", func() {
+			Eventually(func() error {
+				if err := hubClient.List(ctx, clusterProfileList, &client.ListOptions{Namespace: utils.FleetSystemNamespace}); err != nil {
+					return fmt.Errorf("failed to get cluster profiles: %w", err)
 				}
-			}
-			return nil
-		}, eventuallyDuration, eventuallyInterval).Should(Succeed(), "Failed to verify cluster profiles")
+				for idx := range clusterProfileList.Items {
+					cp := clusterProfileList.Items[idx]
+					if cp.Name == memberCluster3WestProdName {
+						return fmt.Errorf("cluster profile for member cluster %s should be deleted", memberCluster3WestProdName)
+					}
+				}
+				return nil
+			}, eventuallyDuration, eventuallyInterval).Should(Succeed(), "Failed to verify cluster profiles")
+		})
 	})
 
 	AfterAll(func() {

test/e2e/utils_test.go

@@ -314,7 +314,7 @@ func checkIfAzurePropertyProviderIsWorking() {
 			})
 			// we don't know the exact value of k8s version and cluster entry point
 			ignoreClusterProperties := cmpopts.IgnoreMapEntries(func(k clusterv1beta1.PropertyName, v clusterv1beta1.PropertyValue) bool {
-				return k == propertyprovider.K8sVersionProperty || k == propertyprovider.ClusterEntryPointProperty
+				return k == propertyprovider.K8sVersionProperty || k == propertyprovider.ClusterEntryPointProperty || k == propertyprovider.ClusterCertificateAuthorityProperty
 			})
 			if diff := cmp.Diff(
 				mcObj.Status.Properties, wantStatus.Properties,