Skip to content
This repository has been archived by the owner on Jan 11, 2023. It is now read-only.

Commit

Permalink
Enable k8s features by default
Browse files Browse the repository at this point in the history
  • Loading branch information
ritazh committed Oct 27, 2018
1 parent 42c1f25 commit 5661f22
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 0 deletions.
1 change: 1 addition & 0 deletions pkg/api/defaults-apiserver.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ func (cs *ContainerService) setAPIServerConfig() {
"--kubelet-client-key": "/etc/kubernetes/certs/client.key",
"--service-cluster-ip-range": o.KubernetesConfig.ServiceCIDR,
"--storage-backend": o.GetAPIServerEtcdAPIVersion(),
"--enable-bootstrap-token-auth": "true",
"--v": "4",
}

Expand Down
4 changes: 4 additions & 0 deletions pkg/api/defaults-controller-manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ func (cs *ContainerService) setControllerManagerConfig() {
"--service-account-private-key-file": "/etc/kubernetes/certs/apiserver.key",
"--leader-elect": "true",
"--v": "2",
"--controllers": "*,bootstrapsigner,tokencleaner",
}

// Set --cluster-name based on appropriate DNS prefix
Expand Down Expand Up @@ -60,6 +61,9 @@ func (cs *ContainerService) setControllerManagerConfig() {
// Enables Node Exclusion from Services (toggled on agent nodes by the alpha.service-controller.kubernetes.io/exclude-balancer label).
addDefaultFeatureGates(o.KubernetesConfig.ControllerManagerConfig, o.OrchestratorVersion, "1.9.0", "ServiceNodeExclusion=true")

// Enable the consumption of local ephemeral storage and also the sizeLimit property of an emptyDir volume.
addDefaultFeatureGates(o.KubernetesConfig.ControllerManagerConfig, o.OrchestratorVersion, "1.10.0", "LocalStorageCapacityIsolation=true")

// We don't support user-configurable values for the following,
// so any of the value assignments below will override user-provided values
for key, val := range staticControllerManagerConfig {
Expand Down

0 comments on commit 5661f22

Please sign in to comment.