address the comment

pingcap · Mar 19, 2020 · 79ec81c · 79ec81c
1 parent 85f0593
commit 79ec81c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/pkg/controller/generic_control.go b/pkg/controller/generic_control.go
@@ -284,7 +284,7 @@ func (w *typedWrapper) CreateOrUpdateService(controller runtime.Object, svc *cor
 					for _, eport := range ports {
 						// Because the portName could be edited,
 						// we use Port number to link the desired Service Port and the existed Service Port in the nested loop
-						if dport.Port == eport.Port {
+						if dport.Port == eport.Port && dport.Protocol == eport.Protocol {
 							dport.NodePort = eport.NodePort
 							existingSvc.Spec.Ports[i] = dport
 							break

diff --git a/pkg/monitor/monitor/monitor_manager.go b/pkg/monitor/monitor/monitor_manager.go
@@ -32,7 +32,6 @@ import (
 type MonitorManager struct {
 	typedControl     controller.TypedControlInterface
 	deploymentLister appslisters.DeploymentLister
-	svcLister        corelisters.ServiceLister
 	tcLister         v1alpha1listers.TidbClusterLister
 	pvLister         corelisters.PersistentVolumeLister
 	pvControl        controller.PVControlInterface
@@ -55,7 +54,6 @@ func NewMonitorManager(
 	return &MonitorManager{
 		typedControl:     typedControl,
 		deploymentLister: kubeInformerFactory.Apps().V1().Deployments().Lister(),
-		svcLister:        kubeInformerFactory.Core().V1().Services().Lister(),
 		tcLister:         informerFactory.Pingcap().V1alpha1().TidbClusters().Lister(),
 		pvControl:        controller.NewRealPVControl(kubeCli, pvcLister, pvLister, recorder),
 		pvLister:         pvLister,