diff --git a/examples/apiserver/apiserver.go b/examples/apiserver/apiserver.go index b054d870c9b..7c1b22666f2 100644 --- a/examples/apiserver/apiserver.go +++ b/examples/apiserver/apiserver.go @@ -32,6 +32,13 @@ import ( _ "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testdata/apis/testgroup/install" ) +const ( + // Ports on which to run the server. + // Explicitly setting these to a different value than the default values, to prevent this from clashing with a local cluster. + InsecurePort = 8081 + SecurePort = 6444 +) + func newStorageDestinations(groupName string, groupMeta *apimachinery.GroupMeta) (*genericapiserver.StorageDestinations, error) { storageDestinations := genericapiserver.NewStorageDestinations() var storageConfig etcdstorage.EtcdStorageConfig @@ -85,6 +92,9 @@ func Run() error { if err := s.InstallAPIGroups([]genericapiserver.APIGroupInfo{apiGroupInfo}); err != nil { return fmt.Errorf("Error in installing API: %v", err) } - s.Run(genericapiserver.NewServerRunOptions()) + serverOptions := genericapiserver.NewServerRunOptions() + serverOptions.InsecurePort = InsecurePort + serverOptions.SecurePort = SecurePort + s.Run(serverOptions) return nil } diff --git a/examples/apiserver/apiserver_test.go b/examples/apiserver/apiserver_test.go index 4d9971dd7be..5884ef095b7 100644 --- a/examples/apiserver/apiserver_test.go +++ b/examples/apiserver/apiserver_test.go @@ -30,7 +30,7 @@ import ( "k8s.io/kubernetes/pkg/api/unversioned" ) -var serverIP = "http://localhost:8080" +var serverIP = fmt.Sprintf("http://localhost:%d", InsecurePort) var groupVersion = v1.SchemeGroupVersion