Merge pull request #1555 from gianlucam76/drift-detection-upgrade

(bug) Drift-detection upgrade

Author: gianlucam76

controllers/drift_detection_upgrade.go

@@ -25,7 +25,9 @@ import (
 	"github.com/go-logr/logr"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
+	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/rest"
 	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -255,5 +257,32 @@ func skipUpgrading(ctx context.Context, c client.Client, cluster client.Object,
 		return true, nil
 	}
 
+	// Verify if ResourceSummary CRD is present. Th
+	resourceCRDPresent, err := isResourceSummaryCRDPresent(ctx, c, logger)
+	if err != nil {
+		return true, err
+	}
+
+	if !resourceCRDPresent {
+		return true, nil
+	}
+
 	return false, nil
 }
+
+func isResourceSummaryCRDPresent(ctx context.Context, c client.Client, logger logr.Logger) (bool, error) {
+	resourceSummaryCRD := &apiextensionsv1.CustomResourceDefinition{}
+
+	err := c.Get(ctx, types.NamespacedName{Name: "resourcesummaries.lib.projectsveltos.io"},
+		resourceSummaryCRD)
+
+	if err != nil {
+		if apierrors.IsNotFound(err) {
+			return false, nil
+		}
+		logger.V(logs.LogInfo).Error(err, "failed to verify presence of ResourceSummary CRD")
+		return false, err
+	}
+
+	return true, nil
+}

controllers/drift_detection_upgrade_test.go

@@ -31,6 +31,8 @@ import (
 
 	"github.com/projectsveltos/addon-controller/controllers"
 	libsveltosv1beta1 "github.com/projectsveltos/libsveltos/api/v1beta1"
+	libsveltoscrd "github.com/projectsveltos/libsveltos/lib/crd"
+	"github.com/projectsveltos/libsveltos/lib/k8s_utils"
 )
 
 var _ = Describe("Drift Detection Upgrade", func() {
@@ -107,12 +109,16 @@ var _ = Describe("Drift Detection Upgrade", func() {
 		}
 		Expect(addTypeInformationToObject(scheme, capiClusterNotPaused)).To(Succeed())
 
+		resourceSummaryCRD, err := k8s_utils.GetUnstructured(libsveltoscrd.GetResourceSummaryCRDYAML())
+		Expect(err).To(BeNil())
+
 		initObjects := []client.Object{
 			sveltosClusterPaused,
 			sveltosClusterNotReady,
 			sveltosClusterReadyAndNotPaused,
 			capiClusterPaused,
 			capiClusterNotPaused,
+			resourceSummaryCRD,
 		}
 
 		c := fake.NewClientBuilder().WithScheme(scheme).WithStatusSubresource(initObjects...).
@@ -138,4 +144,51 @@ var _ = Describe("Drift Detection Upgrade", func() {
 		Expect(err).To(BeNil())
 		Expect(skip).To(BeFalse())
 	})
+
+	It("skipUpgrading skips clusters with no ResourceSummary CRD", func() {
+		sveltosClusterReadyAndNotPaused := &libsveltosv1beta1.SveltosCluster{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      randomString(),
+				Namespace: randomString(),
+			},
+			Spec: libsveltosv1beta1.SveltosClusterSpec{
+				Paused: false,
+			},
+			Status: libsveltosv1beta1.SveltosClusterStatus{
+				Ready: true,
+			},
+		}
+		Expect(addTypeInformationToObject(scheme, sveltosClusterReadyAndNotPaused)).To(Succeed())
+
+		initialized := true
+		capiClusterNotPaused := &clusterv1.Cluster{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      randomString(),
+				Namespace: randomString(),
+			},
+			Spec: clusterv1.ClusterSpec{},
+			Status: clusterv1.ClusterStatus{
+				Initialization: clusterv1.ClusterInitializationStatus{
+					ControlPlaneInitialized: &initialized,
+				},
+			},
+		}
+		Expect(addTypeInformationToObject(scheme, capiClusterNotPaused)).To(Succeed())
+
+		initObjects := []client.Object{
+			sveltosClusterReadyAndNotPaused,
+			capiClusterNotPaused,
+		}
+
+		c := fake.NewClientBuilder().WithScheme(scheme).WithStatusSubresource(initObjects...).
+			WithObjects(initObjects...).Build()
+
+		skip, err := controllers.SkipUpgrading(context.TODO(), c, sveltosClusterReadyAndNotPaused, logger)
+		Expect(err).To(BeNil())
+		Expect(skip).To(BeTrue())
+
+		skip, err = controllers.SkipUpgrading(context.TODO(), c, capiClusterNotPaused, logger)
+		Expect(err).To(BeNil())
+		Expect(skip).To(BeTrue())
+	})
 })