Skip to content

Commit 301de9f

Browse files
fix: address comments
1 parent 7879de5 commit 301de9f

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

cns/service/main.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -661,8 +661,6 @@ func main() {
661661
}
662662
if isManaged, ok := acn.GetArg(acn.OptManaged).(bool); ok && isManaged {
663663
config.ChannelMode = cns.Managed
664-
} else if cnsconfig.ChannelMode == cns.AzureHost {
665-
config.ChannelMode = cns.AzureHost
666664
}
667665

668666
homeAzMonitor := restserver.NewHomeAzMonitor(nmaClient, time.Duration(cnsconfig.AZRSettings.PopulateHomeAzCacheRetryIntervalSecs)*time.Second)

test/integration/cilium-nodesubnet/ipconfigupdate.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,8 @@ func main() {
104104
for i := 2; i <= secondaryConfigCount+1; i++ {
105105
ipConfig := make(map[string]interface{})
106106
for k, v := range primaryIPConfig {
107+
// only the primary config needs loadBalancerBackendAddressPools. Azure doesn't allow
108+
// secondary IP configs to be associated with pools that are used for load balancing.
107109
if k == "loadBalancerBackendAddressPools" {
108110
continue
109111
}

0 commit comments

Comments
 (0)