This repository was archived by the owner on Jan 11, 2023. It is now read-only.
Generic cloud-controller-manager config interface #2017
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| { | ||
| "apiVersion": "vlabs", | ||
| "properties": { | ||
| "orchestratorProfile": { | ||
| "orchestratorType": "Kubernetes", | ||
| "orchestratorRelease": "1.8", | ||
| "kubernetesConfig": { | ||
| "useCloudControllerManager": true | ||
| } | ||
| }, | ||
| "masterProfile": { | ||
| "count": 1, | ||
| "dnsPrefix": "", | ||
| "vmSize": "Standard_D2_v2" | ||
| }, | ||
| "agentPoolProfiles": [ | ||
| { | ||
| "name": "agentpool1", | ||
| "count": 3, | ||
| "vmSize": "Standard_D2_v2", | ||
| "availabilityProfile": "AvailabilitySet" | ||
| } | ||
| ], | ||
| "linuxProfile": { | ||
| "adminUsername": "azureUser", | ||
| "ssh": { | ||
| "publicKeys": [ | ||
| { | ||
| "keyData": "" | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "servicePrincipalProfile": { | ||
| "clientId": "", | ||
| "secret": "" | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| package acsengine | ||
|
|
||
| import ( | ||
| "strconv" | ||
|
|
||
| "github.com/Azure/acs-engine/pkg/api" | ||
| ) | ||
|
|
||
| func setCloudControllerManagerConfig(cs *api.ContainerService) { | ||
| o := cs.Properties.OrchestratorProfile | ||
| staticLinuxCloudControllerManagerConfig := map[string]string{ | ||
| "--allocate-node-cidrs": strconv.FormatBool(!o.IsAzureCNI()), | ||
| "--cloud-provider": "azure", | ||
| "--cloud-config": "/etc/kubernetes/azure.json", | ||
| "--cluster-cidr": o.KubernetesConfig.ClusterSubnet, | ||
| "--kubeconfig": "/var/lib/kubelet/kubeconfig", | ||
| "--leader-elect": "true", | ||
| "--v": "2", | ||
| } | ||
|
|
||
| // Set --cluster-name based on appropriate DNS prefix | ||
| if cs.Properties.MasterProfile != nil { | ||
| staticLinuxCloudControllerManagerConfig["--cluster-name"] = cs.Properties.MasterProfile.DNSPrefix | ||
| } else if cs.Properties.HostedMasterProfile != nil { | ||
| staticLinuxCloudControllerManagerConfig["--cluster-name"] = cs.Properties.HostedMasterProfile.DNSPrefix | ||
| } | ||
|
|
||
| staticWindowsCloudControllerManagerConfig := make(map[string]string) | ||
| for key, val := range staticLinuxCloudControllerManagerConfig { | ||
| staticWindowsCloudControllerManagerConfig[key] = val | ||
| } | ||
| // Windows cloud-controller-manager config overrides | ||
| // TODO placeholder for specific config overrides for Windows clusters | ||
|
|
||
| // Default cloud-controller-manager config | ||
| defaultCloudControllerManagerConfig := map[string]string{ | ||
| "--node-monitor-grace-period": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod, | ||
|
Contributor
There was a problem hiding this comment. From the md file, the default is "--route-reconciliation-period", a typo?
Member
Author
There was a problem hiding this comment. Good catch! Actually, the doc is correct, it's an error in the |
||
| } | ||
|
|
||
| // If no user-configurable cloud-controller-manager config values exists, use the defaults | ||
| if o.KubernetesConfig.CloudControllerManagerConfig == nil { | ||
| o.KubernetesConfig.CloudControllerManagerConfig = defaultCloudControllerManagerConfig | ||
| } else { | ||
| for key, val := range defaultCloudControllerManagerConfig { | ||
| // If we don't have a user-configurable cloud-controller-manager config for each option | ||
| if _, ok := o.KubernetesConfig.CloudControllerManagerConfig[key]; !ok { | ||
| // then assign the default value | ||
| o.KubernetesConfig.CloudControllerManagerConfig[key] = val | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // We don't support user-configurable values for the following, | ||
| // so any of the value assignments below will override user-provided values | ||
| var overrideCloudControllerManagerConfig map[string]string | ||
| if cs.Properties.HasWindows() { | ||
| overrideCloudControllerManagerConfig = staticWindowsCloudControllerManagerConfig | ||
| } else { | ||
| overrideCloudControllerManagerConfig = staticLinuxCloudControllerManagerConfig | ||
| } | ||
| for key, val := range overrideCloudControllerManagerConfig { | ||
| o.KubernetesConfig.CloudControllerManagerConfig[key] = val | ||
| } | ||
|
|
||
| // TODO add RBAC support | ||
| /*if *o.KubernetesConfig.EnableRbac { | ||
| o.KubernetesConfig.CloudControllerManagerConfig["--use-service-account-credentials"] = "true" | ||
| }*/ | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Might be beneficial to put a CloudControllerManagerConfig field here for reference
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure I want to encourage someone to use this yet until we spend some time testing various custom configurations that actually work! :)