WIP

Signed-off-by: Michal Pryc <[email protected]>

Author: mpryc

api/v1alpha1/oadp_types.go

@@ -115,13 +115,13 @@ type PodConfig struct {
 	// labels to add to pods
 	// +optional
 	Labels map[string]string `json:"labels,omitempty"`
-	// nodeSelector defines the nodeSelector to be supplied to Restic podSpec
+	// nodeSelector defines the nodeSelector to be supplied to NodeAgent podSpec
 	// +optional
 	NodeSelector map[string]string `json:"nodeSelector,omitempty"`
-	// tolerations defines the list of tolerations to be applied to Restic daemonset
+	// tolerations defines the list of tolerations to be applied to NodeAgent daemonset
 	// +optional
 	Tolerations []corev1.Toleration `json:"tolerations,omitempty"`
-	// resourceAllocations defines the CPU and Memory resource allocations for the restic Pod
+	// resourceAllocations defines the CPU and Memory resource allocations for the NodeAgent Pod
 	// +optional
 	// +nullable
 	ResourceAllocations corev1.ResourceRequirements `json:"resourceAllocations,omitempty"`
@@ -130,26 +130,53 @@ type PodConfig struct {
 	Env []corev1.EnvVar `json:"env,omitempty"`
 }
 
-// ResticConfig is the configuration for restic server
-type ResticConfig struct {
+type NodeAgentCommonFields struct {
 	// enable defines a boolean pointer whether we want the daemonset to
 	// exist or not
 	// +optional
 	Enable *bool `json:"enable,omitempty"`
-	// supplementalGroups defines the linux groups to be applied to the Restic Pod
+	// supplementalGroups defines the linux groups to be applied to the NodeAgent Pod
 	// +optional
 	SupplementalGroups []int64 `json:"supplementalGroups,omitempty"`
-	// timeout defines the Restic timeout, default value is 1h
+	// timeout defines the NodeAgent timeout, default value is 1h
 	// +optional
 	Timeout string `json:"timeout,omitempty"`
 	// Pod specific configuration
 	PodConfig *PodConfig `json:"podConfig,omitempty"`
 }
 
+// NodeAgentConfig is the configuration for node server
+type NodeAgentConfig struct {
+	// Embedding NodeAgentCommonFields
+	// +optional
+	NodeAgentCommonFields `json:",inline"`
+
+	// The type of uploader to transfer the data of pod volumes, the supported values are 'restic' or 'kopia'
+	// +kubebuilder:validation:Enum=restic;kopia
+	// +kubebuilder:validation:Required
+	UploaderType string `json:"uploaderType"`
+}
+
+// ResticConfig is the configuration for restic server
+type ResticConfig struct {
+	// Embedding NodeAgentCommonFields
+	// +optional
+	NodeAgentCommonFields `json:",inline"`
+}
+
 // ApplicationConfig defines the configuration for the Data Protection Application
 type ApplicationConfig struct {
 	Velero *VeleroConfig `json:"velero,omitempty"`
+	// (deprecation warning) ResticConfig is the configuration for restic server.
+	// Restic is for backwards compatibility and is replaced by the nodeAgentConfig
+	// Restic will be removed with the OADP 1.4
+	// +kubebuilder:deprecatedversion:warning=1.3
+	// +optional
 	Restic *ResticConfig `json:"restic,omitempty"`
+
+	// NodeAgent is needed to allow selection between kopia or restic
+	// +optional
+	NodeAgent *NodeAgentConfig `json:"nodeAgentConfig,omitempty"`
 }
 
 type CloudStorageLocation struct {
@@ -269,7 +296,7 @@ type VolumeOptions struct {
 	// the data mover cache volume
 	//+optional
 	CacheStorageClassName string `json:"cacheStorageClassName,omitempty"`
-	// cacheCapacity determines the size of the restic metadata cache volume
+	// cacheCapacity determines the size of the nodeAgent metadata cache volume
 	//+optional
 	CacheCapacity string `json:"cacheCapacity,omitempty"`
 	// cacheAccessMode is the access mode to be used to provision the cache volume
@@ -388,11 +415,15 @@ func (dpa *DataProtectionApplication) AutoCorrect() {
 	if dpa.Spec.Configuration.Velero.Args != nil {
 		// if args is not nil, we take care of some fields that will be overridden from dpa if not specified in args
 		// Enable user to specify --fs-backup-timeout duration (OADP default 1h0m0s)
-		resticTimeout := "1h"
-		if dpa.Spec.Configuration != nil && dpa.Spec.Configuration.Restic != nil && len(dpa.Spec.Configuration.Restic.Timeout) > 0 {
-			resticTimeout = dpa.Spec.Configuration.Restic.Timeout
+		fsBackupTimeout := "1h"
+		if dpa.Spec.Configuration != nil {
+			if dpa.Spec.Configuration.NodeAgent != nil && len(dpa.Spec.Configuration.NodeAgent.Timeout) > 0 {
+				fsBackupTimeout = dpa.Spec.Configuration.NodeAgent.Timeout
+			} else if dpa.Spec.Configuration.Restic != nil && len(dpa.Spec.Configuration.Restic.Timeout) > 0 {
+				fsBackupTimeout = dpa.Spec.Configuration.Restic.Timeout
+			}
 		}
-		if pvOperationTimeout, err := time.ParseDuration(resticTimeout); err == nil && dpa.Spec.Configuration.Velero.Args.PodVolumeOperationTimeout == nil {
+		if pvOperationTimeout, err := time.ParseDuration(fsBackupTimeout); err == nil && dpa.Spec.Configuration.Velero.Args.PodVolumeOperationTimeout == nil {
 			dpa.Spec.Configuration.Velero.Args.PodVolumeOperationTimeout = &pvOperationTimeout
 		}
 	}

api/v1alpha1/zz_generated.deepcopy.go

@@ -7,7 +7,7 @@ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
 LABEL operators.operatorframework.io.bundle.package.v1=oadp-operator
 LABEL operators.operatorframework.io.bundle.channels.v1=stable
 LABEL operators.operatorframework.io.bundle.channel.default.v1=stable
-LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.23.0
+LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.28.1
 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3
 

build/Dockerfile.bundle

@@ -7,7 +7,7 @@ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
 LABEL operators.operatorframework.io.bundle.package.v1=oadp-operator
 LABEL operators.operatorframework.io.bundle.channels.v1=stable
 LABEL operators.operatorframework.io.bundle.channel.default.v1=stable
-LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.23.0
+LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.28.1
 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3
 

bundle.Dockerfile

@@ -32,8 +32,9 @@ metadata:
               }
             ],
             "configuration": {
-              "restic": {
-                "enable": true
+              "nodeAgentConfig": {
+                "enable": true,
+                "uploaderType": "restic"
               },
               "velero": {
                 "defaultPlugins": [
@@ -151,15 +152,15 @@ metadata:
     categories: OpenShift Optional
     certified: "false"
     containerImage: quay.io/konveyor/oadp-operator:latest
-    createdAt: "2020-09-08T12:21:00Z"
+    createdAt: "2023-08-01T17:03:41Z"
     description: OADP (OpenShift API for Data Protection) operator sets up and installs
       Data Protection Applications on the OpenShift platform.
     olm.skipRange: '>=0.0.0 <99.0.0'
     operatorframework.io/suggested-namespace: openshift-adp
     operators.openshift.io/infrastructure-features: '["Disconnected"]'
     operators.openshift.io/valid-subscription: '["OpenShift Container Platform", "OpenShift
       Platform Plus"]'
-    operators.operatorframework.io/builder: operator-sdk-v1.23.0
+    operators.operatorframework.io/builder: operator-sdk-v1.28.1
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: https://github.com/openshift/oadp-operator
     support: Red Hat