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

Adopt CIS Kubernetes Benchmark, Part 2: Controller Manager. #2066

Merged
merged 1 commit into from
Jan 17, 2018
Merged

Adopt CIS Kubernetes Benchmark, Part 2: Controller Manager. #2066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions docs/clusterdefinition.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@ Below is a list of kubelet options that are *not* currently user-configurable, e
"--node-monitor-grace-period": "40s",
"--pod-eviction-timeout": "5m0s",
"--route-reconciliation-period": "10s"
"--terminated-pod-gc-threshold": "5000"
}
}
```
Expand All @@ -212,6 +213,7 @@ Below is a list of controller-manager options that acs-engine will configure by
|"--node-monitor-grace-period"|"40s"|
|"--pod-eviction-timeout"|"5m0s"|
|"--route-reconciliation-period"|"10s"|
|"--terminated-pod-gc-threshold"|"5000"|


Below is a list of controller-manager options that are *not* currently user-configurable, either because a higher order configuration vector is available that enforces controller-manager configuration, or because a static configuration is required to build a functional cluster:
Expand Down
2 changes: 2 additions & 0 deletions pkg/acsengine/const.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ const (
DefaultKubernetesCtrlMgrPodEvictionTimeout = "5m0s"
// DefaultKubernetesCtrlMgrRouteReconciliationPeriod is 10s, see --route-reconciliation-period at https://kubernetes.io/docs/admin/kube-controller-manager/
DefaultKubernetesCtrlMgrRouteReconciliationPeriod = "10s"
// DefaultKubernetesCtrlMgrTerminatedPodGcThreshold is set to 5000, see --terminated-pod-gc-threshold at https://kubernetes.io/docs/admin/kube-controller-manager/ and https://github.com/kubernetes/kubernetes/issues/22680
DefaultKubernetesCtrlMgrTerminatedPodGcThreshold = "5000"
// DefaultKubernetesCloudProviderBackoff is false to disable cloudprovider backoff implementation for API calls
DefaultKubernetesCloudProviderBackoff = false
// DefaultKubernetesCloudProviderBackoffRetries is 6, takes effect if DefaultKubernetesCloudProviderBackoff is true
Expand Down
3 changes: 2 additions & 1 deletion pkg/acsengine/defaults-controller-manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ func setControllerManagerConfig(cs *api.ContainerService) {
"--service-account-private-key-file": "/etc/kubernetes/certs/apiserver.key",
"--leader-elect": "true",
"--v": "2",
"--profiling": "False",
"--profiling": "false",
}

// Set --cluster-name based on appropriate DNS prefix
Expand Down Expand Up @@ -47,6 +47,7 @@ func setControllerManagerConfig(cs *api.ContainerService) {
"--node-monitor-grace-period": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod,
"--pod-eviction-timeout": DefaultKubernetesCtrlMgrPodEvictionTimeout,
"--route-reconciliation-period": DefaultKubernetesCtrlMgrRouteReconciliationPeriod,
"--terminated-pod-gc-threshold": DefaultKubernetesCtrlMgrTerminatedPodGcThreshold,
}

// If no user-configurable controller-manager config values exists, use the defaults
Expand Down