Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
a6c43c6a
Commit
a6c43c6a
authored
Jan 29, 2018
by
hzxuzhonghu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pass listener in integration test to prevent port in use flake
parent
84408378
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
158 additions
and
180 deletions
+158
-180
serving.go
staging/src/k8s.io/apiserver/pkg/server/options/serving.go
+9
-2
main.go
staging/src/k8s.io/kube-aggregator/main.go
+2
-1
start.go
staging/src/k8s.io/kube-aggregator/pkg/cmd/server/start.go
+3
-3
main.go
staging/src/k8s.io/sample-apiserver/main.go
+2
-1
start.go
staging/src/k8s.io/sample-apiserver/pkg/cmd/server/start.go
+3
-3
etcd_storage_path_test.go
test/integration/etcd/etcd_storage_path_test.go
+29
-34
apiserver_test.go
test/integration/examples/apiserver_test.go
+105
-109
master_utils.go
test/integration/framework/master_utils.go
+0
-23
ciphers_test.go
test/integration/tls/ciphers_test.go
+5
-4
No files found.
staging/src/k8s.io/apiserver/pkg/server/options/serving.go
View file @
a6c43c6a
...
...
@@ -35,7 +35,8 @@ import (
type
SecureServingOptions
struct
{
BindAddress
net
.
IP
BindPort
int
// BindPort is ignored when Listener is set, will serve https even with 0.
BindPort
int
// BindNetwork is the type of network to bind to - defaults to "tcp", accepts "tcp",
// "tcp4", and "tcp6".
BindNetwork
string
...
...
@@ -160,7 +161,7 @@ func (s *SecureServingOptions) ApplyTo(c *server.Config) error {
if
s
==
nil
{
return
nil
}
if
s
.
BindPort
<=
0
{
if
s
.
BindPort
<=
0
&&
s
.
Listener
==
nil
{
return
nil
}
...
...
@@ -171,6 +172,12 @@ func (s *SecureServingOptions) ApplyTo(c *server.Config) error {
if
err
!=
nil
{
return
fmt
.
Errorf
(
"failed to create listener: %v"
,
err
)
}
}
else
{
if
_
,
ok
:=
s
.
Listener
.
Addr
()
.
(
*
net
.
TCPAddr
);
!
ok
{
return
fmt
.
Errorf
(
"failed to parse ip and port from listener"
)
}
s
.
BindPort
=
s
.
Listener
.
Addr
()
.
(
*
net
.
TCPAddr
)
.
Port
s
.
BindAddress
=
s
.
Listener
.
Addr
()
.
(
*
net
.
TCPAddr
)
.
IP
}
if
err
:=
s
.
applyServingInfoTo
(
c
);
err
!=
nil
{
...
...
staging/src/k8s.io/kube-aggregator/main.go
View file @
a6c43c6a
...
...
@@ -44,7 +44,8 @@ func main() {
}
stopCh
:=
genericapiserver
.
SetupSignalHandler
()
cmd
:=
server
.
NewCommandStartAggregator
(
os
.
Stdout
,
os
.
Stderr
,
stopCh
)
options
:=
server
.
NewDefaultOptions
(
os
.
Stdout
,
os
.
Stderr
)
cmd
:=
server
.
NewCommandStartAggregator
(
options
,
stopCh
)
cmd
.
Flags
()
.
AddGoFlagSet
(
flag
.
CommandLine
)
if
err
:=
cmd
.
Execute
();
err
!=
nil
{
glog
.
Fatal
(
err
)
...
...
staging/src/k8s.io/kube-aggregator/pkg/cmd/server/start.go
View file @
a6c43c6a
...
...
@@ -49,9 +49,9 @@ type AggregatorOptions struct {
}
// NewCommandStartAggregator provides a CLI handler for 'start master' command
func
NewCommandStartAggregator
(
out
,
err
io
.
Writer
,
stopCh
<-
chan
struct
{})
*
cobra
.
Command
{
o
:=
NewDefaultOptions
(
out
,
err
)
// with a default AggregatorOptions.
func
NewCommandStartAggregator
(
defaults
*
AggregatorOptions
,
stopCh
<-
chan
struct
{})
*
cobra
.
Command
{
o
:=
*
defaults
cmd
:=
&
cobra
.
Command
{
Short
:
"Launch a API aggregator and proxy server"
,
Long
:
"Launch a API aggregator and proxy server"
,
...
...
staging/src/k8s.io/sample-apiserver/main.go
View file @
a6c43c6a
...
...
@@ -37,7 +37,8 @@ func main() {
}
stopCh
:=
genericapiserver
.
SetupSignalHandler
()
cmd
:=
server
.
NewCommandStartWardleServer
(
os
.
Stdout
,
os
.
Stderr
,
stopCh
)
options
:=
server
.
NewWardleServerOptions
(
os
.
Stdout
,
os
.
Stderr
)
cmd
:=
server
.
NewCommandStartWardleServer
(
options
,
stopCh
)
cmd
.
Flags
()
.
AddGoFlagSet
(
flag
.
CommandLine
)
if
err
:=
cmd
.
Execute
();
err
!=
nil
{
glog
.
Fatal
(
err
)
...
...
staging/src/k8s.io/sample-apiserver/pkg/cmd/server/start.go
View file @
a6c43c6a
...
...
@@ -57,9 +57,9 @@ func NewWardleServerOptions(out, errOut io.Writer) *WardleServerOptions {
}
// NewCommandStartWardleServer provides a CLI handler for 'start master' command
func
NewCommandStartWardleServer
(
out
,
errOut
io
.
Writer
,
stopCh
<-
chan
struct
{})
*
cobra
.
Command
{
o
:=
NewWardleServerOptions
(
out
,
errOut
)
// with a default WardleServerOptions.
func
NewCommandStartWardleServer
(
defaults
*
WardleServerOptions
,
stopCh
<-
chan
struct
{})
*
cobra
.
Command
{
o
:=
*
defaults
cmd
:=
&
cobra
.
Command
{
Short
:
"Launch a wardle API server"
,
Long
:
"Launch a wardle API server"
,
...
...
test/integration/etcd/etcd_storage_path_test.go
View file @
a6c43c6a
...
...
@@ -41,6 +41,7 @@ import (
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/wait"
genericapiserver
"k8s.io/apiserver/pkg/server"
genericapiserveroptions
"k8s.io/apiserver/pkg/server/options"
"k8s.io/apiserver/pkg/storage/storagebackend"
clientset
"k8s.io/client-go/kubernetes"
restclient
"k8s.io/client-go/rest"
...
...
@@ -704,47 +705,41 @@ func startRealMasterOrDie(t *testing.T, certDir string) (*allClient, clientv3.KV
}
}()
for
{
kubeAPIServerOptions
:=
options
.
NewServerRunOptions
()
kubeAPIServerOptions
.
SecureServing
.
BindAddress
=
net
.
ParseIP
(
"127.0.0.1"
)
kubeAPIServerOptions
.
SecureServing
.
ServerCert
.
CertDirectory
=
certDir
kubeAPIServerOptions
.
Etcd
.
StorageConfig
.
ServerList
=
[]
string
{
framework
.
GetEtcdURL
()}
kubeAPIServerOptions
.
Etcd
.
DefaultStorageMediaType
=
runtime
.
ContentTypeJSON
// TODO use protobuf?
kubeAPIServerOptions
.
ServiceClusterIPRange
=
*
defaultServiceClusterIPRange
kubeAPIServerOptions
.
Authorization
.
Mode
=
"RBAC"
// always get a fresh port in case something claimed the old one
kubePort
,
err
:=
framework
.
FindFreeLocalPort
()
if
err
!=
nil
{
t
.
Fatal
(
err
)
}
listener
,
_
,
err
:=
genericapiserveroptions
.
CreateListener
(
"tcp"
,
"127.0.0.1:0"
)
if
err
!=
nil
{
t
.
Fatal
(
err
)
}
kubeAPIServerOptions
.
SecureServing
.
BindPort
=
kubePort
kubeAPIServerOptions
:=
options
.
NewServerRunOptions
()
tunneler
,
proxyTransport
,
err
:=
app
.
CreateNodeDialer
(
kubeAPIServerOptions
)
if
err
!=
nil
{
t
.
Fatal
(
err
)
}
kubeAPIServerConfig
,
sharedInformers
,
versionedInformers
,
_
,
_
,
err
:=
app
.
CreateKubeAPIServerConfig
(
kubeAPIServerOptions
,
tunneler
,
proxyTransport
)
if
err
!=
nil
{
t
.
Fatal
(
err
)
}
kubeAPIServerOptions
.
SecureServing
.
Listener
=
listener
kubeAPIServerOptions
.
SecureServing
.
ServerCert
.
CertDirectory
=
certDir
kubeAPIServerOptions
.
Etcd
.
StorageConfig
.
ServerList
=
[]
string
{
framework
.
GetEtcdURL
()}
kubeAPIServerOptions
.
Etcd
.
DefaultStorageMediaType
=
runtime
.
ContentTypeJSON
// TODO use protobuf?
kubeAPIServerOptions
.
ServiceClusterIPRange
=
*
defaultServiceClusterIPRange
kubeAPIServerOptions
.
Authorization
.
Mode
=
"RBAC"
kubeAPIServerConfig
.
ExtraConfig
.
APIResourceConfigSource
=
&
allResourceSource
{}
// force enable all resources
tunneler
,
proxyTransport
,
err
:=
app
.
CreateNodeDialer
(
kubeAPIServerOptions
)
if
err
!=
nil
{
t
.
Fatal
(
err
)
}
kubeAPIServerConfig
,
sharedInformers
,
versionedInformers
,
_
,
_
,
err
:=
app
.
CreateKubeAPIServerConfig
(
kubeAPIServerOptions
,
tunneler
,
proxyTransport
)
if
err
!=
nil
{
t
.
Fatal
(
err
)
}
kubeAPIServer
,
err
:=
app
.
CreateKubeAPIServer
(
kubeAPIServerConfig
,
genericapiserver
.
EmptyDelegate
,
sharedInformers
,
versionedInformers
)
if
err
!=
nil
{
t
.
Fatal
(
err
)
}
kubeAPIServerConfig
.
ExtraConfig
.
APIResourceConfigSource
=
&
allResourceSource
{}
// force enable all resources
kubeClientConfigValue
.
Store
(
kubeAPIServerConfig
.
GenericConfig
.
LoopbackClientConfig
)
storageConfigValue
.
Store
(
kubeAPIServerOptions
.
Etcd
.
StorageConfig
)
kubeAPIServer
,
err
:=
app
.
CreateKubeAPIServer
(
kubeAPIServerConfig
,
genericapiserver
.
EmptyDelegate
,
sharedInformers
,
versionedInformers
)
if
err
!=
nil
{
t
.
Fatal
(
err
)
}
if
err
:=
kubeAPIServer
.
GenericAPIServer
.
PrepareRun
()
.
Run
(
wait
.
NeverStop
);
err
!=
nil
{
t
.
Log
(
err
)
}
kubeClientConfigValue
.
Store
(
kubeAPIServerConfig
.
GenericConfig
.
LoopbackClientConfig
)
storageConfigValue
.
Store
(
kubeAPIServerOptions
.
Etcd
.
StorageConfig
)
time
.
Sleep
(
time
.
Second
)
if
err
:=
kubeAPIServer
.
GenericAPIServer
.
PrepareRun
()
.
Run
(
wait
.
NeverStop
);
err
!=
nil
{
t
.
Fatal
(
err
)
}
}()
...
...
test/integration/examples/apiserver_test.go
View file @
a6c43c6a
...
...
@@ -22,9 +22,9 @@ import (
"fmt"
"io/ioutil"
"net"
"net/http"
"os"
"path"
"strconv"
"sync/atomic"
"testing"
"time"
...
...
@@ -34,6 +34,7 @@ import (
metav1
"k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/wait"
genericapiserver
"k8s.io/apiserver/pkg/server"
genericapiserveroptions
"k8s.io/apiserver/pkg/server/options"
client
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/rest"
"k8s.io/client-go/tools/clientcmd"
...
...
@@ -90,52 +91,48 @@ func TestAggregatedAPIServer(t *testing.T) {
kubeClientConfigValue
:=
atomic
.
Value
{}
go
func
()
{
for
{
// always get a fresh port in case something claimed the old one
kubePort
,
err
:=
framework
.
FindFreeLocalPort
()
if
err
!=
nil
{
t
.
Fatal
(
err
)
}
kubeAPIServerOptions
:=
options
.
NewServerRunOptions
()
kubeAPIServerOptions
.
SecureServing
.
BindAddress
=
net
.
ParseIP
(
"127.0.0.1"
)
kubeAPIServerOptions
.
SecureServing
.
BindPort
=
kubePort
kubeAPIServerOptions
.
SecureServing
.
ServerCert
.
CertDirectory
=
certDir
kubeAPIServerOptions
.
InsecureServing
.
BindPort
=
0
kubeAPIServerOptions
.
Etcd
.
StorageConfig
.
ServerList
=
[]
string
{
framework
.
GetEtcdURL
()}
kubeAPIServerOptions
.
ServiceClusterIPRange
=
*
defaultServiceClusterIPRange
kubeAPIServerOptions
.
Authentication
.
RequestHeader
.
UsernameHeaders
=
[]
string
{
"X-Remote-User"
}
kubeAPIServerOptions
.
Authentication
.
RequestHeader
.
GroupHeaders
=
[]
string
{
"X-Remote-Group"
}
kubeAPIServerOptions
.
Authentication
.
RequestHeader
.
ExtraHeaderPrefixes
=
[]
string
{
"X-Remote-Extra-"
}
kubeAPIServerOptions
.
Authentication
.
RequestHeader
.
AllowedNames
=
[]
string
{
"kube-aggregator"
}
kubeAPIServerOptions
.
Authentication
.
RequestHeader
.
ClientCAFile
=
proxyCACertFile
.
Name
()
kubeAPIServerOptions
.
Authentication
.
ClientCert
.
ClientCA
=
clientCACertFile
.
Name
()
kubeAPIServerOptions
.
Authorization
.
Mode
=
"RBAC"
tunneler
,
proxyTransport
,
err
:=
app
.
CreateNodeDialer
(
kubeAPIServerOptions
)
if
err
!=
nil
{
t
.
Fatal
(
err
)
}
kubeAPIServerConfig
,
sharedInformers
,
versionedInformers
,
_
,
_
,
err
:=
app
.
CreateKubeAPIServerConfig
(
kubeAPIServerOptions
,
tunneler
,
proxyTransport
)
if
err
!=
nil
{
t
.
Fatal
(
err
)
}
// Adjust the loopback config for external use (external server name and CA)
kubeAPIServerClientConfig
:=
rest
.
CopyConfig
(
kubeAPIServerConfig
.
GenericConfig
.
LoopbackClientConfig
)
kubeAPIServerClientConfig
.
CAFile
=
path
.
Join
(
certDir
,
"apiserver.crt"
)
kubeAPIServerClientConfig
.
CAData
=
nil
kubeAPIServerClientConfig
.
ServerName
=
""
kubeClientConfigValue
.
Store
(
kubeAPIServerClientConfig
)
kubeAPIServer
,
err
:=
app
.
CreateKubeAPIServer
(
kubeAPIServerConfig
,
genericapiserver
.
EmptyDelegate
,
sharedInformers
,
versionedInformers
)
if
err
!=
nil
{
t
.
Fatal
(
err
)
}
if
err
:=
kubeAPIServer
.
GenericAPIServer
.
PrepareRun
()
.
Run
(
wait
.
NeverStop
);
err
!=
nil
{
t
.
Log
(
err
)
}
time
.
Sleep
(
100
*
time
.
Millisecond
)
listener
,
_
,
err
:=
genericapiserveroptions
.
CreateListener
(
"tcp"
,
"127.0.0.1:0"
)
if
err
!=
nil
{
t
.
Fatal
(
err
)
}
kubeAPIServerOptions
:=
options
.
NewServerRunOptions
()
kubeAPIServerOptions
.
SecureServing
.
Listener
=
listener
kubeAPIServerOptions
.
SecureServing
.
BindAddress
=
net
.
ParseIP
(
"127.0.0.1"
)
kubeAPIServerOptions
.
SecureServing
.
ServerCert
.
CertDirectory
=
certDir
kubeAPIServerOptions
.
InsecureServing
.
BindPort
=
0
kubeAPIServerOptions
.
Etcd
.
StorageConfig
.
ServerList
=
[]
string
{
framework
.
GetEtcdURL
()}
kubeAPIServerOptions
.
ServiceClusterIPRange
=
*
defaultServiceClusterIPRange
kubeAPIServerOptions
.
Authentication
.
RequestHeader
.
UsernameHeaders
=
[]
string
{
"X-Remote-User"
}
kubeAPIServerOptions
.
Authentication
.
RequestHeader
.
GroupHeaders
=
[]
string
{
"X-Remote-Group"
}
kubeAPIServerOptions
.
Authentication
.
RequestHeader
.
ExtraHeaderPrefixes
=
[]
string
{
"X-Remote-Extra-"
}
kubeAPIServerOptions
.
Authentication
.
RequestHeader
.
AllowedNames
=
[]
string
{
"kube-aggregator"
}
kubeAPIServerOptions
.
Authentication
.
RequestHeader
.
ClientCAFile
=
proxyCACertFile
.
Name
()
kubeAPIServerOptions
.
Authentication
.
ClientCert
.
ClientCA
=
clientCACertFile
.
Name
()
kubeAPIServerOptions
.
Authorization
.
Mode
=
"RBAC"
tunneler
,
proxyTransport
,
err
:=
app
.
CreateNodeDialer
(
kubeAPIServerOptions
)
if
err
!=
nil
{
t
.
Fatal
(
err
)
}
kubeAPIServerConfig
,
sharedInformers
,
versionedInformers
,
_
,
_
,
err
:=
app
.
CreateKubeAPIServerConfig
(
kubeAPIServerOptions
,
tunneler
,
proxyTransport
)
if
err
!=
nil
{
t
.
Fatal
(
err
)
}
// Adjust the loopback config for external use (external server name and CA)
kubeAPIServerClientConfig
:=
rest
.
CopyConfig
(
kubeAPIServerConfig
.
GenericConfig
.
LoopbackClientConfig
)
kubeAPIServerClientConfig
.
CAFile
=
path
.
Join
(
certDir
,
"apiserver.crt"
)
kubeAPIServerClientConfig
.
CAData
=
nil
kubeAPIServerClientConfig
.
ServerName
=
""
kubeClientConfigValue
.
Store
(
kubeAPIServerClientConfig
)
kubeAPIServer
,
err
:=
app
.
CreateKubeAPIServer
(
kubeAPIServerConfig
,
genericapiserver
.
EmptyDelegate
,
sharedInformers
,
versionedInformers
)
if
err
!=
nil
{
t
.
Fatal
(
err
)
}
if
err
:=
kubeAPIServer
.
GenericAPIServer
.
PrepareRun
()
.
Run
(
wait
.
NeverStop
);
err
!=
nil
{
t
.
Fatal
(
err
)
}
}()
...
...
@@ -154,9 +151,13 @@ func TestAggregatedAPIServer(t *testing.T) {
t
.
Log
(
err
)
return
false
,
nil
}
if
_
,
err
:=
kubeClient
.
Discovery
()
.
ServerVersion
();
err
!=
nil
{
healthStatus
:=
0
kubeClient
.
Discovery
()
.
RESTClient
()
.
Get
()
.
AbsPath
(
"/healthz"
)
.
Do
()
.
StatusCode
(
&
healthStatus
)
if
healthStatus
!=
http
.
StatusOK
{
return
false
,
nil
}
return
true
,
nil
})
if
err
!=
nil
{
...
...
@@ -177,32 +178,30 @@ func TestAggregatedAPIServer(t *testing.T) {
// start the wardle server to prove we can aggregate it
go
func
()
{
for
{
// always get a fresh port in case something claimed the old one
wardlePortInt
,
err
:=
framework
.
FindFreeLocalPort
()
if
err
!=
nil
{
t
.
Fatal
(
err
)
}
atomic
.
StoreInt32
(
wardlePort
,
int32
(
wardlePortInt
))
wardleCmd
:=
sampleserver
.
NewCommandStartWardleServer
(
os
.
Stdout
,
os
.
Stderr
,
stopCh
)
wardleCmd
.
SetArgs
([]
string
{
"--bind-address"
,
"127.0.0.1"
,
"--secure-port"
,
strconv
.
Itoa
(
wardlePortInt
),
"--requestheader-username-headers=X-Remote-User"
,
"--requestheader-group-headers=X-Remote-Group"
,
"--requestheader-extra-headers-prefix=X-Remote-Extra-"
,
"--requestheader-client-ca-file="
+
proxyCACertFile
.
Name
(),
"--requestheader-allowed-names=kube-aggregator"
,
"--authentication-kubeconfig"
,
kubeconfigFile
.
Name
(),
"--authorization-kubeconfig"
,
kubeconfigFile
.
Name
(),
"--etcd-servers"
,
framework
.
GetEtcdURL
(),
"--cert-dir"
,
wardleCertDir
,
"--kubeconfig"
,
kubeconfigFile
.
Name
(),
})
if
err
:=
wardleCmd
.
Execute
();
err
!=
nil
{
t
.
Log
(
err
)
}
time
.
Sleep
(
100
*
time
.
Millisecond
)
listener
,
port
,
err
:=
genericapiserveroptions
.
CreateListener
(
"tcp"
,
"127.0.0.1:0"
)
if
err
!=
nil
{
t
.
Fatal
(
err
)
}
atomic
.
StoreInt32
(
wardlePort
,
int32
(
port
))
o
:=
sampleserver
.
NewWardleServerOptions
(
os
.
Stdout
,
os
.
Stderr
)
o
.
RecommendedOptions
.
SecureServing
.
Listener
=
listener
o
.
RecommendedOptions
.
SecureServing
.
BindAddress
=
net
.
ParseIP
(
"127.0.0.1"
)
wardleCmd
:=
sampleserver
.
NewCommandStartWardleServer
(
o
,
stopCh
)
wardleCmd
.
SetArgs
([]
string
{
"--requestheader-username-headers=X-Remote-User"
,
"--requestheader-group-headers=X-Remote-Group"
,
"--requestheader-extra-headers-prefix=X-Remote-Extra-"
,
"--requestheader-client-ca-file="
+
proxyCACertFile
.
Name
(),
"--requestheader-allowed-names=kube-aggregator"
,
"--authentication-kubeconfig"
,
kubeconfigFile
.
Name
(),
"--authorization-kubeconfig"
,
kubeconfigFile
.
Name
(),
"--etcd-servers"
,
framework
.
GetEtcdURL
(),
"--cert-dir"
,
wardleCertDir
,
"--kubeconfig"
,
kubeconfigFile
.
Name
(),
})
if
err
:=
wardleCmd
.
Execute
();
err
!=
nil
{
t
.
Fatal
(
err
)
}
}()
...
...
@@ -220,8 +219,9 @@ func TestAggregatedAPIServer(t *testing.T) {
t
.
Log
(
err
)
return
false
,
nil
}
if
_
,
err
:=
wardleClient
.
Discovery
()
.
ServerVersion
();
err
!=
nil
{
t
.
Log
(
err
)
healthStatus
:=
0
wardleClient
.
Discovery
()
.
RESTClient
()
.
Get
()
.
AbsPath
(
"/healthz"
)
.
Do
()
.
StatusCode
(
&
healthStatus
)
if
healthStatus
!=
http
.
StatusOK
{
return
false
,
nil
}
return
true
,
nil
...
...
@@ -255,30 +255,29 @@ func TestAggregatedAPIServer(t *testing.T) {
aggregatorPort
:=
new
(
int32
)
go
func
()
{
for
{
// always get a fresh port in case something claimed the old one
aggregatorPortInt
,
err
:=
framework
.
FindFreeLocalPort
()
if
err
!=
nil
{
t
.
Fatal
(
err
)
}
atomic
.
StoreInt32
(
aggregatorPort
,
int32
(
aggregatorPortInt
))
aggregatorCmd
:=
kubeaggregatorserver
.
NewCommandStartAggregator
(
os
.
Stdout
,
os
.
Stderr
,
stopCh
)
aggregatorCmd
.
SetArgs
([]
string
{
"--bind-address"
,
"127.0.0.1"
,
"--secure-port"
,
strconv
.
Itoa
(
aggregatorPortInt
),
"--requestheader-username-headers"
,
""
,
"--proxy-client-cert-file"
,
proxyClientCertFile
.
Name
(),
"--proxy-client-key-file"
,
proxyClientKeyFile
.
Name
(),
"--kubeconfig"
,
kubeconfigFile
.
Name
(),
"--authentication-kubeconfig"
,
kubeconfigFile
.
Name
(),
"--authorization-kubeconfig"
,
kubeconfigFile
.
Name
(),
"--etcd-servers"
,
framework
.
GetEtcdURL
(),
"--cert-dir"
,
aggregatorCertDir
,
})
if
err
:=
aggregatorCmd
.
Execute
();
err
!=
nil
{
t
.
Log
(
err
)
}
time
.
Sleep
(
100
*
time
.
Millisecond
)
listener
,
port
,
err
:=
genericapiserveroptions
.
CreateListener
(
"tcp"
,
"127.0.0.1:0"
)
if
err
!=
nil
{
t
.
Fatal
(
err
)
}
atomic
.
StoreInt32
(
aggregatorPort
,
int32
(
port
))
o
:=
kubeaggregatorserver
.
NewDefaultOptions
(
os
.
Stdout
,
os
.
Stderr
)
o
.
RecommendedOptions
.
SecureServing
.
Listener
=
listener
o
.
RecommendedOptions
.
SecureServing
.
BindAddress
=
net
.
ParseIP
(
"127.0.0.1"
)
aggregatorCmd
:=
kubeaggregatorserver
.
NewCommandStartAggregator
(
o
,
stopCh
)
aggregatorCmd
.
SetArgs
([]
string
{
"--requestheader-username-headers"
,
""
,
"--proxy-client-cert-file"
,
proxyClientCertFile
.
Name
(),
"--proxy-client-key-file"
,
proxyClientKeyFile
.
Name
(),
"--kubeconfig"
,
kubeconfigFile
.
Name
(),
"--authentication-kubeconfig"
,
kubeconfigFile
.
Name
(),
"--authorization-kubeconfig"
,
kubeconfigFile
.
Name
(),
"--etcd-servers"
,
framework
.
GetEtcdURL
(),
"--cert-dir"
,
aggregatorCertDir
,
})
if
err
:=
aggregatorCmd
.
Execute
();
err
!=
nil
{
t
.
Fatal
(
err
)
}
}()
...
...
@@ -295,7 +294,9 @@ func TestAggregatedAPIServer(t *testing.T) {
// this happens if we race the API server for writing the cert
return
false
,
nil
}
if
_
,
err
:=
aggregatorDiscoveryClient
.
Discovery
()
.
ServerVersion
();
err
!=
nil
{
healthStatus
:=
0
aggregatorDiscoveryClient
.
Discovery
()
.
RESTClient
()
.
Get
()
.
AbsPath
(
"/healthz"
)
.
Do
()
.
StatusCode
(
&
healthStatus
)
if
healthStatus
!=
http
.
StatusOK
{
return
false
,
nil
}
return
true
,
nil
...
...
@@ -304,7 +305,7 @@ func TestAggregatedAPIServer(t *testing.T) {
t
.
Fatal
(
err
)
}
// now we're finally ready to test. These are what's run by defau
tl
now
// now we're finally ready to test. These are what's run by defau
lt
now
testAPIGroupList
(
t
,
wardleClient
.
Discovery
()
.
RESTClient
())
testAPIGroup
(
t
,
wardleClient
.
Discovery
()
.
RESTClient
())
testAPIResourceList
(
t
,
wardleClient
.
Discovery
()
.
RESTClient
())
...
...
@@ -342,8 +343,8 @@ func TestAggregatedAPIServer(t *testing.T) {
_
,
err
=
aggregatorClient
.
ApiregistrationV1beta1
()
.
APIServices
()
.
Create
(
&
apiregistrationv1beta1
.
APIService
{
ObjectMeta
:
metav1
.
ObjectMeta
{
Name
:
"v1."
},
Spec
:
apiregistrationv1beta1
.
APIServiceSpec
{
// register this as a loca service so it doesn't try to lookup the default kubernetes service
// which will have an unroutable IP address since its fake.
// register this as a loca
l
service so it doesn't try to lookup the default kubernetes service
// which will have an unroutable IP address since it
'
s fake.
Group
:
""
,
Version
:
"v1"
,
GroupPriorityMinimum
:
100
,
...
...
@@ -460,8 +461,3 @@ func testAPIResourceList(t *testing.T, client rest.Interface) {
assert
.
Equal
(
t
,
"flunders"
,
apiResourceList
.
APIResources
[
1
]
.
Name
)
assert
.
True
(
t
,
apiResourceList
.
APIResources
[
1
]
.
Namespaced
)
}
const
(
policyCachePollInterval
=
100
*
time
.
Millisecond
policyCachePollTimeout
=
5
*
time
.
Second
)
test/integration/framework/master_utils.go
View file @
a6c43c6a
...
...
@@ -21,7 +21,6 @@ import (
"net/http"
"net/http/httptest"
"path"
"strconv"
"time"
"github.com/go-openapi/spec"
...
...
@@ -328,28 +327,6 @@ func RunAMasterUsingServer(masterConfig *master.Config, s *httptest.Server, mast
return
startMasterOrDie
(
masterConfig
,
s
,
masterReceiver
)
}
// FindFreeLocalPort returns the number of an available port number on
// the loopback interface. Useful for determining the port to launch
// a server on. Error handling required - there is a non-zero chance
// that the returned port number will be bound by another process
// after this function returns.
func
FindFreeLocalPort
()
(
int
,
error
)
{
l
,
err
:=
net
.
Listen
(
"tcp"
,
":0"
)
if
err
!=
nil
{
return
0
,
err
}
defer
l
.
Close
()
_
,
portStr
,
err
:=
net
.
SplitHostPort
(
l
.
Addr
()
.
String
())
if
err
!=
nil
{
return
0
,
err
}
port
,
err
:=
strconv
.
Atoi
(
portStr
)
if
err
!=
nil
{
return
0
,
err
}
return
port
,
nil
}
// SharedEtcd creates a storage config for a shared etcd instance, with a unique prefix.
func
SharedEtcd
()
*
storagebackend
.
Config
{
cfg
:=
storagebackend
.
NewDefaultConfig
(
path
.
Join
(
uuid
.
New
(),
"registry"
),
nil
)
...
...
test/integration/tls/ciphers_test.go
View file @
a6c43c6a
...
...
@@ -29,6 +29,7 @@ import (
"k8s.io/apimachinery/pkg/util/wait"
genericapiserver
"k8s.io/apiserver/pkg/server"
genericapiserveroptions
"k8s.io/apiserver/pkg/server/options"
client
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/rest"
"k8s.io/kubernetes/cmd/kube-apiserver/app"
...
...
@@ -44,17 +45,17 @@ func runBasicSecureAPIServer(t *testing.T, ciphers []string) (uint32, error) {
var
kubePort
uint32
go
func
()
{
// always get a fresh port in case something claimed the old one
freePort
,
err
:=
framework
.
FindFreeLocalPort
()
listener
,
port
,
err
:=
genericapiserveroptions
.
CreateListener
(
"tcp"
,
"127.0.0.1:0"
)
if
err
!=
nil
{
t
.
Fatal
(
err
)
}
atomic
.
StoreUint32
(
&
kubePort
,
uint32
(
freeP
ort
))
atomic
.
StoreUint32
(
&
kubePort
,
uint32
(
p
ort
))
kubeAPIServerOptions
:=
options
.
NewServerRunOptions
()
kubeAPIServerOptions
.
SecureServing
.
BindAddress
=
net
.
ParseIP
(
"127.0.0.1"
)
kubeAPIServerOptions
.
SecureServing
.
BindPort
=
freePort
kubeAPIServerOptions
.
SecureServing
.
BindPort
=
port
kubeAPIServerOptions
.
SecureServing
.
Listener
=
listener
kubeAPIServerOptions
.
SecureServing
.
ServerCert
.
CertDirectory
=
certDir
kubeAPIServerOptions
.
SecureServing
.
CipherSuites
=
ciphers
kubeAPIServerOptions
.
InsecureServing
.
BindPort
=
0
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment