github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

fix rebase

Browse Source
This commit is contained in:
Chao Xu 2015-10-12 13:48:14 -07:00
parent 94d68296be
commit 7817c2312c
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/apiserver/apiserver.go
View File

@ -46,6 +46,7 @@ import (
"k8s.io/kubernetes/pkg/util/wsstream" "k8s.io/kubernetes/pkg/util/wsstream"
"k8s.io/kubernetes/pkg/version" "k8s.io/kubernetes/pkg/version"
"github.com/emicklei/go-restful"
"github.com/golang/glog" "github.com/golang/glog"
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
) )

7
pkg/client/unversioned/helper.go
View File

@ -34,6 +34,7 @@ import (
"github.com/golang/glog" "github.com/golang/glog"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/latest" "k8s.io/kubernetes/pkg/api/latest"
"k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/util/sets" "k8s.io/kubernetes/pkg/util/sets"
@ -179,7 +180,7 @@ func MatchesServerVersion(client *Client, c *Config) error {
return nil return nil
} }
func extractGroupVersions(l *api.APIGroupList) []string { func extractGroupVersions(l *unversioned.APIGroupList) []string {
var groupVersions []string var groupVersions []string
for _, g := range l.Groups { for _, g := range l.Groups {
for _, gv := range g.Versions { for _, gv := range g.Versions {
@ -213,7 +214,7 @@ func ServerAPIVersions(c *Config) (groupVersions []string, err error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
var v api.APIVersions var v unversioned.APIVersions
defer resp.Body.Close() defer resp.Body.Close()
err = json.NewDecoder(resp.Body).Decode(&v) err = json.NewDecoder(resp.Body).Decode(&v)
if err != nil { if err != nil {
@ -227,7 +228,7 @@ func ServerAPIVersions(c *Config) (groupVersions []string, err error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
var apiGroupList api.APIGroupList var apiGroupList unversioned.APIGroupList
defer resp2.Body.Close() defer resp2.Body.Close()
err = json.NewDecoder(resp2.Body).Decode(&apiGroupList) err = json.NewDecoder(resp2.Body).Decode(&apiGroupList)
if err != nil { if err != nil {

12
pkg/client/unversioned/helper_test.go
View File

@ -24,8 +24,8 @@ import (
"strings" "strings"
"testing" "testing"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/testapi"
"k8s.io/kubernetes/pkg/api/unversioned"
) )
const ( const (
@ -380,12 +380,12 @@ func TestSetKubernetesDefaultsUserAgent(t *testing.T) {
func TestHelperGetServerAPIVersions(t *testing.T) { func TestHelperGetServerAPIVersions(t *testing.T) {
expect := []string{"v1", "v2", "v3"} expect := []string{"v1", "v2", "v3"}
APIVersions := api.APIVersions{Versions: expect} APIVersions := unversioned.APIVersions{Versions: expect}
expect = append(expect, "group1/v1", "group1/v2", "group2/v1", "group2/v2") expect = append(expect, "group1/v1", "group1/v2", "group2/v1", "group2/v2")
APIGroupList := api.APIGroupList{ APIGroupList := unversioned.APIGroupList{
Groups: []api.APIGroup{ Groups: []unversioned.APIGroup{
{ {
Versions: []api.GroupVersion{ Versions: []unversioned.GroupVersion{
{ {
GroupVersion: "group1/v1", GroupVersion: "group1/v1",
}, },
@ -395,7 +395,7 @@ func TestHelperGetServerAPIVersions(t *testing.T) {
}, },
}, },
{ {
Versions: []api.GroupVersion{ Versions: []unversioned.GroupVersion{
{ {
GroupVersion: "group2/v1", GroupVersion: "group2/v1",
}, },

1
pkg/master/master_test.go
View File

@ -54,6 +54,7 @@ import (
"k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util"
"github.com/coreos/go-etcd/etcd" "github.com/coreos/go-etcd/etcd"
"github.com/emicklei/go-restful"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )