Velero ServiceAccount annotations support

openshift · Feb 17, 2023 · 0fcf5ce · 0fcf5ce
1 parent 0747309
commit 0fcf5ce
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git a/api/v1alpha1/oadp_types.go b/api/v1alpha1/oadp_types.go
@@ -90,6 +90,9 @@ type VeleroConfig struct {
 	// +optional
 	// +kubebuilder:validation:Enum=trace;debug;info;warning;error;fatal;panic
 	LogLevel string `json:"logLevel,omitempty"`
+	// saAnnotations defines the annotations to be applied to the Velero service account
+	// +optional
+	SAAnnotations map[string]string `json:"saAnnotations,omitempty"`
 }
 
 // PodConfig defines the pod configuration options

diff --git a/bundle/manifests/oadp.openshift.io_dataprotectionapplications.yaml b/bundle/manifests/oadp.openshift.io_dataprotectionapplications.yaml
@@ -336,6 +336,11 @@ spec:
                         restoreResourcesVersionPriority:
                           description: restoreResourceVersionPriority represents a configmap that will be created if defined for use in conjunction with EnableAPIGroupVersions feature flag Defining this field automatically add EnableAPIGroupVersions to the velero server feature flag
                           type: string
+                        saAnnotations:
+                          additionalProperties:
+                            type: string
+                          description: saAnnotations defines the annotations to be applied to the Velero service account
+                          type: object
                       type: object
                   type: object
                 features:

diff --git a/config/crd/bases/oadp.openshift.io_dataprotectionapplications.yaml b/config/crd/bases/oadp.openshift.io_dataprotectionapplications.yaml
@@ -336,6 +336,11 @@ spec:
                         restoreResourcesVersionPriority:
                           description: restoreResourceVersionPriority represents a configmap that will be created if defined for use in conjunction with EnableAPIGroupVersions feature flag Defining this field automatically add EnableAPIGroupVersions to the velero server feature flag
                           type: string
+                        saAnnotations:
+                          additionalProperties:
+                            type: string
+                          description: saAnnotations defines the annotations to be applied to the Velero service account
+                          type: object
                       type: object
                   type: object
                 features:

diff --git a/controllers/velero.go b/controllers/velero.go
@@ -261,8 +261,10 @@ func (r *DPAReconciler) ReconcileVeleroDeployment(log logr.Logger) (bool, error)
 }
 
 func (r *DPAReconciler) veleroServiceAccount(dpa *oadpv1alpha1.DataProtectionApplication) (*corev1.ServiceAccount, error) {
-	annotations := make(map[string]string)
-	sa := install.ServiceAccount(dpa.Namespace, annotations)
+	if dpa.Spec.Configuration.Velero.SAAnnotations == nil {
+		dpa.Spec.Configuration.Velero.SAAnnotations = make(map[string]string)
+	}
+	sa := install.ServiceAccount(dpa.Namespace, dpa.Spec.Configuration.Velero.SAAnnotations)
 	sa.Labels = r.getDpaAppLabels(dpa)
 	return sa, nil
 }