restic reconcile log reduction

Author: kaovilai

controllers/restic.go

@@ -31,6 +31,7 @@ const (
 
 var (
 	resticPvHostPath string = getResticPvHostPath()
+	emptyString = ""
 
 	// v1.MountPropagationHostToContainer is a const. Const cannot be pointed to.
 	// we need to declare mountPropagationToHostContainer so that we have an address to point to
@@ -107,7 +108,6 @@ func (r *DPAReconciler) ReconcileResticDaemonset(log logr.Logger) (bool, error)
 		if err := controllerutil.SetControllerReference(&dpa, ds, r.Scheme); err != nil {
 			return err
 		}
-
 		if _, err := r.buildResticDaemonset(&dpa, ds); err != nil {
 			return err
 		}
@@ -144,21 +144,17 @@ func (r *DPAReconciler) buildResticDaemonset(dpa *oadpv1alpha1.DataProtectionApp
 		return nil, fmt.Errorf("ds cannot be nil")
 	}
 
-	resticDaemonSetName := ds.Name
-	ownerRefs := ds.OwnerReferences
-
-	*ds = *install.DaemonSet(ds.Namespace,
+	prevDs := ds.DeepCopy()
+	ds.Spec = install.DaemonSet(ds.Namespace,
 		install.WithResources(r.getResticResourceReqs(dpa)),
 		install.WithImage(getVeleroImage(dpa)),
 		install.WithAnnotations(dpa.Spec.PodAnnotations),
-		install.WithSecret(false))
+		install.WithSecret(false)).Spec
 
-	ds.Name = resticDaemonSetName
-	ds.OwnerReferences = ownerRefs
-	return r.customizeResticDaemonset(dpa, ds)
+	return r.customizeResticDaemonset(dpa, ds, prevDs)
 }
 
-func (r *DPAReconciler) customizeResticDaemonset(dpa *oadpv1alpha1.DataProtectionApplication, ds *appsv1.DaemonSet) (*appsv1.DaemonSet, error) {
+func (r *DPAReconciler) customizeResticDaemonset(dpa *oadpv1alpha1.DataProtectionApplication, ds *appsv1.DaemonSet, prevDs *appsv1.DaemonSet) (*appsv1.DaemonSet, error) {
 
 	// customize specs
 	ds.Spec.Selector = resticLabelSelector
@@ -234,6 +230,49 @@ func (r *DPAReconciler) customizeResticDaemonset(dpa *oadpv1alpha1.DataProtectio
 	if err := credentials.AppendCloudProviderVolumes(dpa, ds, providerNeedsDefaultCreds, hasCloudStorage); err != nil {
 		return nil, err
 	}
+	
+	// Define defaults to avoid update events
+	// replace volumeSource HostPath Type if nil with empty string
+	for i, vol := range ds.Spec.Template.Spec.Volumes {
+		if vol.VolumeSource.HostPath != nil && vol.VolumeSource.HostPath.Type == nil {
+			ds.Spec.Template.Spec.Volumes[i].VolumeSource.HostPath.Type = (*corev1.HostPathType)(&emptyString)
+		}
+	}
+	for i, container := range ds.Spec.Template.Spec.Containers {
+		for j, env := range container.Env {
+			if env.ValueFrom != nil && env.ValueFrom.FieldRef != nil && ds.Spec.Template.Spec.Containers[i].Env[j].ValueFrom.FieldRef.APIVersion == "" {
+				ds.Spec.Template.Spec.Containers[i].Env[j].ValueFrom.FieldRef.APIVersion = "v1"
+			}
+		}
+		if container.TerminationMessagePath == "" {
+			ds.Spec.Template.Spec.Containers[i].TerminationMessagePath = corev1.TerminationMessagePathDefault
+		}
+		if container.TerminationMessagePolicy == "" {
+			ds.Spec.Template.Spec.Containers[i].TerminationMessagePolicy = corev1.TerminationMessageReadFile
+		}
+	}
+	if ds.Spec.Template.Spec.RestartPolicy == "" {
+		ds.Spec.Template.Spec.RestartPolicy = prevDs.Spec.Template.Spec.RestartPolicy
+	}
+	if ds.Spec.Template.Spec.DNSPolicy == "" {
+		ds.Spec.Template.Spec.DNSPolicy = prevDs.Spec.Template.Spec.DNSPolicy
+	}
+	if ds.Spec.Template.Spec.SchedulerName == "" {
+		ds.Spec.Template.Spec.SchedulerName = prevDs.Spec.Template.Spec.SchedulerName
+	}
+	if ds.Spec.Template.Spec.DeprecatedServiceAccount == "" {
+		ds.Spec.Template.Spec.DeprecatedServiceAccount = prevDs.Spec.Template.Spec.DeprecatedServiceAccount
+	}
+	if ds.Spec.Template.Spec.TerminationGracePeriodSeconds == nil {
+		ds.Spec.Template.Spec.TerminationGracePeriodSeconds = prevDs.Spec.Template.Spec.TerminationGracePeriodSeconds
+	}
+	if ds.Spec.UpdateStrategy.RollingUpdate == nil {
+		ds.Spec.UpdateStrategy.RollingUpdate = prevDs.Spec.UpdateStrategy.RollingUpdate
+	}
+	if ds.Spec.RevisionHistoryLimit == nil {
+		ds.Spec.RevisionHistoryLimit = prevDs.Spec.RevisionHistoryLimit
+	}
+
 	return ds, nil
 }
 

pkg/credentials/credentials.go

@@ -70,6 +70,7 @@ var (
 			PluginName: common.VeleroPluginForCSI,
 		},
 	}
+	int32_0644 = int32(0644)
 )
 
 func getAWSPluginImage(dpa *oadpv1alpha1.DataProtectionApplication) string {
@@ -197,6 +198,7 @@ func AppendCloudProviderVolumes(dpa *oadpv1alpha1.DataProtectionApplication, ds
 					VolumeSource: corev1.VolumeSource{
 						Secret: &corev1.SecretVolumeSource{
 							SecretName: secretName,
+							DefaultMode: &int32_0644,
 						},
 					},
 				},
@@ -319,6 +321,7 @@ func AppendPluginSpecificSpecs(dpa *oadpv1alpha1.DataProtectionApplication, vele
 								VolumeSource: corev1.VolumeSource{
 									Secret: &corev1.SecretVolumeSource{
 										SecretName: cloudProviderMap.BslSecretName,
+										DefaultMode: &int32_0644,
 									},
 								},
 							},