[WIP] Optimization for CreateOrUpdateConfigMap

pkg/controller/generic_control.go

@@ -28,6 +28,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
+	corelisterv1 "k8s.io/client-go/listers/core/v1"
 	"k8s.io/client-go/tools/record"
 	"k8s.io/klog"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -39,8 +40,8 @@ import (
 type TypedControlInterface interface {
 	// CreateOrUpdateSecret create the desired secret or update the current one to desired state if already existed
 	CreateOrUpdateSecret(controller client.Object, secret *corev1.Secret) (*corev1.Secret, error)
-	// CreateOrUpdateConfigMap create client desired configmap or update the current one to desired state if already existed
-	CreateOrUpdateConfigMap(controller client.Object, cm *corev1.ConfigMap) (*corev1.ConfigMap, error)
+	// CheckAndUpdateConfigMap check configmap before create or update the desired configmap
+	CheckAndUpdateConfigMap(configMapLister corelisterv1.ConfigMapLister, controller client.Object, cm *corev1.ConfigMap) (*corev1.ConfigMap, error)
 	// CreateOrUpdateClusterRole the desired clusterRole or update the current one to desired state if already existed
 	CreateOrUpdateClusterRole(controller client.Object, clusterRole *rbacv1.ClusterRole) (*rbacv1.ClusterRole, error)
 	// CreateOrUpdateClusterRoleBinding create the desired clusterRoleBinding or update the current one to desired state if already existed
@@ -242,8 +243,20 @@ func (w *typedWrapper) CreateOrUpdateServiceAccount(controller client.Object, sa
 	return result.(*corev1.ServiceAccount), err
 }
 
-func (w *typedWrapper) CreateOrUpdateConfigMap(controller client.Object, cm *corev1.ConfigMap) (*corev1.ConfigMap, error) {
-	result, err := w.GenericControlInterface.CreateOrUpdate(controller, cm, func(existing, desired client.Object) error {
+func NeedCreateOrUpgradeConfigMap(cmLister corelisterv1.ConfigMapLister, newCm *corev1.ConfigMap, mergeFn MergeFn) (*corev1.ConfigMap, bool) {
+	// check if need CreateOrUpgrade
+	oldCm, err := cmLister.ConfigMaps(newCm.Namespace).Get(newCm.Name)
+	if err != nil {
+		return oldCm, true
+	}
+	if err := mergeFn(newCm, oldCm); err != nil {
+		return oldCm, true
+	}
+	return oldCm, false
+}
+
+func (w *typedWrapper) CheckAndUpdateConfigMap(cmLister corelisterv1.ConfigMapLister, controller client.Object, cm *corev1.ConfigMap) (*corev1.ConfigMap, error) {
+	mergeFn := func(existing, desired client.Object) error {
 		existingCm := existing.(*corev1.ConfigMap)
 		desiredCm := desired.(*corev1.ConfigMap)
 
@@ -253,7 +266,12 @@ func (w *typedWrapper) CreateOrUpdateConfigMap(controller client.Object, cm *cor
 			existingCm.Annotations[k] = v
 		}
 		return nil
-	}, true)
+	}
+
+	if cf, ok := NeedCreateOrUpgradeConfigMap(cmLister, cm, mergeFn); !ok {
+		return cf, nil
+	}
+	result, err := w.GenericControlInterface.CreateOrUpdate(controller, cm, mergeFn, true)
 	if err != nil {
 		return nil, err
 	}

pkg/manager/member/dm_master_member_manager.go

@@ -371,7 +371,7 @@ func (m *masterMemberManager) syncMasterConfigMap(dc *v1alpha1.DMCluster, set *a
 	if err != nil {
 		return nil, err
 	}
-	return m.deps.TypedControl.CreateOrUpdateConfigMap(dc, newCm)
+	return m.deps.TypedControl.CheckAndUpdateConfigMap(m.deps.ConfigMapLister, dc, newCm)
 }
 
 func (m *masterMemberManager) getNewMasterServiceForDMCluster(dc *v1alpha1.DMCluster) *corev1.Service {

pkg/manager/member/dm_worker_member_manager.go

@@ -321,7 +321,7 @@ func (m *workerMemberManager) syncWorkerConfigMap(dc *v1alpha1.DMCluster, set *a
 	if err != nil {
 		return nil, err
 	}
-	return m.deps.TypedControl.CreateOrUpdateConfigMap(dc, newCm)
+	return m.deps.TypedControl.CheckAndUpdateConfigMap(m.deps.ConfigMapLister, dc, newCm)
 }
 
 func getNewWorkerSetForDMCluster(dc *v1alpha1.DMCluster, cm *corev1.ConfigMap) (*apps.StatefulSet, error) {

pkg/manager/member/pd_member_manager.go

@@ -423,7 +423,7 @@ func (m *pdMemberManager) syncPDConfigMap(tc *v1alpha1.TidbCluster, set *apps.St
 	if err != nil {
 		return nil, err
 	}
-	return m.deps.TypedControl.CreateOrUpdateConfigMap(tc, newCm)
+	return m.deps.TypedControl.CheckAndUpdateConfigMap(m.deps.ConfigMapLister, tc, newCm)
 }
 
 func (m *pdMemberManager) getNewPDServiceForTidbCluster(tc *v1alpha1.TidbCluster) *corev1.Service {

pkg/manager/member/pump_member_manager.go

@@ -252,7 +252,7 @@ func (m *pumpMemberManager) syncConfigMap(tc *v1alpha1.TidbCluster, set *appsv1.
 	if err != nil {
 		return nil, err
 	}
-	return m.deps.TypedControl.CreateOrUpdateConfigMap(tc, newCm)
+	return m.deps.TypedControl.CheckAndUpdateConfigMap(m.deps.ConfigMapLister, tc, newCm)
 }
 
 func getNewPumpHeadlessService(tc *v1alpha1.TidbCluster) *corev1.Service {

pkg/manager/member/ticdc_member_manager.go

@@ -116,7 +116,8 @@ func (m *ticdcMemberManager) syncTiCDCConfigMap(tc *v1alpha1.TidbCluster, set *a
 	if err != nil {
 		return nil, err
 	}
-	return m.deps.TypedControl.CreateOrUpdateConfigMap(tc, newCm)
+	return m.deps.TypedControl.CheckAndUpdateConfigMap(m.deps.ConfigMapLister, tc, newCm)
+
 }
 
 // Sync fulfills the manager.Manager interface

pkg/manager/member/tidb_member_manager.go

@@ -370,7 +370,7 @@ func (m *tidbMemberManager) syncTiDBConfigMap(tc *v1alpha1.TidbCluster, set *app
 	if err != nil {
 		return nil, err
 	}
-	return m.deps.TypedControl.CreateOrUpdateConfigMap(tc, newCm)
+	return m.deps.TypedControl.CheckAndUpdateConfigMap(m.deps.ConfigMapLister, tc, newCm)
 }
 
 func getTiDBConfigMap(tc *v1alpha1.TidbCluster) (*corev1.ConfigMap, error) {

pkg/manager/member/tiflash_member_manager.go

@@ -247,7 +247,7 @@ func (m *tiflashMemberManager) syncConfigMap(tc *v1alpha1.TidbCluster, set *apps
 	if err != nil {
 		return nil, err
 	}
-	return m.deps.TypedControl.CreateOrUpdateConfigMap(tc, newCm)
+	return m.deps.TypedControl.CheckAndUpdateConfigMap(m.deps.ConfigMapLister, tc, newCm)
 }
 
 func getNewHeadlessService(tc *v1alpha1.TidbCluster) *corev1.Service {

pkg/manager/member/tikv_member_manager.go

@@ -264,7 +264,7 @@ func (m *tikvMemberManager) syncTiKVConfigMap(tc *v1alpha1.TidbCluster, set *app
 	if err != nil {
 		return nil, err
 	}
-	return m.deps.TypedControl.CreateOrUpdateConfigMap(tc, newCm)
+	return m.deps.TypedControl.CheckAndUpdateConfigMap(m.deps.ConfigMapLister, tc, newCm)
 }
 
 func getNewServiceForTidbCluster(tc *v1alpha1.TidbCluster, svcConfig SvcConfig) *corev1.Service {

pkg/monitor/monitor/monitor_manager.go

@@ -386,16 +386,17 @@ func (m *MonitorManager) syncTidbMonitorConfig(monitor *v1alpha1.TidbMonitor) er
 			promCM.Data["prometheus.yml"] = externalContent
 		}
 	}
-	_, err = m.deps.TypedControl.CreateOrUpdateConfigMap(monitor, promCM)
+	_, err = m.deps.TypedControl.CheckAndUpdateConfigMap(m.deps.ConfigMapLister, monitor, promCM)
 	if err != nil {
-		klog.Errorf("Fail to CreateOrUpdateConfigMap %s for tm[%s/%s]'s, err: %v", promCM.Name, monitor.Namespace, monitor.Name, err)
+		klog.Errorf("Fail to CheckAndUpdateConfigMap %s for tm[%s/%s]'s, err: %v", promCM.Name, monitor.Namespace, monitor.Name, err)
 		return err
 	}
+
 	if monitor.Spec.Grafana != nil {
 		grafanaCM := getGrafanaConfigMap(monitor)
-		_, err = m.deps.TypedControl.CreateOrUpdateConfigMap(monitor, grafanaCM)
+		_, err = m.deps.TypedControl.CheckAndUpdateConfigMap(m.deps.ConfigMapLister, monitor, grafanaCM)
 		if err != nil {
-			klog.Errorf("Fail to CreateOrUpdateConfigMap %s for tm[%s/%s]'s, err: %v", grafanaCM.Name, monitor.Namespace, monitor.Name, err)
+			klog.Errorf("Fail to CheckAndUpdateConfigMap %s for tm[%s/%s]'s, err: %v", grafanaCM.Name, monitor.Namespace, monitor.Name, err)
 			return err
 		}
 	}