scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 11:48:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Drop NewDefultGroupVersionFramework in favor of client automatically handling proper GroupVersions

Browse Source
This commit is contained in:
Maciej Szulik
2017-02-27 18:21:23 +01:00
parent 7cba9d9c92
commit 6c0cd24865
3 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/e2e/cronjob.go
View File

@@ -46,11 +46,10 @@ const (
var ( var (
CronJobGroupVersionResource = schema.GroupVersionResource{Group: batchv2alpha1.GroupName, Version: "v2alpha1", Resource: "cronjobs"} CronJobGroupVersionResource = schema.GroupVersionResource{Group: batchv2alpha1.GroupName, Version: "v2alpha1", Resource: "cronjobs"}
ScheduledJobGroupVersionResource = schema.GroupVersionResource{Group: batchv2alpha1.GroupName, Version: "v2alpha1", Resource: "scheduledjobs"} ScheduledJobGroupVersionResource = schema.GroupVersionResource{Group: batchv2alpha1.GroupName, Version: "v2alpha1", Resource: "scheduledjobs"}
BatchV2Alpha1GroupVersion = schema.GroupVersion{Group: batchv2alpha1.GroupName, Version: "v2alpha1"}
) )
var _ = framework.KubeDescribe("CronJob", func() { var _ = framework.KubeDescribe("CronJob", func() {
f := framework.NewDefaultGroupVersionFramework("cronjob", BatchV2Alpha1GroupVersion) f := framework.NewDefaultFramework("cronjob")
sleepCommand := []string{"sleep", "300"} sleepCommand := []string{"sleep", "300"}

6
test/e2e/framework/framework.go
View File

@@ -108,12 +108,6 @@ func NewDefaultFramework(baseName string) *Framework {
return NewFramework(baseName, options, nil) return NewFramework(baseName, options, nil)
} }
func NewDefaultGroupVersionFramework(baseName string, groupVersion schema.GroupVersion) *Framework {
f := NewDefaultFramework(baseName)
f.Options.GroupVersion = &groupVersion
return f
}
func NewFramework(baseName string, options FrameworkOptions, client clientset.Interface) *Framework { func NewFramework(baseName string, options FrameworkOptions, client clientset.Interface) *Framework {
f := &Framework{ f := &Framework{
BaseName: baseName, BaseName: baseName,

2
test/e2e/kubectl.go
View File

@@ -178,7 +178,7 @@ func runKubectlRetryOrDie(args ...string) string {
// duplicated setup to avoid polluting "normal" clients with alpha features which confuses the generated clients // duplicated setup to avoid polluting "normal" clients with alpha features which confuses the generated clients
var _ = framework.KubeDescribe("Kubectl alpha client", func() { var _ = framework.KubeDescribe("Kubectl alpha client", func() {
defer GinkgoRecover() defer GinkgoRecover()
f := framework.NewDefaultGroupVersionFramework("kubectl", BatchV2Alpha1GroupVersion) f := framework.NewDefaultFramework("kubectl")
var c clientset.Interface var c clientset.Interface
var ns string var ns string