Merge pull request #48 from jparrill/OADP-6121

OADP-6121: Return early when plugin enabled but not HC involved

Author: openshift-merge-bot[bot]

pkg/common/utils.go

@@ -400,3 +400,41 @@ func GetHCP(ctx context.Context, nsList []string, client crclient.Client, log lo
 func GetHCPNamespace(name, namespace string) string {
 	return fmt.Sprintf("%s-%s", namespace, name)
 }
+
+// ShouldEndPluginExecution checks if the plugin should end execution by verifying if the required
+// Hypershift resources (HostedControlPlane and HostedCluster) exist in the cluster.
+// Returns true if the plugin should end execution (i.e., if this is not a Hypershift cluster).
+func ShouldEndPluginExecution(namespaces []string, client crclient.Client, log logrus.FieldLogger) bool {
+	// Check if HostedControlPlane exists
+	hcpList := &hyperv1.HostedControlPlaneList{}
+	for _, ns := range namespaces {
+		if err := client.List(context.TODO(), hcpList, crclient.InNamespace(ns)); err != nil {
+			log.Debugf("Error checking for HostedControlPlanes: %v", err)
+			return true
+		}
+		if len(hcpList.Items) > 0 {
+			break
+		}
+	}
+
+	// Check if HostedCluster exists
+	hcList := &hyperv1.HostedClusterList{}
+	for _, ns := range namespaces {
+		if err := client.List(context.TODO(), hcList, crclient.InNamespace(ns)); err != nil {
+			log.Debugf("Error checking for HostedCluster: %v", err)
+			return true
+		}
+		if len(hcList.Items) > 0 {
+			break
+		}
+	}
+
+	// If the resources are found, we assume a HostedControlPlane needs to be backed up
+	if len(hcpList.Items) > 0 && len(hcList.Items) > 0 {
+		log.Debug("Found Hypershift resources")
+		return false
+	}
+
+	log.Debug("No Hypershift resources found")
+	return true
+}

pkg/common/utils_test.go

@@ -736,3 +736,50 @@ func (f *fakeClient) Delete(ctx context.Context, obj client.Object, opts ...clie
 	f.deletedPods[obj.GetName()] = true
 	return nil
 }
+
+func TestShouldEndPluginExecution(t *testing.T) {
+	tests := []struct {
+		name           string
+		objects        []client.Object
+		expectedResult bool
+	}{
+		{
+			name: "CRDs exist",
+			objects: []client.Object{
+				&hyperv1.HostedControlPlane{
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      "test-hcp",
+						Namespace: "test-namespace",
+					},
+				},
+				&hyperv1.HostedCluster{
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      "test-hc",
+						Namespace: "test-namespace",
+					},
+				},
+			},
+			expectedResult: false,
+		},
+		{
+			name:           "CRDs do not exist",
+			objects:        []client.Object{},
+			expectedResult: true,
+		},
+	}
+
+	scheme := runtime.NewScheme()
+	_ = hyperv1.AddToScheme(scheme)
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			g := NewWithT(t)
+
+			client := fake.NewClientBuilder().WithScheme(scheme).WithObjects(tt.objects...).Build()
+			log := logrus.New()
+
+			result := ShouldEndPluginExecution([]string{"test-namespace"}, client, log)
+			g.Expect(result).To(Equal(tt.expectedResult))
+		})
+	}
+}

pkg/core/backup.go

@@ -132,10 +132,18 @@ func (p *BackupPlugin) Execute(item runtime.Unstructured, backup *velerov1.Backu
 	p.log.Debug("Entering Hypershift backup plugin")
 	ctx := context.Context(p.ctx)
 
+	if returnEarly := common.ShouldEndPluginExecution(backup.Spec.IncludedNamespaces, p.client, p.log); returnEarly {
+		return item, nil, nil
+	}
+
 	if p.hcp == nil {
 		var err error
 		p.hcp, err = common.GetHCP(ctx, backup.Spec.IncludedNamespaces, p.client, p.log)
 		if err != nil {
+			if apierrors.IsNotFound(err) {
+				p.log.Infof("HCP not found, assuming not hypershift cluster to backup")
+				return item, nil, nil
+			}
 			return nil, nil, fmt.Errorf("error getting HCP namespace: %v", err)
 		}