From 8487b1653ec5cf54f292b0caace6126c882307c7 Mon Sep 17 00:00:00 2001 From: m1093782566 Date: Wed, 13 Sep 2017 16:25:30 +0800 Subject: [PATCH] ut test load ipvs config --- cmd/kube-proxy/app/server_test.go | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/cmd/kube-proxy/app/server_test.go b/cmd/kube-proxy/app/server_test.go index 5e6120fcb86..cf047b5f2c1 100644 --- a/cmd/kube-proxy/app/server_test.go +++ b/cmd/kube-proxy/app/server_test.go @@ -292,7 +292,7 @@ ipvs: syncPeriod: 60s kind: KubeProxyConfiguration metricsBindAddress: "%s" -mode: "iptables" +mode: "%s" oomScoreAdj: 17 portRange: "2-7" resourceContainer: /foo @@ -301,20 +301,23 @@ udpTimeoutMilliseconds: 123ms testCases := []struct { name string + mode string bindAddress string clusterCIDR string healthzBindAddress string metricsBindAddress string }{ { - name: "IPv4 config", + name: "iptables mode, IPv4 config", + mode: "iptables", bindAddress: "9.8.7.6", clusterCIDR: "1.2.3.0/24", healthzBindAddress: "1.2.3.4:12345", metricsBindAddress: "2.3.4.5:23456", }, { - name: "IPv6 config", + name: "ipvs mode, IPv6 config", + mode: "ipvs", bindAddress: "2001:db8::1", clusterCIDR: "fd00:1::0/64", healthzBindAddress: "[fd00:1::5]:12345", @@ -355,12 +358,11 @@ udpTimeoutMilliseconds: 123ms SyncPeriod: metav1.Duration{Duration: 60 * time.Second}, }, MetricsBindAddress: tc.metricsBindAddress, - Mode: "iptables", - // TODO: IPVS - OOMScoreAdj: utilpointer.Int32Ptr(17), - PortRange: "2-7", - ResourceContainer: "/foo", - UDPIdleTimeout: metav1.Duration{Duration: 123 * time.Millisecond}, + Mode: componentconfig.ProxyMode(tc.mode), + OOMScoreAdj: utilpointer.Int32Ptr(17), + PortRange: "2-7", + ResourceContainer: "/foo", + UDPIdleTimeout: metav1.Duration{Duration: 123 * time.Millisecond}, } options, err := NewOptions() @@ -368,7 +370,7 @@ udpTimeoutMilliseconds: 123ms yaml := fmt.Sprintf( yamlTemplate, tc.bindAddress, tc.clusterCIDR, - tc.healthzBindAddress, tc.metricsBindAddress) + tc.healthzBindAddress, tc.metricsBindAddress, tc.mode) config, err := options.loadConfig([]byte(yaml)) assert.NoError(t, err, "unexpected error for %s: %v", tc.name, err) if !reflect.DeepEqual(expected, config) {