github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-02 16:29:21 +00:00
Code Issues Projects Releases Wiki Activity

Fix cAdvisorPort, 0 is a valid option

Browse Source
This commit is contained in:
Michael Taufen 2017-06-02 12:05:48 -07:00
parent 83f9158709
commit ca21da45f3
5 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/apis/componentconfig/v1alpha1/BUILD
View File

@ -28,6 +28,7 @@ go_library(
"//pkg/kubelet/qos:go_default_library", "//pkg/kubelet/qos:go_default_library",
"//pkg/kubelet/types:go_default_library", "//pkg/kubelet/types:go_default_library",
"//pkg/master/ports:go_default_library", "//pkg/master/ports:go_default_library",
"//pkg/util:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/conversion:go_default_library", "//vendor/k8s.io/apimachinery/pkg/conversion:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",

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

@ -30,6 +30,7 @@ import (
"k8s.io/kubernetes/pkg/kubelet/qos" "k8s.io/kubernetes/pkg/kubelet/qos"
kubetypes "k8s.io/kubernetes/pkg/kubelet/types" kubetypes "k8s.io/kubernetes/pkg/kubelet/types"
"k8s.io/kubernetes/pkg/master/ports" "k8s.io/kubernetes/pkg/master/ports"
"k8s.io/kubernetes/pkg/util"
) )
const ( const (
@ -215,8 +216,8 @@ func SetDefaults_KubeletConfiguration(obj *KubeletConfiguration) {
if obj.CloudProvider == "" { if obj.CloudProvider == "" {
obj.CloudProvider = AutoDetectCloudProvider obj.CloudProvider = AutoDetectCloudProvider
} }
if obj.CAdvisorPort == 0 { if obj.CAdvisorPort == nil {
obj.CAdvisorPort = 4194 obj.CAdvisorPort = util.Int32Ptr(4194)
} }
if obj.VolumeStatsAggPeriod == zeroDuration { if obj.VolumeStatsAggPeriod == zeroDuration {
obj.VolumeStatsAggPeriod = metav1.Duration{Duration: time.Minute} obj.VolumeStatsAggPeriod = metav1.Duration{Duration: time.Minute}

2
pkg/apis/componentconfig/v1alpha1/types.go
View File

@ -340,7 +340,7 @@ type KubeletConfiguration struct {
// to retain globally. Each container takes up some disk space. // to retain globally. Each container takes up some disk space.
MaxContainerCount *int32 `json:"maxContainerCount"` MaxContainerCount *int32 `json:"maxContainerCount"`
// cAdvisorPort is the port of the localhost cAdvisor endpoint // cAdvisorPort is the port of the localhost cAdvisor endpoint
CAdvisorPort int32 `json:"cAdvisorPort"` CAdvisorPort *int32 `json:"cAdvisorPort"`
// healthzPort is the port of the localhost healthz endpoint // healthzPort is the port of the localhost healthz endpoint
HealthzPort int32 `json:"healthzPort"` HealthzPort int32 `json:"healthzPort"`
// healthzBindAddress is the IP address for the healthz server to serve // healthzBindAddress is the IP address for the healthz server to serve

8
pkg/apis/componentconfig/v1alpha1/zz_generated.conversion.go
View File

@ -406,7 +406,9 @@ func autoConvert_v1alpha1_KubeletConfiguration_To_componentconfig_KubeletConfigu
if err := v1.Convert_Pointer_int32_To_int32(&in.MaxContainerCount, &out.MaxContainerCount, s); err != nil { if err := v1.Convert_Pointer_int32_To_int32(&in.MaxContainerCount, &out.MaxContainerCount, s); err != nil {
return err return err
} }
out.CAdvisorPort = in.CAdvisorPort if err := v1.Convert_Pointer_int32_To_int32(&in.CAdvisorPort, &out.CAdvisorPort, s); err != nil {
return err
}
out.HealthzPort = in.HealthzPort out.HealthzPort = in.HealthzPort
out.HealthzBindAddress = in.HealthzBindAddress out.HealthzBindAddress = in.HealthzBindAddress
if err := v1.Convert_Pointer_int32_To_int32(&in.OOMScoreAdj, &out.OOMScoreAdj, s); err != nil { if err := v1.Convert_Pointer_int32_To_int32(&in.OOMScoreAdj, &out.OOMScoreAdj, s); err != nil {
@ -580,7 +582,9 @@ func autoConvert_componentconfig_KubeletConfiguration_To_v1alpha1_KubeletConfigu
if err := v1.Convert_int32_To_Pointer_int32(&in.MaxContainerCount, &out.MaxContainerCount, s); err != nil { if err := v1.Convert_int32_To_Pointer_int32(&in.MaxContainerCount, &out.MaxContainerCount, s); err != nil {
return err return err
} }
out.CAdvisorPort = in.CAdvisorPort if err := v1.Convert_int32_To_Pointer_int32(&in.CAdvisorPort, &out.CAdvisorPort, s); err != nil {
return err
}
out.HealthzPort = in.HealthzPort out.HealthzPort = in.HealthzPort
out.HealthzBindAddress = in.HealthzBindAddress out.HealthzBindAddress = in.HealthzBindAddress
if err := v1.Convert_int32_To_Pointer_int32(&in.OOMScoreAdj, &out.OOMScoreAdj, s); err != nil { if err := v1.Convert_int32_To_Pointer_int32(&in.OOMScoreAdj, &out.OOMScoreAdj, s); err != nil {

5
pkg/apis/componentconfig/v1alpha1/zz_generated.deepcopy.go
View File

@ -217,6 +217,11 @@ func DeepCopy_v1alpha1_KubeletConfiguration(in interface{}, out interface{}, c *
*out = new(int32) *out = new(int32)
**out = **in **out = **in
} }
if in.CAdvisorPort != nil {
in, out := &in.CAdvisorPort, &out.CAdvisorPort
*out = new(int32)
**out = **in
}
if in.OOMScoreAdj != nil { if in.OOMScoreAdj != nil {
in, out := &in.OOMScoreAdj, &out.OOMScoreAdj in, out := &in.OOMScoreAdj, &out.OOMScoreAdj
*out = new(int32) *out = new(int32)