fix: adjust the update logic of deprecated configmap day2 configuration

Signed-off-by: chlins <chenyuzh@vmware.com>
goharbor · Jan 11, 2022 · 6793210 · 6793210
1 parent 7069994
commit 6793210
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/controllers/goharbor/configuration/cm_reconciler.go b/controllers/goharbor/configuration/cm_reconciler.go
@@ -148,10 +148,16 @@ func (r *CmReconciler) createOrUpdateHarborConfiguration(ctx context.Context, hc
 	if err != nil {
 		if apierrors.IsNotFound(err) {
 			// create hc
+			r.Log.Info("Create HarborConfiguration", "hc", hc)
 			return r.Client.Create(ctx, hc)
 		}
 	}
 
-	// hc exist
-	return r.Client.Update(ctx, hc)
+	// if hc exist, update it
+	new := old.DeepCopy()
+	new.Spec = hc.Spec
+
+	r.Log.Info("Update HarborConfiguration", "hc", new)
+
+	return r.Client.Update(ctx, new)
 }