Commit ee3fbf9c authored by Lion-Wei's avatar Lion-Wei

add ProxyModeIPVS in proxy mode validation

parent 65d9b4ef
...@@ -120,9 +120,10 @@ func validateProxyMode(mode componentconfig.ProxyMode, fldPath *field.Path) fiel ...@@ -120,9 +120,10 @@ func validateProxyMode(mode componentconfig.ProxyMode, fldPath *field.Path) fiel
switch mode { switch mode {
case componentconfig.ProxyModeUserspace: case componentconfig.ProxyModeUserspace:
case componentconfig.ProxyModeIPTables: case componentconfig.ProxyModeIPTables:
case componentconfig.ProxyModeIPVS:
case "": case "":
default: default:
modes := []string{string(componentconfig.ProxyModeUserspace), string(componentconfig.ProxyModeIPTables)} modes := []string{string(componentconfig.ProxyModeUserspace), string(componentconfig.ProxyModeIPTables), string(componentconfig.ProxyModeIPVS)}
errMsg := fmt.Sprintf("must be %s or blank (blank means the best-available proxy (currently iptables)", strings.Join(modes, ",")) errMsg := fmt.Sprintf("must be %s or blank (blank means the best-available proxy (currently iptables)", strings.Join(modes, ","))
allErrs = append(allErrs, field.Invalid(fldPath.Child("ProxyMode"), string(mode), errMsg)) allErrs = append(allErrs, field.Invalid(fldPath.Child("ProxyMode"), string(mode), errMsg))
} }
......
...@@ -374,6 +374,7 @@ func TestValidateProxyMode(t *testing.T) { ...@@ -374,6 +374,7 @@ func TestValidateProxyMode(t *testing.T) {
successCases := []componentconfig.ProxyMode{ successCases := []componentconfig.ProxyMode{
componentconfig.ProxyModeUserspace, componentconfig.ProxyModeUserspace,
componentconfig.ProxyModeIPTables, componentconfig.ProxyModeIPTables,
componentconfig.ProxyModeIPVS,
componentconfig.ProxyMode(""), componentconfig.ProxyMode(""),
} }
......
...@@ -158,6 +158,7 @@ type ProxyMode string ...@@ -158,6 +158,7 @@ type ProxyMode string
const ( const (
ProxyModeUserspace ProxyMode = "userspace" ProxyModeUserspace ProxyMode = "userspace"
ProxyModeIPTables ProxyMode = "iptables" ProxyModeIPTables ProxyMode = "iptables"
ProxyModeIPVS ProxyMode = "ipvs"
) )
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment