From 925ba42507f84ae6f61dd0272dd0e9a45edf5e28 Mon Sep 17 00:00:00 2001 From: Wojciech Tyczynski Date: Mon, 4 Jul 2016 16:52:55 +0200 Subject: [PATCH] Avoid annoying logs in integration tests --- test/integration/framework/master_utils.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/test/integration/framework/master_utils.go b/test/integration/framework/master_utils.go index 8af24d81d3d..bac6f01f39f 100644 --- a/test/integration/framework/master_utils.go +++ b/test/integration/framework/master_utils.go @@ -51,6 +51,7 @@ import ( "k8s.io/kubernetes/pkg/master" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/storage/storagebackend" + utilnet "k8s.io/kubernetes/pkg/util/net" "k8s.io/kubernetes/plugin/pkg/admission/admit" "github.com/pborman/uuid" @@ -152,6 +153,14 @@ func startMasterOrDie(masterConfig *master.Config) (*master.Master, *httptest.Se return m, s } +func parseCIDROrDie(cidr string) *net.IPNet { + _, parsed, err := net.ParseCIDR(cidr) + if err != nil { + glog.Fatalf("error while parsing CIDR: %s", cidr) + } + return parsed +} + // Returns a basic master config. func NewMasterConfig() *master.Config { config := storagebackend.Config{ @@ -208,6 +217,9 @@ func NewMasterConfig() *master.Config { AdmissionControl: admit.NewAlwaysAdmit(), Serializer: api.Codecs, EnableWatchCache: true, + // Set those values to avoid annoying warnings in logs. + ServiceClusterIPRange: parseCIDROrDie("10.0.0.0/24"), + ServiceNodePortRange: utilnet.PortRange{Base: 30000, Size: 2768}, }, KubeletClient: kubeletclient.FakeKubeletClient{}, }