fix: fix broken custom lb config caused by eb249d6 (#179)

caicloud-bot · Huanle Han · web-flow · commit f286eadabc98 · 2020-06-18T14:20:34.000+08:00
fix http://jira.caicloud.xyz/browse/CPS-7374 Co-authored-by: Huanle Han <hanhuanle@caicloud.io>
diff --git a/pkg/proxy/nginx/config.go b/pkg/proxy/nginx/config.go
@@ -176,7 +176,8 @@ func (f *nginx) updateIfHasUnmanagedConfig(lb *lbapi.LoadBalancer, cm *v1.Config
 
 	var unmanagedConifgs map[string]string
 	// we consider that configs may contains unmanaged config only if cm is not marked (oldExternalConfigMaps is empty).
-	if len(oldExternalConfigMaps) == 0 {
+	if len(oldExternalConfigMaps) == 0 ||
+		(len(oldExternalConfigMaps) == 1 && oldExternalConfigMaps[0] == "") {
 		unmanagedConifgs = mapDel(cm.Data, defaultConfig, managedConfig)
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,8 @@ func (f nginx) updateIfHasUnmanagedConfig(lb lbapi.LoadBalancer, cm *v1.Config`
`176`	`176`
`177`	`177`	`var unmanagedConifgs map[string]string`
`178`	`178`	`// we consider that configs may contains unmanaged config only if cm is not marked (oldExternalConfigMaps is empty).`
`179`		`- if len(oldExternalConfigMaps) == 0 {`
	`179`	`+ if len(oldExternalConfigMaps) == 0 \|\|`
	`180`	`+ (len(oldExternalConfigMaps) == 1 && oldExternalConfigMaps[0] == "") {`
`180`	`181`	`unmanagedConifgs = mapDel(cm.Data, defaultConfig, managedConfig)`
`181`	`182`	`}`
`182`	`183`