Merge pull request #961 from spencerhance/fix-svcport-ilb

Fix default backend port bug for ilb neg
kubernetes · Dec 3, 2019 · 3d4435f · 3d4435f
2 parents f988163 + e52cd14
commit 3d4435f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/cmd/glbc/app/init.go b/cmd/glbc/app/init.go
@@ -72,6 +72,7 @@ func servicePortForDefaultService(svc *v1.Service, svcPort intstr.IntOrString, n
 					Port:    svcPort,
 				},
 				TargetPort: port.TargetPort.StrVal,
+				Port:       port.Port,
 			}
 		}
 	}

diff --git a/pkg/context/context.go b/pkg/context/context.go
@@ -134,7 +134,7 @@ func NewControllerContext(
 
 // Init inits the Context, so that we can defers some config until the main thread enter actually get the leader lock.
 func (ctx *ControllerContext) Init() {
-	klog.V(2).Infof("Controller Context initializing with %v", ctx.ControllerContextConfig)
+	klog.V(2).Infof("Controller Context initializing with %+v", ctx.ControllerContextConfig)
 	// Initialize controller context internals based on ASMConfigMap
 	if ctx.EnableASMConfigMap {
 		configMapInformer := informerv1.NewConfigMapInformer(ctx.KubeClient, ctx.Namespace, ctx.ResyncPeriod, utils.NewNamespaceIndexer())
-Original file line number
+Diff line change
@@ Expand Up @@
     					Port:    svcPort,
     				},
     				TargetPort: port.TargetPort.StrVal,
+    				Port:       port.Port,
     			}
     		}
     	}
@@ Expand Down @@