github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

f

Browse Source
This commit is contained in:
Mike Danese 2016-04-12 14:22:34 -07:00 committed by Michael Taufen
parent e070cb617a
commit e235073c26
1 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
pkg/apis/componentconfig/v1alpha1/defaults.go
View File

@ -17,6 +17,7 @@ limitations under the License.
package v1alpha1
import (
"runtime"
"time"
"k8s.io/kubernetes/pkg/api"
@ -24,12 +25,24 @@ import (
"k8s.io/kubernetes/pkg/kubelet/qos"
kubetypes "k8s.io/kubernetes/pkg/kubelet/types"
"k8s.io/kubernetes/pkg/master/ports"
"k8s.io/kubernetes/pkg/runtime"
kruntime "k8s.io/kubernetes/pkg/runtime"
)
var zeroDuration = unversioned.Duration{}
func addDefaultingFuncs(scheme *runtime.Scheme) {
var defaultPodInfraConatinerImage = func() string {
const (
defaultPodInfraContainerImageName = "gcr.io/google_containers/pause"
defaultPodInfraContainerImageVersion = "2.0"
)
if runtime.GOARCH == "amd64" {
return defaultPodInfraContainerImageName + ":" + defaultPodInfraContainerImageVersion
} else {
return defaultPodInfraContainerImageName + "-" + runtime.GOARCH + ":" + defaultPodInfraContainerImageVersion
}
}()
func addDefaultingFuncs(scheme *kruntime.Scheme) {
scheme.AddDefaultingFuncs(
SetDefaults_KubeProxyConfiguration,
SetDefaults_KubeSchedulerConfiguration,
@ -127,6 +140,9 @@ func SetDefaults_KubeletConfiguration(obj *KubeletConfiguration) {
if obj.CAdvisorPort == 0 {
obj.CAdvisorPort = 4194
}
if obj.VolumeStatsAggPeriod == zeroDuration {
obj.VolumeStatsAggPeriod = unversioned.Duration{1 * time.Minute}
}
if obj.CertDirectory == "" {
obj.CertDirectory = "/var/run/kubernetes"
}
@ -178,10 +194,10 @@ func SetDefaults_KubeletConfiguration(obj *KubeletConfiguration) {
if obj.HTTPCheckFrequency == zeroDuration {
obj.HTTPCheckFrequency = unversioned.Duration{20 * time.Second}
}
if obj.ImageGCHighThresholdPercent == 0 {
if obj.ImageGCHighThresholdPercent == nil {
obj.ImageGCHighThresholdPercent = 90
}
if obj.ImageGCLowThresholdPercent == 0 {
if obj.ImageGCLowThresholdPercent == nil {
obj.ImageGCLowThresholdPercent = 80
}
if obj.LowDiskSpaceThresholdMB == 0 {
@ -201,14 +217,11 @@ func SetDefaults_KubeletConfiguration(obj *KubeletConfiguration) {
obj.MaxOpenFiles = 1000000
}
if obj.MaxPods == 0 {
obj.MaxPods = 40
obj.MaxPods = 110
}
if obj.MinimumGCAge == zeroDuration {
obj.MinimumGCAge = unversioned.Duration{1 * time.Minute}
}
if obj.VolumeStatsAggPeriod == zeroDuration {
obj.VolumeStatsAggPeriod = unversioned.Duration{time.Minute}
}
if obj.NetworkPluginDir == "" {
obj.NetworkPluginDir = "/usr/libexec/kubernetes/kubelet-plugins/net/exec/"
}
@ -225,7 +238,7 @@ func SetDefaults_KubeletConfiguration(obj *KubeletConfiguration) {
obj.OOMScoreAdj = int32(qos.KubeletOOMScoreAdj)
}
if obj.PodInfraContainerImage == "" {
//obj.PodInfraContainerImage = kubetypes.PodInfraContainerImage
obj.PodInfraContainerImage = defaultPodInfraContainer
}
if obj.Port == 0 {
obj.Port = ports.KubeletPort
@ -236,9 +249,6 @@ func SetDefaults_KubeletConfiguration(obj *KubeletConfiguration) {
if obj.RegisterNode == nil {
obj.RegisterNode = boolVar(true)
}
if obj.ResolverConfig == "" {
obj.ResolverConfig = "/etc/resolv.conf"
}
if obj.RegisterSchedulable == nil {
obj.RegisterSchedulable = boolVar(true)
}
@ -246,7 +256,10 @@ func SetDefaults_KubeletConfiguration(obj *KubeletConfiguration) {
obj.RegistryBurst = 10
}
if obj.RegistryPullQPS == 0 {
obj.RegistryPullQPS = 5.0
obj.RegistryPullQPS = 5
}
if obj.RktAPIEndpoint == "" {
obj.RktAPIEndpoint = "localhost:15441"
}
if obj.RootDirectory == "" {
obj.RootDirectory = "/var/lib/kubelet"
@ -264,7 +277,7 @@ func SetDefaults_KubeletConfiguration(obj *KubeletConfiguration) {
obj.ReconcileCIDR = boolVar(true)
}
if obj.KubeAPIQPS == 0 {
obj.KubeAPIQPS = 5.0
obj.KubeAPIQPS = 5
}
if obj.KubeAPIBurst == 0 {
obj.KubeAPIBurst = 10