Fix OADP-4623: OpenShift on IBMCloud setup for OADP (#1482)

* Fix OADP-4623: OpenShift on IBMCLoud setup for OADP

* fix unit tests and minor updates

* add updates for host-plugins host path

* fix unit tests

* lint fix

bundle/manifests/oadp-operator.clusterserviceversion.yaml

@@ -648,6 +648,8 @@ spec:
           - infrastructures
           verbs:
           - get
+          - list
+          - watch
         - apiGroups:
           - cloudcredential.openshift.io
           resources:
@@ -904,6 +906,9 @@ spec:
                   valueFrom:
                     fieldRef:
                       fieldPath: metadata.annotations['olm.targetNamespaces']
+                - name: RESTIC_PV_HOSTPATH
+                - name: FS_PV_HOSTPATH
+                - name: PLUGINS_HOSTPATH
                 - name: RELATED_IMAGE_VELERO
                   value: quay.io/konveyor/velero:latest
                 - name: RELATED_IMAGE_VELERO_RESTORE_HELPER

config/manager/manager.yaml

@@ -36,6 +36,12 @@ spec:
             valueFrom:
               fieldRef:
                 fieldPath: metadata.namespace
+          - name: RESTIC_PV_HOSTPATH
+            value: ""
+          - name: FS_PV_HOSTPATH
+            value: ""
+          - name: PLUGINS_HOSTPATH
+            value: ""
           - name: RELATED_IMAGE_VELERO
             value: quay.io/konveyor/velero:latest
           - name: RELATED_IMAGE_VELERO_RESTORE_HELPER

config/rbac/role.yaml

@@ -12,6 +12,8 @@ rules:
   - infrastructures
   verbs:
   - get
+  - list
+  - watch
 - apiGroups:
   - cloudcredential.openshift.io
   resources:

controllers/bsl_test.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/go-logr/logr"
 	"github.com/google/go-cmp/cmp"
+	configv1 "github.com/openshift/api/config/v1"
 	velerov1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -36,6 +37,11 @@ func getSchemeForFakeClient() (*runtime.Scheme, error) {
 		return nil, err
 	}
 
+	err = configv1.AddToScheme((scheme.Scheme))
+	if err != nil {
+		return nil, err
+	}
+
 	return scheme.Scheme, nil
 }
 

controllers/nodeagent.go

@@ -7,6 +7,7 @@ import (
 	"reflect"
 
 	"github.com/go-logr/logr"
+	configv1 "github.com/openshift/api/config/v1"
 	"github.com/operator-framework/operator-lib/proxy"
 	"github.com/vmware-tanzu/velero/pkg/install"
 	appsv1 "k8s.io/api/apps/v1"
@@ -25,14 +26,24 @@ import (
 )
 
 const (
-	ResticRestoreHelperCM = "restic-restore-action-config"
-	FsRestoreHelperCM     = "fs-restore-action-config"
-	HostPods              = "host-pods"
-	HostPlugins           = "host-plugins"
+	ResticRestoreHelperCM   = "restic-restore-action-config"
+	FsRestoreHelperCM       = "fs-restore-action-config"
+	HostPods                = "host-pods"
+	HostPlugins             = "host-plugins"
+	Cluster                 = "cluster"
+	IBMCloudPlatform        = "IBMCloud"
+	GenericPVHostPath       = "/var/lib/kubelet/pods"
+	IBMCloudPVHostPath      = "/var/data/kubelet/pods"
+	GenericPluginsHostPath  = "/var/lib/kubelet/plugins"
+	IBMCloudPluginsHostPath = "/var/data/kubelet/plugins"
+	ResticPVHostPathEnvVar  = "RESTIC_PV_HOSTPATH"
+	FSPVHostPathEnvVar      = "FS_PV_HOSTPATH"
+	PluginsHostPathEnvVar   = "PLUGINS_HOSTPATH"
 )
 
 var (
-	fsPvHostPath string = getFsPvHostPath()
+	fsPvHostPath    = getFsPvHostPath("")
+	pluginsHostPath = getPluginsHostPath("")
 
 	// v1.MountPropagationHostToContainer is a const. Const cannot be pointed to.
 	// we need to declare mountPropagationToHostContainer so that we have an address to point to
@@ -47,19 +58,40 @@ var (
 	}
 )
 
-func getFsPvHostPath() string {
-	env := os.Getenv("RESTIC_PV_HOSTPATH")
-	envFs := os.Getenv("FS_PV_HOSTPATH")
+// getFsPvHostPath returns the host path for persistent volumes based on the platform type.
+func getFsPvHostPath(platformType string) string {
+	// Check if environment variables are set for host paths
+	if envFs := os.Getenv(FSPVHostPathEnvVar); envFs != "" {
+		return envFs
+	}
 
-	if env != "" {
+	if env := os.Getenv(ResticPVHostPathEnvVar); env != "" {
 		return env
 	}
 
-	if envFs != "" {
-		return envFs
+	// Return platform-specific host paths
+	switch platformType {
+	case IBMCloudPlatform:
+		return IBMCloudPVHostPath
+	default:
+		return GenericPVHostPath
+	}
+}
+
+// getPluginsHostPath returns the host path for persistent volumes based on the platform type.
+func getPluginsHostPath(platformType string) string {
+	// Check if environment var is set for host plugins
+	if env := os.Getenv(PluginsHostPathEnvVar); env != "" {
+		return env
 	}
 
-	return "/var/lib/kubelet/pods"
+	// Return platform-specific host paths
+	switch platformType {
+	case IBMCloudPlatform:
+		return IBMCloudPluginsHostPath
+	default:
+		return GenericPluginsHostPath
+	}
 }
 
 func getNodeAgentObjectMeta(r *DPAReconciler) metav1.ObjectMeta {
@@ -281,10 +313,22 @@ func (r *DPAReconciler) customizeNodeAgentDaemonset(dpa *oadpv1alpha1.DataProtec
 			},
 		})
 
+	// check platform type
+	platformType, err := r.getPlatformType()
+	if err != nil {
+		return nil, fmt.Errorf("error checking platform type: %s", err)
+	}
 	// update nodeAgent host PV path
 	for i, vol := range ds.Spec.Template.Spec.Volumes {
 		if vol.Name == HostPods {
-			ds.Spec.Template.Spec.Volumes[i].HostPath.Path = getFsPvHostPath()
+			ds.Spec.Template.Spec.Volumes[i].HostPath.Path = getFsPvHostPath(platformType)
+		}
+	}
+
+	// update nodeAgent plugins host path
+	for i, vol := range ds.Spec.Template.Spec.Volumes {
+		if vol.Name == HostPlugins {
+			ds.Spec.Template.Spec.Volumes[i].HostPath.Path = getPluginsHostPath(platformType)
 		}
 	}
 
@@ -310,6 +354,13 @@ func (r *DPAReconciler) customizeNodeAgentDaemonset(dpa *oadpv1alpha1.DataProtec
 				Name:      "certs",
 				MountPath: "/etc/ssl/certs",
 			})
+
+			// update nodeAgent plugins volume mount host path
+			for v, volumeMount := range nodeAgentContainer.VolumeMounts {
+				if volumeMount.Name == HostPlugins {
+					nodeAgentContainer.VolumeMounts[v].MountPath = getPluginsHostPath(platformType)
+				}
+			}
 			// append PodConfig envs to nodeAgent container
 			if useResticConf {
 				if dpa.Spec.Configuration.Restic.PodConfig != nil && dpa.Spec.Configuration.Restic.PodConfig.Env != nil {
@@ -452,3 +503,19 @@ func (r *DPAReconciler) updateFsRestoreHelperCM(fsRestoreHelperCM *corev1.Config
 
 	return nil
 }
+
+// getPlatformType fetches the cluster infrastructure object and returns the platform type.
+func (r *DPAReconciler) getPlatformType() (string, error) {
+	infra := &configv1.Infrastructure{}
+	key := types.NamespacedName{Name: Cluster}
+	if err := r.Get(r.Context, key, infra); err != nil {
+		return "", err
+	}
+
+	if platformStatus := infra.Status.PlatformStatus; platformStatus != nil {
+		if platformType := platformStatus.Type; platformType != "" {
+			return string(platformType), nil
+		}
+	}
+	return "", nil
+}