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
1b5f3829
Unverified
Commit
1b5f3829
authored
Feb 28, 2018
by
Maciej Szulik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add integration test for server side printing
parent
5630d295
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
298 additions
and
1 deletion
+298
-1
BUILD
test/integration/apiserver/BUILD
+16
-0
apiserver_test.go
test/integration/apiserver/apiserver_test.go
+8
-1
print_test.go
test/integration/apiserver/print_test.go
+274
-0
No files found.
test/integration/apiserver/BUILD
View file @
1b5f3829
...
...
@@ -12,30 +12,46 @@ go_test(
"apiserver_test.go",
"main_test.go",
"patch_test.go",
"print_test.go",
],
tags = [
"etcd",
"integration",
],
deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/api/testapi:go_default_library",
"//pkg/apis/core:go_default_library",
"//pkg/kubectl/cmd/util:go_default_library",
"//pkg/master:go_default_library",
"//pkg/printers:go_default_library",
"//pkg/printers/internalversion:go_default_library",
"//test/integration/framework:go_default_library",
"//vendor/github.com/golang/glog:go_default_library",
"//vendor/github.com/pborman/uuid:go_default_library",
"//vendor/k8s.io/api/batch/v2alpha1:go_default_library",
"//vendor/k8s.io/api/core/v1:go_default_library",
"//vendor/k8s.io/api/extensions/v1beta1:go_default_library",
"//vendor/k8s.io/api/rbac/v1alpha1:go_default_library",
"//vendor/k8s.io/api/scheduling/v1alpha1:go_default_library",
"//vendor/k8s.io/api/settings/v1alpha1:go_default_library",
"//vendor/k8s.io/api/storage/v1alpha1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/meta:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1beta1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
"//vendor/k8s.io/apiserver/pkg/endpoints/handlers:go_default_library",
"//vendor/k8s.io/apiserver/pkg/features:go_default_library",
"//vendor/k8s.io/apiserver/pkg/util/feature:go_default_library",
"//vendor/k8s.io/client-go/kubernetes:go_default_library",
"//vendor/k8s.io/client-go/rest:go_default_library",
"//vendor/k8s.io/client-go/tools/clientcmd:go_default_library",
"//vendor/k8s.io/client-go/tools/clientcmd/api:go_default_library",
"//vendor/k8s.io/client-go/tools/pager:go_default_library",
"//vendor/k8s.io/gengo/examples/set-gen/sets:go_default_library",
],
)
...
...
test/integration/apiserver/apiserver_test.go
View file @
1b5f3829
...
...
@@ -32,6 +32,7 @@ import (
"k8s.io/apimachinery/pkg/api/meta"
metav1
"k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
genericfeatures
"k8s.io/apiserver/pkg/features"
utilfeature
"k8s.io/apiserver/pkg/util/feature"
clientset
"k8s.io/client-go/kubernetes"
...
...
@@ -39,12 +40,18 @@ import (
"k8s.io/client-go/tools/pager"
"k8s.io/kubernetes/pkg/api/testapi"
api
"k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/master"
"k8s.io/kubernetes/test/integration/framework"
)
func
setup
(
t
*
testing
.
T
)
(
*
httptest
.
Server
,
clientset
.
Interface
,
framework
.
CloseFunc
)
{
func
setup
(
t
*
testing
.
T
,
groupVersions
...
schema
.
GroupVersion
)
(
*
httptest
.
Server
,
clientset
.
Interface
,
framework
.
CloseFunc
)
{
masterConfig
:=
framework
.
NewIntegrationTestMasterConfig
()
masterConfig
.
ExtraConfig
.
EnableCoreControllers
=
false
if
len
(
groupVersions
)
>
0
{
resourceConfig
:=
master
.
DefaultAPIResourceConfigSource
()
resourceConfig
.
EnableVersions
(
groupVersions
...
)
masterConfig
.
ExtraConfig
.
APIResourceConfigSource
=
resourceConfig
}
_
,
s
,
closeFn
:=
framework
.
RunAMaster
(
masterConfig
)
clientSet
,
err
:=
clientset
.
NewForConfig
(
&
restclient
.
Config
{
Host
:
s
.
URL
})
...
...
test/integration/apiserver/print_test.go
0 → 100644
View file @
1b5f3829
/*
Copyright 2018 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
apiserver
import
(
"encoding/json"
"fmt"
"reflect"
"strings"
"testing"
batchv2alpha1
"k8s.io/api/batch/v2alpha1"
rbacv1alpha1
"k8s.io/api/rbac/v1alpha1"
schedulingv1alpha1
"k8s.io/api/scheduling/v1alpha1"
settingsv1alpha1
"k8s.io/api/settings/v1alpha1"
storagev1alpha1
"k8s.io/api/storage/v1alpha1"
"k8s.io/apimachinery/pkg/api/meta"
metav1beta1
"k8s.io/apimachinery/pkg/apis/meta/v1beta1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/client-go/tools/clientcmd"
clientcmdapi
"k8s.io/client-go/tools/clientcmd/api"
"k8s.io/gengo/examples/set-gen/sets"
"k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/printers"
printersinternal
"k8s.io/kubernetes/pkg/printers/internalversion"
"k8s.io/kubernetes/test/integration/framework"
)
var
kindWhiteList
=
sets
.
NewString
(
// k8s.io/api/core
"APIGroup"
,
"APIVersions"
,
"Binding"
,
"DeleteOptions"
,
"ExportOptions"
,
"GetOptions"
,
"ListOptions"
,
"NodeConfigSource"
,
"NodeProxyOptions"
,
"PodAttachOptions"
,
"PodExecOptions"
,
"PodPortForwardOptions"
,
"PodLogOptions"
,
"PodProxyOptions"
,
"PodStatusResult"
,
"RangeAllocation"
,
"ServiceProxyOptions"
,
"SerializedReference"
,
// --
// k8s.io/api/admission
"AdmissionReview"
,
// --
// k8s.io/api/admissionregistration
"InitializerConfiguration"
,
// --
// k8s.io/api/authentication
"TokenRequest"
,
"TokenReview"
,
// --
// k8s.io/api/authorization
"LocalSubjectAccessReview"
,
"SelfSubjectAccessReview"
,
"SelfSubjectRulesReview"
,
"SubjectAccessReview"
,
// --
// k8s.io/api/autoscaling
"Scale"
,
// --
// k8s.io/api/apps
"DeploymentRollback"
,
// --
// k8s.io/api/batch
"JobTemplate"
,
// --
// k8s.io/api/extensions
"ReplicationControllerDummy"
,
// --
// k8s.io/api/imagepolicy
"ImageReview"
,
// --
// k8s.io/api/policy
"Eviction"
,
// --
// k8s.io/kubernetes/pkg/apis/componentconfig
"KubeSchedulerConfiguration"
,
// --
// k8s.io/apimachinery/pkg/apis/meta
"WatchEvent"
,
"Status"
,
// --
)
// TODO (soltysh): this list has to go down to 0!
var
missingHanlders
=
sets
.
NewString
(
"ClusterRole"
,
"LimitRange"
,
"MutatingWebhookConfiguration"
,
"ResourceQuota"
,
"Role"
,
"ValidatingWebhookConfiguration"
,
"VolumeAttachment"
,
"PriorityClass"
,
"PodPreset"
,
)
func
TestServerSidePrint
(
t
*
testing
.
T
)
{
s
,
_
,
closeFn
:=
setup
(
t
,
// additional groupversions needed for the test to run
batchv2alpha1
.
SchemeGroupVersion
,
rbacv1alpha1
.
SchemeGroupVersion
,
settingsv1alpha1
.
SchemeGroupVersion
,
schedulingv1alpha1
.
SchemeGroupVersion
,
storagev1alpha1
.
SchemeGroupVersion
)
defer
closeFn
()
ns
:=
framework
.
CreateTestingNamespace
(
"server-print"
,
s
,
t
)
defer
framework
.
DeleteTestingNamespace
(
ns
,
s
,
t
)
tableParam
:=
fmt
.
Sprintf
(
"application/json;as=Table;g=%s;v=%s, application/json"
,
metav1beta1
.
GroupName
,
metav1beta1
.
SchemeGroupVersion
.
Version
)
printer
:=
newFakePrinter
(
printersinternal
.
AddHandlers
)
factory
:=
util
.
NewFactory
(
clientcmd
.
NewDefaultClientConfig
(
*
createKubeConfig
(
s
.
URL
),
&
clientcmd
.
ConfigOverrides
{}))
mapper
,
_
:=
factory
.
Object
()
for
gvk
,
apiType
:=
range
legacyscheme
.
Scheme
.
AllKnownTypes
()
{
// we do not care about internal objects or lists // TODO make sure this is always true
if
gvk
.
Version
==
runtime
.
APIVersionInternal
||
strings
.
HasSuffix
(
apiType
.
Name
(),
"List"
)
{
continue
}
if
kindWhiteList
.
Has
(
gvk
.
Kind
)
||
missingHanlders
.
Has
(
gvk
.
Kind
)
{
continue
}
t
.
Logf
(
"Checking %s"
,
gvk
)
// read table definition as returned by the server
mapping
,
err
:=
mapper
.
RESTMapping
(
gvk
.
GroupKind
(),
gvk
.
Version
)
if
err
!=
nil
{
t
.
Errorf
(
"unexpected error getting mapping for GVK %s: %v"
,
gvk
,
err
)
continue
}
client
,
err
:=
factory
.
ClientForMapping
(
mapping
)
if
err
!=
nil
{
t
.
Errorf
(
"unexpected error getting client for GVK %s: %v"
,
gvk
,
err
)
continue
}
req
:=
client
.
Get
()
if
mapping
.
Scope
.
Name
()
==
meta
.
RESTScopeNameNamespace
{
req
=
req
.
Namespace
(
ns
.
Name
)
}
body
,
err
:=
req
.
Resource
(
mapping
.
Resource
)
.
SetHeader
(
"Accept"
,
tableParam
)
.
Do
()
.
Raw
()
if
err
!=
nil
{
t
.
Errorf
(
"unexpected error getting %s: %v"
,
gvk
,
err
)
continue
}
actual
,
err
:=
decodeIntoTable
(
body
)
if
err
!=
nil
{
t
.
Errorf
(
"unexpected error decoding %s: %v"
,
gvk
,
err
)
continue
}
// get table definition used in printers
obj
,
err
:=
legacyscheme
.
Scheme
.
New
(
gvk
)
if
err
!=
nil
{
t
.
Errorf
(
"unexpected error creating %s: %v"
,
gvk
,
err
)
continue
}
intGV
:=
gvk
.
GroupKind
()
.
WithVersion
(
runtime
.
APIVersionInternal
)
.
GroupVersion
()
intObj
,
err
:=
mapping
.
ConvertToVersion
(
obj
,
intGV
)
if
err
!=
nil
{
t
.
Errorf
(
"unexpected error converting %s to internal: %v"
,
gvk
,
err
)
continue
}
expectedColumnDefinitions
,
ok
:=
printer
.
handlers
[
reflect
.
TypeOf
(
intObj
)]
if
!
ok
{
t
.
Errorf
(
"missing handler for type %v"
,
gvk
)
continue
}
for
_
,
e
:=
range
expectedColumnDefinitions
{
for
_
,
a
:=
range
actual
.
ColumnDefinitions
{
if
a
.
Name
==
e
.
Name
&&
!
reflect
.
DeepEqual
(
a
,
e
)
{
t
.
Errorf
(
"unexpected difference in column definition %s for %s:
\n
expected:
\n
%#v
\n
actual:
\n
%#v
\n
"
,
e
.
Name
,
gvk
,
e
,
a
)
}
}
}
}
}
type
fakePrinter
struct
{
handlers
map
[
reflect
.
Type
][]
metav1beta1
.
TableColumnDefinition
}
var
_
printers
.
PrintHandler
=
&
fakePrinter
{}
func
(
f
*
fakePrinter
)
Handler
(
columns
,
columnsWithWide
[]
string
,
printFunc
interface
{})
error
{
return
nil
}
func
(
f
*
fakePrinter
)
TableHandler
(
columns
[]
metav1beta1
.
TableColumnDefinition
,
printFunc
interface
{})
error
{
printFuncValue
:=
reflect
.
ValueOf
(
printFunc
)
objType
:=
printFuncValue
.
Type
()
.
In
(
0
)
f
.
handlers
[
objType
]
=
columns
return
nil
}
func
(
f
*
fakePrinter
)
DefaultTableHandler
(
columns
[]
metav1beta1
.
TableColumnDefinition
,
printFunc
interface
{})
error
{
return
nil
}
func
newFakePrinter
(
fns
...
func
(
printers
.
PrintHandler
))
*
fakePrinter
{
handlers
:=
make
(
map
[
reflect
.
Type
][]
metav1beta1
.
TableColumnDefinition
,
len
(
fns
))
p
:=
&
fakePrinter
{
handlers
:
handlers
}
for
_
,
fn
:=
range
fns
{
fn
(
p
)
}
return
p
}
func
decodeIntoTable
(
body
[]
byte
)
(
*
metav1beta1
.
Table
,
error
)
{
table
:=
&
metav1beta1
.
Table
{}
err
:=
json
.
Unmarshal
(
body
,
table
)
if
err
!=
nil
{
return
nil
,
err
}
return
table
,
nil
}
func
createKubeConfig
(
url
string
)
*
clientcmdapi
.
Config
{
clusterNick
:=
"cluster"
userNick
:=
"user"
contextNick
:=
"context"
config
:=
clientcmdapi
.
NewConfig
()
cluster
:=
clientcmdapi
.
NewCluster
()
cluster
.
Server
=
url
cluster
.
InsecureSkipTLSVerify
=
true
config
.
Clusters
[
clusterNick
]
=
cluster
context
:=
clientcmdapi
.
NewContext
()
context
.
Cluster
=
clusterNick
context
.
AuthInfo
=
userNick
config
.
Contexts
[
contextNick
]
=
context
config
.
CurrentContext
=
contextNick
return
config
}
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