From 26b11474ca1fa5a7e449ed655342c14365668b31 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Wed, 4 Oct 2017 12:26:29 -0400 Subject: [PATCH] Remove cmd/kubeadm from pkg/controller --- cmd/kube-apiserver/app/options/options.go | 5 +--- .../app/options/options_test.go | 2 +- pkg/kubeapiserver/options/BUILD | 1 + pkg/kubeapiserver/options/options.go | 24 +++++++++++++++++++ pkg/master/BUILD | 2 +- pkg/master/master.go | 4 ++-- 6 files changed, 30 insertions(+), 8 deletions(-) create mode 100644 pkg/kubeapiserver/options/options.go diff --git a/cmd/kube-apiserver/app/options/options.go b/cmd/kube-apiserver/app/options/options.go index 785ac3ca91..727edd15ed 100644 --- a/cmd/kube-apiserver/app/options/options.go +++ b/cmd/kube-apiserver/app/options/options.go @@ -38,9 +38,6 @@ import ( "github.com/spf13/pflag" ) -// DefaultServiceNodePortRange is the default port range for NodePort services. -var DefaultServiceNodePortRange = utilnet.PortRange{Base: 30000, Size: 2768} - // ServerRunOptions runs a kubernetes api server. type ServerRunOptions struct { GenericServerRunOptions *genericoptions.ServerRunOptions @@ -114,7 +111,7 @@ func NewServerRunOptions() *ServerRunOptions { EnableHttps: true, HTTPTimeout: time.Duration(5) * time.Second, }, - ServiceNodePortRange: DefaultServiceNodePortRange, + ServiceNodePortRange: kubeoptions.DefaultServiceNodePortRange, } // Overwrite the default for storage data format. s.Etcd.DefaultStorageMediaType = "application/vnd.kubernetes.protobuf" diff --git a/cmd/kube-apiserver/app/options/options_test.go b/cmd/kube-apiserver/app/options/options_test.go index e594e0e84b..59320114c2 100644 --- a/cmd/kube-apiserver/app/options/options_test.go +++ b/cmd/kube-apiserver/app/options/options_test.go @@ -90,7 +90,7 @@ func TestAddFlags(t *testing.T) { // This is a snapshot of expected options parsed by args. expected := &ServerRunOptions{ - ServiceNodePortRange: DefaultServiceNodePortRange, + ServiceNodePortRange: kubeoptions.DefaultServiceNodePortRange, MasterCount: 5, EndpointReconcilerType: string(reconcilers.MasterCountReconcilerType), AllowPrivileged: false, diff --git a/pkg/kubeapiserver/options/BUILD b/pkg/kubeapiserver/options/BUILD index 83d1a3793b..d337d2fab6 100644 --- a/pkg/kubeapiserver/options/BUILD +++ b/pkg/kubeapiserver/options/BUILD @@ -13,6 +13,7 @@ go_library( "authentication.go", "authorization.go", "cloudprovider.go", + "options.go", "serving.go", "storage_versions.go", ], diff --git a/pkg/kubeapiserver/options/options.go b/pkg/kubeapiserver/options/options.go new file mode 100644 index 0000000000..acc1c91f9f --- /dev/null +++ b/pkg/kubeapiserver/options/options.go @@ -0,0 +1,24 @@ +/* +Copyright 2017 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package options + +import ( + utilnet "k8s.io/apimachinery/pkg/util/net" +) + +// DefaultServiceNodePortRange is the default port range for NodePort services. +var DefaultServiceNodePortRange = utilnet.PortRange{Base: 30000, Size: 2768} diff --git a/pkg/master/BUILD b/pkg/master/BUILD index d700f117f7..8ca5d68151 100644 --- a/pkg/master/BUILD +++ b/pkg/master/BUILD @@ -17,7 +17,6 @@ go_library( "services.go", ], deps = [ - "//cmd/kube-apiserver/app/options:go_default_library", "//pkg/api:go_default_library", "//pkg/api/install:go_default_library", "//pkg/apis/admission/install:go_default_library", @@ -38,6 +37,7 @@ go_library( "//pkg/apis/settings/install:go_default_library", "//pkg/apis/storage/install:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library", + "//pkg/kubeapiserver/options:go_default_library", "//pkg/kubelet/client:go_default_library", "//pkg/master/reconcilers:go_default_library", "//pkg/master/tunneler:go_default_library", diff --git a/pkg/master/master.go b/pkg/master/master.go index 6e3dfe248c..b5a559dfd0 100644 --- a/pkg/master/master.go +++ b/pkg/master/master.go @@ -53,10 +53,10 @@ import ( serverstorage "k8s.io/apiserver/pkg/server/storage" storagefactory "k8s.io/apiserver/pkg/storage/storagebackend/factory" corev1client "k8s.io/client-go/kubernetes/typed/core/v1" - "k8s.io/kubernetes/cmd/kube-apiserver/app/options" "k8s.io/kubernetes/pkg/api" kapi "k8s.io/kubernetes/pkg/api" coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" + kubeoptions "k8s.io/kubernetes/pkg/kubeapiserver/options" kubeletclient "k8s.io/kubernetes/pkg/kubelet/client" "k8s.io/kubernetes/pkg/master/reconcilers" "k8s.io/kubernetes/pkg/master/tunneler" @@ -265,7 +265,7 @@ func (cfg *Config) Complete(informers informers.SharedInformerFactory) Completed // We should probably allow this for clouds that don't require NodePort to do load-balancing (GCE) // but then that breaks the strict nestedness of ServiceType. // Review post-v1 - c.ExtraConfig.ServiceNodePortRange = options.DefaultServiceNodePortRange + c.ExtraConfig.ServiceNodePortRange = kubeoptions.DefaultServiceNodePortRange glog.Infof("Node port range unspecified. Defaulting to %v.", c.ExtraConfig.ServiceNodePortRange) }