github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Move DefaultServiceIPRange into pkg/master

pull/6/head
Dr. Stefan Schimanski 2016-11-28 11:41:59 +01:00
parent 332305cba9
commit eeb582e53f
5 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kube-apiserver/app/server.go
View File

@ -93,7 +93,7 @@ func Run(s *options.ServerRunOptions) error {
ApplyAuthenticationOptions(s.Authentication). ApplyAuthenticationOptions(s.Authentication).
ApplyRBACSuperUser(s.Authorization.RBACSuperUser) ApplyRBACSuperUser(s.Authorization.RBACSuperUser)
serviceIPRange, apiServerServiceIP, err := genericapiserver.DefaultServiceIPRange(s.GenericServerRunOptions.ServiceClusterIPRange) serviceIPRange, apiServerServiceIP, err := master.DefaultServiceIPRange(s.GenericServerRunOptions.ServiceClusterIPRange)
if err != nil { if err != nil {
glog.Fatalf("Error determining service IP ranges: %v", err) glog.Fatalf("Error determining service IP ranges: %v", err)
} }

2
pkg/genericapiserver/BUILD
View File

@ -22,9 +22,7 @@ go_library(
"hooks.go", "hooks.go",
"resource_config.go", "resource_config.go",
"resource_encoding_config.go", "resource_encoding_config.go",
"reststorage_interfaces.go",
"serve.go", "serve.go",
"services.go",
"storage_factory.go", "storage_factory.go",
"tunneler.go", "tunneler.go",
], ],

2
pkg/master/master.go
View File

@ -144,7 +144,7 @@ type completedConfig struct {
func (c *Config) Complete() completedConfig { func (c *Config) Complete() completedConfig {
c.GenericConfig.Complete() c.GenericConfig.Complete()
serviceIPRange, apiServerServiceIP, err := genericapiserver.DefaultServiceIPRange(c.ServiceIPRange) serviceIPRange, apiServerServiceIP, err := DefaultServiceIPRange(c.ServiceIPRange)
if err != nil { if err != nil {
glog.Fatalf("Error determining service IP ranges: %v", err) glog.Fatalf("Error determining service IP ranges: %v", err)
} }

2
pkg/genericapiserver/services.go → pkg/master/services.go
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package genericapiserver package master
import ( import (
"fmt" "fmt"

1
pkg/registry/core/rest/storage_core.go
View File

@ -59,6 +59,7 @@ import (
ipallocator "k8s.io/kubernetes/pkg/registry/core/service/ipallocator" ipallocator "k8s.io/kubernetes/pkg/registry/core/service/ipallocator"
"k8s.io/kubernetes/pkg/registry/core/service/portallocator" "k8s.io/kubernetes/pkg/registry/core/service/portallocator"
serviceaccountetcd "k8s.io/kubernetes/pkg/registry/core/serviceaccount/etcd" serviceaccountetcd "k8s.io/kubernetes/pkg/registry/core/serviceaccount/etcd"
"k8s.io/kubernetes/pkg/registry/generic"
"k8s.io/kubernetes/pkg/runtime/schema" "k8s.io/kubernetes/pkg/runtime/schema"
etcdutil "k8s.io/kubernetes/pkg/storage/etcd/util" etcdutil "k8s.io/kubernetes/pkg/storage/etcd/util"
utilnet "k8s.io/kubernetes/pkg/util/net" utilnet "k8s.io/kubernetes/pkg/util/net"