From 9dd589c035c366e1e11b78eb206c4d499065ab7a Mon Sep 17 00:00:00 2001 From: Pengfei Ni Date: Sat, 26 Aug 2017 22:44:27 +0800 Subject: [PATCH 1/2] Use constants instead of magic string for runtime names --- pkg/kubelet/apis/kubeletconfig/v1alpha1/defaults.go | 2 +- pkg/kubelet/kubelet_network.go | 3 ++- pkg/security/apparmor/validate.go | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkg/kubelet/apis/kubeletconfig/v1alpha1/defaults.go b/pkg/kubelet/apis/kubeletconfig/v1alpha1/defaults.go index 192da88f3b..8c609f6c3d 100644 --- a/pkg/kubelet/apis/kubeletconfig/v1alpha1/defaults.go +++ b/pkg/kubelet/apis/kubeletconfig/v1alpha1/defaults.go @@ -82,7 +82,7 @@ func SetDefaults_KubeletConfiguration(obj *KubeletConfiguration) { obj.VolumeStatsAggPeriod = metav1.Duration{Duration: time.Minute} } if obj.ContainerRuntime == "" { - obj.ContainerRuntime = "docker" + obj.ContainerRuntime = kubetypes.DockerContainerRuntime } if obj.RuntimeRequestTimeout == zeroDuration { obj.RuntimeRequestTimeout = metav1.Duration{Duration: 2 * time.Minute} diff --git a/pkg/kubelet/kubelet_network.go b/pkg/kubelet/kubelet_network.go index 85fece144d..e8f0edab72 100644 --- a/pkg/kubelet/kubelet_network.go +++ b/pkg/kubelet/kubelet_network.go @@ -27,6 +27,7 @@ import ( "k8s.io/api/core/v1" "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" "k8s.io/kubernetes/pkg/kubelet/network" + kubetypes "k8s.io/kubernetes/pkg/kubelet/types" utiliptables "k8s.io/kubernetes/pkg/util/iptables" ) @@ -57,7 +58,7 @@ func effectiveHairpinMode(hairpinMode kubeletconfig.HairpinMode, containerRuntim // - It's set to "none". if hairpinMode == kubeletconfig.PromiscuousBridge || hairpinMode == kubeletconfig.HairpinVeth { // Only on docker. - if containerRuntime != "docker" { + if containerRuntime != kubetypes.DockerContainerRuntime { glog.Warningf("Hairpin mode set to %q but container runtime is %q, ignoring", hairpinMode, containerRuntime) return kubeletconfig.HairpinNone, nil } diff --git a/pkg/security/apparmor/validate.go b/pkg/security/apparmor/validate.go index 13788876fb..061a8750c2 100644 --- a/pkg/security/apparmor/validate.go +++ b/pkg/security/apparmor/validate.go @@ -28,6 +28,7 @@ import ( "k8s.io/api/core/v1" utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/kubernetes/pkg/features" + kubetypes "k8s.io/kubernetes/pkg/kubelet/types" utilfile "k8s.io/kubernetes/pkg/util/file" ) @@ -111,7 +112,7 @@ func validateHost(runtime string) error { } // Check runtime support. Currently only Docker is supported. - if runtime != "docker" && runtime != "remote" { + if runtime != kubetypes.DockerContainerRuntime && runtime != kubetypes.RemoteContainerRuntime { return fmt.Errorf("AppArmor is only enabled for 'docker' and 'remote' runtimes. Found: %q.", runtime) } From d88fe3c0cae61699511cfbf9d1c7e323529ea60c Mon Sep 17 00:00:00 2001 From: Pengfei Ni Date: Sat, 26 Aug 2017 22:55:49 +0800 Subject: [PATCH 2/2] run hack/update-bazel.sh --- pkg/security/apparmor/BUILD | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/security/apparmor/BUILD b/pkg/security/apparmor/BUILD index c114e75e5e..66055365d6 100644 --- a/pkg/security/apparmor/BUILD +++ b/pkg/security/apparmor/BUILD @@ -15,6 +15,7 @@ go_library( ], deps = [ "//pkg/features:go_default_library", + "//pkg/kubelet/types:go_default_library", "//pkg/util/file:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/apiserver/pkg/util/feature:go_default_library",