github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #47631 from bowei/fix-47379

Browse Source 
Fix hardcoded CIDR in the validation_test
This commit is contained in:
Dawn Chen 2017-06-16 14:39:20 -07:00 committed by GitHub
commit cd08baa2c7
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/validation/validation_test.go
View File

@ -7814,7 +7814,7 @@ func TestValidateServiceUpdate(t *testing.T) {
oldSvc.Spec.Type = api.ServiceTypeLoadBalancer oldSvc.Spec.Type = api.ServiceTypeLoadBalancer
oldSvc.Spec.LoadBalancerSourceRanges = []string{"10.0.0.0/8"} oldSvc.Spec.LoadBalancerSourceRanges = []string{"10.0.0.0/8"}
newSvc.Spec.Type = api.ServiceTypeLoadBalancer newSvc.Spec.Type = api.ServiceTypeLoadBalancer
newSvc.Spec.LoadBalancerSourceRanges = []string{"10.180.0.0/16"} newSvc.Spec.LoadBalancerSourceRanges = []string{"10.100.0.0/16"}
}, },
numErrs: 0, numErrs: 0,
}, },

2
test/e2e_node/conformance/run_test.sh
View File

@ -150,7 +150,7 @@ allow_privileged=true
serialize_image_pulls=false serialize_image_pulls=false
config_dir=`mktemp -d` config_dir=`mktemp -d`
file_check_frequency=10s file_check_frequency=10s
pod_cidr=10.180.0.0/24 pod_cidr=10.100.0.0/24
log_level=4 log_level=4
start_kubelet --api-servers $apiserver \ start_kubelet --api-servers $apiserver \
--volume-stats-agg-period $volume_stats_agg_period \ --volume-stats-agg-period $volume_stats_agg_period \

7
test/e2e_node/services/kubelet.go
View File

@ -137,7 +137,12 @@ func (e *E2EServices) startKubelet() (*server, error) {
"--serialize-image-pulls", "false", "--serialize-image-pulls", "false",
"--pod-manifest-path", manifestPath, "--pod-manifest-path", manifestPath,
"--file-check-frequency", "10s", // Check file frequently so tests won't wait too long "--file-check-frequency", "10s", // Check file frequently so tests won't wait too long
"--pod-cidr", "10.180.0.0/24", // Assign a fixed CIDR to the node because there is no node controller. // Assign a fixed CIDR to the node because there is no node controller.
//
// Note: this MUST be in sync with with the IP in
// - cluster/gce/config-test.sh and
// - test/e2e_node/conformance/run_test.sh.
"--pod-cidr", "10.100.0.0/24",
"--eviction-pressure-transition-period", "30s", "--eviction-pressure-transition-period", "30s",
// Apply test framework feature gates by default. This could also be overridden // Apply test framework feature gates by default. This could also be overridden
// by kubelet-flags. // by kubelet-flags.