github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

validate --hairpin-mode in kubelet config

Browse Source
This commit is contained in:
m1093782566 2017-12-23 17:05:51 +08:00
parent 035598b94a
commit 3406af70bc
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/kubelet/apis/kubeletconfig/validation/validation.go
View File

@ -100,5 +100,13 @@ func ValidateKubeletConfiguration(kc *kubeletconfig.KubeletConfiguration) error
val, kubetypes.NodeAllocatableEnforcementKey, kubetypes.SystemReservedEnforcementKey, kubetypes.KubeReservedEnforcementKey)) val, kubetypes.NodeAllocatableEnforcementKey, kubetypes.SystemReservedEnforcementKey, kubetypes.KubeReservedEnforcementKey))
} }
} }
switch kc.HairpinMode {
case kubeletconfig.HairpinNone:
case kubeletconfig.HairpinVeth:
case kubeletconfig.PromiscuousBridge:
default:
allErrors = append(allErrors, fmt.Errorf("Invalid option %q specified for HairpinMode (--hairpin-mode) setting. Valid options are %q, %q or %q",
kc.HairpinMode, kubeletconfig.HairpinNone, kubeletconfig.HairpinVeth, kubeletconfig.PromiscuousBridge))
}
return utilerrors.NewAggregate(allErrors) return utilerrors.NewAggregate(allErrors)
} }

6
pkg/kubelet/apis/kubeletconfig/validation/validation_test.go
View File

@ -47,6 +47,7 @@ func TestValidateKubeletConfiguration(t *testing.T) {
ReadOnlyPort: 0, ReadOnlyPort: 0,
RegistryBurst: 10, RegistryBurst: 10,
RegistryPullQPS: 5, RegistryPullQPS: 5,
HairpinMode: kubeletconfig.PromiscuousBridge,
} }
if allErrors := ValidateKubeletConfiguration(successCase); allErrors != nil { if allErrors := ValidateKubeletConfiguration(successCase); allErrors != nil {
t.Errorf("expect no errors got %v", allErrors) t.Errorf("expect no errors got %v", allErrors)
@ -75,8 +76,9 @@ func TestValidateKubeletConfiguration(t *testing.T) {
ReadOnlyPort: -10, ReadOnlyPort: -10,
RegistryBurst: -10, RegistryBurst: -10,
RegistryPullQPS: -10, RegistryPullQPS: -10,
HairpinMode: "foo",
} }
if allErrors := ValidateKubeletConfiguration(errorCase); len(allErrors.(utilerrors.Aggregate).Errors()) != 21 { if allErrors := ValidateKubeletConfiguration(errorCase); len(allErrors.(utilerrors.Aggregate).Errors()) != 22 {
t.Errorf("expect 21 errors got %v", len(allErrors.(utilerrors.Aggregate).Errors())) t.Errorf("expect 22 errors got %v", len(allErrors.(utilerrors.Aggregate).Errors()))
} }
} }