Merge pull request #282 from gianlucam76/is-cluster-ready

Advance libsveltos pin

Author: gianlucam76

controllers/clusterprofile_controller_test.go

@@ -737,17 +737,13 @@ var _ = Describe("ClusterProfile: Reconciler", func() {
 	})
 
 	It("updateClusterSummaries creates ClusterSummary for each matching CAPI Cluster", func() {
-		cpMachine := &clusterv1.Machine{
-			ObjectMeta: metav1.ObjectMeta{
-				Namespace: matchingCluster.Namespace,
-				Name:      matchingCluster.Name,
-				Labels: map[string]string{
-					clusterv1.ClusterNameLabel:         matchingCluster.Name,
-					clusterv1.MachineControlPlaneLabel: "ok",
-				},
+		matchingCluster.Status.Conditions = []clusterv1.Condition{
+			{
+				Type:   clusterv1.ControlPlaneInitializedCondition,
+				Status: corev1.ConditionTrue,
 			},
 		}
-		cpMachine.Status.SetTypedPhase(clusterv1.MachinePhaseRunning)
+		nonMatchingCluster.Status.Conditions = matchingCluster.Status.Conditions
 
 		clusterProfile.Status.MatchingClusterRefs = []corev1.ObjectReference{
 			{
@@ -761,7 +757,6 @@ var _ = Describe("ClusterProfile: Reconciler", func() {
 			clusterProfile,
 			nonMatchingCluster,
 			matchingCluster,
-			cpMachine,
 		}
 
 		c := fake.NewClientBuilder().WithScheme(scheme).WithStatusSubresource(initObjects...).WithObjects(initObjects...).Build()
@@ -795,17 +790,12 @@ var _ = Describe("ClusterProfile: Reconciler", func() {
 	})
 
 	It("updateClusterSummaries updates existing ClusterSummary for each matching CAPI Cluster", func() {
-		cpMachine := &clusterv1.Machine{
-			ObjectMeta: metav1.ObjectMeta{
-				Namespace: matchingCluster.Namespace,
-				Name:      matchingCluster.Name,
-				Labels: map[string]string{
-					clusterv1.ClusterNameLabel:         matchingCluster.Name,
-					clusterv1.MachineControlPlaneLabel: "ok",
-				},
+		matchingCluster.Status.Conditions = []clusterv1.Condition{
+			{
+				Type:   clusterv1.ControlPlaneInitializedCondition,
+				Status: corev1.ConditionTrue,
 			},
 		}
-		cpMachine.Status.SetTypedPhase(clusterv1.MachinePhaseRunning)
 
 		clusterProfile.Status.MatchingClusterRefs = []corev1.ObjectReference{
 			{
@@ -853,7 +843,6 @@ var _ = Describe("ClusterProfile: Reconciler", func() {
 			nonMatchingCluster,
 			matchingCluster,
 			clusterSummary,
-			cpMachine,
 		}
 
 		c := fake.NewClientBuilder().WithScheme(scheme).WithStatusSubresource(initObjects...).WithObjects(initObjects...).Build()

go.mod

@@ -17,7 +17,7 @@ require (
 	github.com/onsi/ginkgo/v2 v2.11.0
 	github.com/onsi/gomega v1.27.8
 	github.com/pkg/errors v0.9.1
-	github.com/projectsveltos/libsveltos v0.13.1-0.20230714121025-0c26a52db18a
+	github.com/projectsveltos/libsveltos v0.13.1-0.20230720120954-d9bf8ba153e8
 	github.com/prometheus/client_golang v1.16.0
 	github.com/spf13/pflag v1.0.5
 	github.com/yuin/gopher-lua v1.1.0

go.sum

@@ -557,8 +557,8 @@ github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSg
 github.com/poy/onpar v0.0.0-20200406201722-06f95a1c68e8/go.mod h1:nSbFQvMj97ZyhFRSJYtut+msi4sOY6zJDGCdSc+/rZU=
 github.com/poy/onpar v1.1.2 h1:QaNrNiZx0+Nar5dLgTVp5mXkyoVFIbepjyEoGSnhbAY=
 github.com/poy/onpar v1.1.2/go.mod h1:6X8FLNoxyr9kkmnlqpK6LSoiOtrO6MICtWwEuWkLjzg=
-github.com/projectsveltos/libsveltos v0.13.1-0.20230714121025-0c26a52db18a h1:0LXghU3MN1rg/s6k90a4HXjcxEu5emorM2M5UJUCZYQ=
-github.com/projectsveltos/libsveltos v0.13.1-0.20230714121025-0c26a52db18a/go.mod h1:Ty+xhEY1F6dWfMTG36izU6XFtzWVBOwzOc41OekkIWg=
+github.com/projectsveltos/libsveltos v0.13.1-0.20230720120954-d9bf8ba153e8 h1:cukptjA3Mau1CRa8FAiznfTGHs1WiJ1QRQBp5HoLHqc=
+github.com/projectsveltos/libsveltos v0.13.1-0.20230720120954-d9bf8ba153e8/go.mod h1:Ty+xhEY1F6dWfMTG36izU6XFtzWVBOwzOc41OekkIWg=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso=
 github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=