kubernetes
/
examples
mirror of https://github.com/kubernetes/examples.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Client-gen: handle dotted package name

This commit is contained in:
Chao Xu 2016-04-08 10:39:21 -07:00
parent d9470bd08a
commit ee39f26808
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apiserver/apiserver.go
View File

@ -19,7 +19,7 @@ package apiserver
import ( import (
"fmt" "fmt"
"k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testdata/apis/testgroup/v1" "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testdata/apis/testgroup.k8s.io/v1"
testgroupetcd "k8s.io/kubernetes/examples/apiserver/rest" testgroupetcd "k8s.io/kubernetes/examples/apiserver/rest"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/api/rest"
@ -29,7 +29,7 @@ import (
etcdstorage "k8s.io/kubernetes/pkg/storage/etcd" etcdstorage "k8s.io/kubernetes/pkg/storage/etcd"
// Install the testgroup API // Install the testgroup API
_ "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testdata/apis/testgroup/install" _ "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testdata/apis/testgroup.k8s.io/install"
) )
const ( const (

6
apiserver/apiserver_test.go
View File

@ -24,7 +24,7 @@ import (
"testing" "testing"
"time" "time"
"k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testdata/apis/testgroup/v1" "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testdata/apis/testgroup.k8s.io/v1"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/unversioned"
@ -107,7 +107,7 @@ func testAPIGroupList(t *testing.T) {
} }
func testAPIGroup(t *testing.T) { func testAPIGroup(t *testing.T) {
serverURL := serverIP + "/apis/testgroup" serverURL := serverIP + "/apis/testgroup.k8s.io"
contents, err := readResponse(serverURL) contents, err := readResponse(serverURL)
if err != nil { if err != nil {
t.Fatalf("%v", err) t.Fatalf("%v", err)
@ -126,7 +126,7 @@ func testAPIGroup(t *testing.T) {
} }
func testAPIResourceList(t *testing.T) { func testAPIResourceList(t *testing.T) {
serverURL := serverIP + "/apis/testgroup/v1" serverURL := serverIP + "/apis/testgroup.k8s.io/v1"
contents, err := readResponse(serverURL) contents, err := readResponse(serverURL)
if err != nil { if err != nil {
t.Fatalf("%v", err) t.Fatalf("%v", err)

2
apiserver/rest/reststorage.go
View File

@ -17,7 +17,7 @@ limitations under the License.
package rest package rest
import ( import (
"k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testdata/apis/testgroup" "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testdata/apis/testgroup.k8s.io"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/fields"
"k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/labels"