github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use "kubeproxy.config.k8s.io" as final group name.

pull/6/head
xiangpengzhao 2017-10-31 14:59:48 +08:00
parent ff36eefd17
commit 291647e6d9
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/kube-proxy/app/server_test.go
View File

@ -223,7 +223,7 @@ func TestGetConntrackMax(t *testing.T) {
// TestLoadConfig tests proper operation of loadConfig() // TestLoadConfig tests proper operation of loadConfig()
func TestLoadConfig(t *testing.T) { func TestLoadConfig(t *testing.T) {
yamlTemplate := `apiVersion: kubeproxyconfig.k8s.io/v1alpha1 yamlTemplate := `apiVersion: kubeproxy.config.k8s.io/v1alpha1
bindAddress: %s bindAddress: %s
clientConnection: clientConnection:
acceptContentTypes: "abc" acceptContentTypes: "abc"
@ -407,7 +407,7 @@ func TestLoadConfigFailures(t *testing.T) {
expErr: "mapping values are not allowed in this context", expErr: "mapping values are not allowed in this context",
}, },
} }
version := "apiVersion: kubeproxyconfig.k8s.io/v1alpha1" version := "apiVersion: kubeproxy.config.k8s.io/v1alpha1"
for _, tc := range testCases { for _, tc := range testCases {
options := NewOptions() options := NewOptions()
config := fmt.Sprintf("%s\n%s", version, tc.config) config := fmt.Sprintf("%s\n%s", version, tc.config)

2
pkg/proxy/apis/kubeproxyconfig/register.go
View File

@ -27,7 +27,7 @@ var (
) )
// GroupName is the group name use in this package // GroupName is the group name use in this package
const GroupName = "kubeproxyconfig.k8s.io" const GroupName = "kubeproxy.config.k8s.io"
// SchemeGroupVersion is group version used to register these objects // SchemeGroupVersion is group version used to register these objects
var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: runtime.APIVersionInternal} var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: runtime.APIVersionInternal}

2
pkg/proxy/apis/kubeproxyconfig/v1alpha1/register.go
View File

@ -22,7 +22,7 @@ import (
) )
// GroupName is the group name use in this package // GroupName is the group name use in this package
const GroupName = "kubeproxyconfig.k8s.io" const GroupName = "kubeproxy.config.k8s.io"
// SchemeGroupVersion is group version used to register these objects // SchemeGroupVersion is group version used to register these objects
var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha1"} var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha1"}