Skip to content

K
k3s
Commit 41aeccd0 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #50848 from wackxu/addTest

Automatic merge from submit-queue (batch tested with PRs 50213, 50707, 49502, 51230, 50848) Expand the test to include other flags as well **What this PR does / why we need it**: Expand the test to include other flags as well **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: **Release note**: ```release-note ``` `NONE`
parents 81363abc 7154034f
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 5 deletions
cmd/kube-apiserver/app/options/BUILD
View file @ 41aeccd0
...@@ -67,6 +67,7 @@ go_test( ...@@ -67,6 +67,7 @@ go_test(
"//vendor/k8s.io/apiserver/pkg/server/options:go_default_library", "//vendor/k8s.io/apiserver/pkg/server/options:go_default_library",
"//vendor/k8s.io/apiserver/pkg/storage/storagebackend:go_default_library", "//vendor/k8s.io/apiserver/pkg/storage/storagebackend:go_default_library",
"//vendor/k8s.io/apiserver/pkg/util/flag:go_default_library", "//vendor/k8s.io/apiserver/pkg/util/flag:go_default_library",
"//vendor/k8s.io/client-go/rest:go_default_library",
], ],
) )
......
cmd/kube-apiserver/app/options/options_test.go
View file @ 41aeccd0
...@@ -28,13 +28,13 @@ import ( ...@@ -28,13 +28,13 @@ import (
apiserveroptions "k8s.io/apiserver/pkg/server/options" apiserveroptions "k8s.io/apiserver/pkg/server/options"
"k8s.io/apiserver/pkg/storage/storagebackend" "k8s.io/apiserver/pkg/storage/storagebackend"
utilconfig "k8s.io/apiserver/pkg/util/flag" utilconfig "k8s.io/apiserver/pkg/util/flag"
restclient "k8s.io/client-go/rest"
kapi "k8s.io/kubernetes/pkg/api" kapi "k8s.io/kubernetes/pkg/api"
kubeoptions "k8s.io/kubernetes/pkg/kubeapiserver/options" kubeoptions "k8s.io/kubernetes/pkg/kubeapiserver/options"
kubeletclient "k8s.io/kubernetes/pkg/kubelet/client" kubeletclient "k8s.io/kubernetes/pkg/kubelet/client"
) )
func TestAddFlagsFlag(t *testing.T) { func TestAddFlags(t *testing.T) {
// TODO: Expand the test to include other flags as well.
f := pflag.NewFlagSet("addflagstest", pflag.ContinueOnError) f := pflag.NewFlagSet("addflagstest", pflag.ContinueOnError)
s := NewServerRunOptions() s := NewServerRunOptions()
s.AddFlags(f) s.AddFlags(f)
...@@ -65,9 +65,23 @@ func TestAddFlagsFlag(t *testing.T) { ...@@ -65,9 +65,23 @@ func TestAddFlagsFlag(t *testing.T) {
"--cloud-config=/cloud-config", "--cloud-config=/cloud-config",
"--cloud-provider=azure", "--cloud-provider=azure",
"--cors-allowed-origins=10.10.10.100,10.10.10.200", "--cors-allowed-origins=10.10.10.100,10.10.10.200",
"--contention-profiling=true",
"--enable-aggregator-routing=true", "--enable-aggregator-routing=true",
"--enable-logs-handler=false", "--enable-logs-handler=false",
"--enable-swagger-ui=true", "--enable-swagger-ui=true",
"--etcd-quorum-read=false",
"--etcd-keyfile=/var/run/kubernetes/etcd.key",
"--etcd-certfile=/var/run/kubernetes/etcdce.crt",
"--etcd-cafile=/var/run/kubernetes/etcdca.crt",
"--kubelet-https=true",
"--kubelet-read-only-port=10255",
"--kubelet-timeout=5s",
"--kubelet-client-certificate=/var/run/kubernetes/ceserver.crt",
"--kubelet-client-key=/var/run/kubernetes/server.key",
"--kubelet-certificate-authority=/var/run/kubernetes/caserver.crt",
"--proxy-client-cert-file=/var/run/kubernetes/proxy.crt",
"--proxy-client-key-file=/var/run/kubernetes/proxy.key",
"--storage-backend=etcd2",
} }
f.Parse(args) f.Parse(args)
...@@ -90,10 +104,15 @@ func TestAddFlagsFlag(t *testing.T) { ...@@ -90,10 +104,15 @@ func TestAddFlagsFlag(t *testing.T) {
}, },
Etcd: &apiserveroptions.EtcdOptions{ Etcd: &apiserveroptions.EtcdOptions{
StorageConfig: storagebackend.Config{ StorageConfig: storagebackend.Config{
Type: "etcd2",
ServerList: nil, ServerList: nil,
Prefix: "/registry", Prefix: "/registry",
DeserializationCacheSize: 0, DeserializationCacheSize: 0,
Copier: kapi.Scheme, Copier: kapi.Scheme,
Quorum: false,
KeyFile: "/var/run/kubernetes/etcd.key",
CAFile: "/var/run/kubernetes/etcdca.crt",
CertFile: "/var/run/kubernetes/etcdce.crt",
}, },
DefaultStorageMediaType: "application/vnd.kubernetes.protobuf", DefaultStorageMediaType: "application/vnd.kubernetes.protobuf",
DeleteCollectionWorkers: 1, DeleteCollectionWorkers: 1,
...@@ -126,6 +145,11 @@ func TestAddFlagsFlag(t *testing.T) { ...@@ -126,6 +145,11 @@ func TestAddFlagsFlag(t *testing.T) {
}, },
EnableHttps: true, EnableHttps: true,
HTTPTimeout: time.Duration(5) * time.Second, HTTPTimeout: time.Duration(5) * time.Second,
TLSClientConfig: restclient.TLSClientConfig{
CertFile: "/var/run/kubernetes/ceserver.crt",
KeyFile: "/var/run/kubernetes/server.key",
CAFile: "/var/run/kubernetes/caserver.crt",
},
}, },
Audit: &apiserveroptions.AuditOptions{ Audit: &apiserveroptions.AuditOptions{
LogOptions: apiserveroptions.AuditLogOptions{ LogOptions: apiserveroptions.AuditLogOptions{
...@@ -142,8 +166,9 @@ func TestAddFlagsFlag(t *testing.T) { ...@@ -142,8 +166,9 @@ func TestAddFlagsFlag(t *testing.T) {
PolicyFile: "/policy", PolicyFile: "/policy",
}, },
Features: &apiserveroptions.FeatureOptions{ Features: &apiserveroptions.FeatureOptions{
EnableSwaggerUI: true, EnableSwaggerUI: true,
EnableProfiling: true, EnableProfiling: true,
EnableContentionProfiling: true,
}, },
Authentication: &kubeoptions.BuiltInAuthenticationOptions{ Authentication: &kubeoptions.BuiltInAuthenticationOptions{
Anonymous: &kubeoptions.AnonymousAuthenticationOptions{ Anonymous: &kubeoptions.AnonymousAuthenticationOptions{
...@@ -190,6 +215,8 @@ func TestAddFlagsFlag(t *testing.T) { ...@@ -190,6 +215,8 @@ func TestAddFlagsFlag(t *testing.T) {
}, },
EnableLogsHandler: false, EnableLogsHandler: false,
EnableAggregatorRouting: true, EnableAggregatorRouting: true,
ProxyClientKeyFile: "/var/run/kubernetes/proxy.key",
ProxyClientCertFile: "/var/run/kubernetes/proxy.crt",
} }
if !reflect.DeepEqual(expected, s) { if !reflect.DeepEqual(expected, s) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment