Merge pull request #303 from rkpattnaik780/nb_label_3

fix: remove replace from go.mod file

Author: harshad16

components/common/reconcilehelper/util.go

@@ -122,11 +122,6 @@ func CopyStatefulSetFields(from, to *appsv1.StatefulSet) bool {
 
 	if *from.Spec.Replicas != *to.Spec.Replicas {
 		*to.Spec.Replicas = *from.Spec.Replicas
-		// Copy the pod template labels, but reconcilation is not required
-		// exclusively based on ths pod template labels
-		if !reflect.DeepEqual(to.Spec.Template.ObjectMeta.Labels, from.Spec.Template.ObjectMeta.Labels) {
-			to.Spec.Template.ObjectMeta.Labels = from.Spec.Template.ObjectMeta.Labels
-		}
 		requireUpdate = true
 	}
 

components/notebook-controller/controllers/notebook_controller.go

@@ -159,6 +159,15 @@ func (r *NotebookReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c
 		log.Error(err, "error getting Statefulset")
 		return ctrl.Result{}, err
 	}
+
+	// Copy the pod template labels, but reconcilation is not required
+	// exclusively based on ths pod template labels
+	if *ss.Spec.Replicas != *foundStateful.Spec.Replicas {
+		if !reflect.DeepEqual(foundStateful.Spec.Template.ObjectMeta.Labels, ss.Spec.Template.ObjectMeta.Labels) {
+			foundStateful.Spec.Template.ObjectMeta.Labels = ss.Spec.Template.ObjectMeta.Labels
+		}
+	}
+
 	// Update the foundStateful object and write the result back if there are any changes
 	if !justCreated && reconcilehelper.CopyStatefulSetFields(ss, foundStateful) {
 		log.Info("Updating StatefulSet", "namespace", ss.Namespace, "name", ss.Name)

components/notebook-controller/go.mod

@@ -2,11 +2,6 @@ module github.com/kubeflow/kubeflow/components/notebook-controller
 
 go 1.19
 
-// use our version of kubeflow/components/common module for reconcilehelper utility differences related to image-field reconciliation
-replace (
-	github.com/kubeflow/kubeflow/components/common => ../common
-)
-
 require (
 	github.com/go-logr/logr v1.2.4
 	github.com/kubeflow/kubeflow/components/common v0.0.0-20220218084159-4ad0158e955e