Skip to content

CNS: Do not start CNM by default #381

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 25, 2019
Merged

CNS: Do not start CNM by default #381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e67f92
Do not start CNM by default
ashvindeodhar Jul 24, 2019
72dfc74
rename the var to startcnm
ashvindeodhar Jul 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions cns/service/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,9 @@ var args = acn.ArgumentList{
DefaultValue: "",
},
{
Name: acn.OptStopAzureVnet,
Shorthand: acn.OptStopAzureVnetAlias,
Description: "Stop Azure-CNM if flag is true",
Name: acn.OptStartAzureCNM,
Shorthand: acn.OptStartAzureCNMAlias,
Description: "Start Azure-CNM if flag is set",
Type: "bool",
DefaultValue: false,
},
Expand Down Expand Up @@ -162,7 +162,6 @@ func printVersion() {

// Main is the entry point for CNS.
func main() {
var stopcnm = false
// Initialize and parse command line arguments.
acn.ParseArgs(&args, printVersion)

Expand All @@ -176,7 +175,7 @@ func main() {
logDirectory := acn.GetArg(acn.OptLogLocation).(string)
ipamQueryUrl, _ := acn.GetArg(acn.OptIpamQueryUrl).(string)
ipamQueryInterval, _ := acn.GetArg(acn.OptIpamQueryInterval).(int)
stopcnm = acn.GetArg(acn.OptStopAzureVnet).(bool)
startCNM := acn.GetArg(acn.OptStartAzureCNM).(bool)
vers := acn.GetArg(acn.OptVersion).(bool)
createDefaultExtNetworkType := acn.GetArg(acn.OptCreateDefaultExtNetworkType).(string)
telemetryEnabled := acn.GetArg(acn.OptTelemetry).(bool)
Expand Down Expand Up @@ -271,7 +270,7 @@ func main() {
var netPlugin network.NetPlugin
var ipamPlugin ipam.IpamPlugin

if !stopcnm {
if startCNM {
var pluginConfig acn.PluginConfig
pluginConfig.Version = version

Expand Down Expand Up @@ -344,7 +343,7 @@ func main() {

telemetryStopProcessing <- true

if !stopcnm {
if startCNM {
if netPlugin != nil {
netPlugin.Stop()
}
Expand Down
6 changes: 3 additions & 3 deletions common/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ const (
OptIpamQueryInterval = "ipam-query-interval"
OptIpamQueryIntervalAlias = "i"

// Don't Start CNM
OptStopAzureVnet = "stop-azure-cnm"
OptStopAzureVnetAlias = "stopcnm"
// Start CNM
OptStartAzureCNM = "start-azure-cnm"
OptStartAzureCNMAlias = "startcnm"

// Interval to send reports to host
OptReportToHostInterval = "report-interval"
Expand Down