Skip to content

[OADP-450] Reduce "perform updated on X ..." reconciler logs #584

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Mar 9, 2022
Merged

[OADP-450] Reduce "perform updated on X ..." reconciler logs #584

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
45bd6fc
Eliminate "perform updated on dpa metrics service" from logs
kaovilai Mar 4, 2022
50fa01a
restic reconcile log reduction
kaovilai Mar 5, 2022
8168e41
reduce velero deployment reconcile logs
kaovilai Mar 5, 2022
969519e
setDsDefaults is not needed
kaovilai Mar 7, 2022
0aff52a
Revert "Eliminate "perform updated on dpa metrics service" from logs"
kaovilai Mar 7, 2022
cae935f
defaultMode no longer needed
kaovilai Mar 7, 2022
6a9eb70
remove prevDs
kaovilai Mar 7, 2022
bca3c08
No need to save deploymentName and ownerRefs
kaovilai Mar 8, 2022
851f83a
rm typemeta ignores
kaovilai Mar 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions controllers/restic.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,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
}
Expand Down Expand Up @@ -144,17 +143,12 @@ 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,
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)
}

Expand Down Expand Up @@ -234,6 +228,7 @@ func (r *DPAReconciler) customizeResticDaemonset(dpa *oadpv1alpha1.DataProtectio
if err := credentials.AppendCloudProviderVolumes(dpa, ds, providerNeedsDefaultCreds, hasCloudStorage); err != nil {
return nil, err
}

return ds, nil
}

Expand Down
4 changes: 4 additions & 0 deletions controllers/restic_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -759,6 +759,10 @@ func TestDPAReconciler_buildResticDaemonset(t *testing.T) {
t.Errorf("DPAReconciler.buildResticDaemonset() error = %v, wantErr %v", err, tt.wantErr)
return
}
//ignore typemeta
if tt.want != nil {
got.TypeMeta = tt.want.TypeMeta
}
if !reflect.DeepEqual(got, tt.want) {
t.Errorf("DPAReconciler.buildResticDaemonset() got = %v, want %v", got, tt.want)
}
Expand Down
4 changes: 2 additions & 2 deletions controllers/velero.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ func (r *DPAReconciler) buildVeleroDeployment(veleroDeployment *appsv1.Deploymen
dpa.Spec.Configuration.Velero.FeatureFlags = removeDuplicateValues(dpa.Spec.Configuration.Velero.FeatureFlags)
deploymentName := veleroDeployment.Name //saves desired deployment name before install.Deployment overwrites them.
ownerRefs := veleroDeployment.OwnerReferences // saves desired owner refs
*veleroDeployment = *install.Deployment(veleroDeployment.Namespace,
veleroDeployment.Spec = install.Deployment(veleroDeployment.Namespace,
install.WithResources(r.getVeleroResourceReqs(dpa)),
install.WithImage(getVeleroImage(dpa)),
install.WithFeatures(dpa.Spec.Configuration.Velero.FeatureFlags),
Expand All @@ -390,7 +390,7 @@ func (r *DPAReconciler) buildVeleroDeployment(veleroDeployment *appsv1.Deploymen
// see: https://github.com/vmware-tanzu/velero/blob/ed5809b7fc22f3661eeef10bdcb63f0d74472b76/pkg/install/deployment.go#L223-L261
// our secrets are appended to containers/volumeMounts in credentials.AppendPluginSpecificSpecs function
install.WithSecret(false),
)
).Spec
// adjust veleroDeployment from install
veleroDeployment.Name = deploymentName //reapply saved deploymentName and owner refs
veleroDeployment.OwnerReferences = ownerRefs
Expand Down
4 changes: 4 additions & 0 deletions controllers/velero_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1288,6 +1288,10 @@ func TestDPAReconciler_buildVeleroDeployment(t *testing.T) {
if err := r.buildVeleroDeployment(tt.veleroDeployment, tt.dpa); (err != nil) != tt.wantErr {
t.Errorf("buildVeleroDeployment() error = %v, wantErr %v", err, tt.wantErr)
}
//ignore typemeta for testing
if tt.wantVeleroDeployment != nil {
tt.veleroDeployment.TypeMeta = tt.wantVeleroDeployment.TypeMeta
}
if !reflect.DeepEqual(tt.wantVeleroDeployment, tt.veleroDeployment) {
t.Errorf("expected velero deployment spec to be %#v, got %#v", tt.wantVeleroDeployment, tt.veleroDeployment)
}
Expand Down