github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #69335 from seans3/set-tests-fix

Browse Source 
kubectl set tests: remove testapi core dependency
This commit is contained in:
k8s-ci-robot
2018-10-04 13:40:10 -07:00
committed by GitHub
parent 409871ecae 69c0fb74df
commit f7df7f8a25
5 changed files with 397 additions and 406 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/kubectl/cmd/set/BUILD
View File

@@ -63,7 +63,6 @@ go_test(
], ],
embed = [":go_default_library"], embed = [":go_default_library"],
deps = [ deps = [
"//pkg/api/testapi:go_default_library",
"//pkg/kubectl/cmd/testing:go_default_library", "//pkg/kubectl/cmd/testing:go_default_library",
"//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/cmd/util:go_default_library",
"//pkg/kubectl/scheme:go_default_library", "//pkg/kubectl/scheme:go_default_library",

225
pkg/kubectl/cmd/set/set_env_test.go
View File

@@ -20,7 +20,6 @@ import (
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"net/http" "net/http"
"path"
"strings" "strings"
"testing" "testing"
@@ -29,7 +28,7 @@ import (
appsv1beta1 "k8s.io/api/apps/v1beta1" appsv1beta1 "k8s.io/api/apps/v1beta1"
appsv1beta2 "k8s.io/api/apps/v1beta2" appsv1beta2 "k8s.io/api/apps/v1beta2"
batchv1 "k8s.io/api/batch/v1" batchv1 "k8s.io/api/batch/v1"
"k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
extensionsv1beta1 "k8s.io/api/extensions/v1beta1" extensionsv1beta1 "k8s.io/api/extensions/v1beta1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
@@ -39,7 +38,6 @@ import (
"k8s.io/cli-runtime/pkg/genericclioptions/resource" "k8s.io/cli-runtime/pkg/genericclioptions/resource"
restclient "k8s.io/client-go/rest" restclient "k8s.io/client-go/rest"
"k8s.io/client-go/rest/fake" "k8s.io/client-go/rest/fake"
"k8s.io/kubernetes/pkg/api/testapi"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing"
"k8s.io/kubernetes/pkg/kubectl/scheme" "k8s.io/kubernetes/pkg/kubectl/scheme"
) )
@@ -121,20 +119,20 @@ func TestSetMultiResourcesEnvLocal(t *testing.T) {
func TestSetEnvRemote(t *testing.T) { func TestSetEnvRemote(t *testing.T) {
inputs := []struct { inputs := []struct {
name string name string
object runtime.Object object runtime.Object
apiPrefix, apiGroup, apiVersion string groupVersion schema.GroupVersion
testAPIGroup string path string
args []string args []string
}{ }{
{ {
name: "test extensions.v1beta1 replicaset", name: "test extensions.v1beta1 replicaset",
object: &extensionsv1beta1.ReplicaSet{ object: &extensionsv1beta1.ReplicaSet{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
Spec: extensionsv1beta1.ReplicaSetSpec{ Spec: extensionsv1beta1.ReplicaSetSpec{
Template: v1.PodTemplateSpec{ Template: corev1.PodTemplateSpec{
Spec: v1.PodSpec{ Spec: corev1.PodSpec{
Containers: []v1.Container{ Containers: []corev1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: "nginx", Image: "nginx",
@@ -144,18 +142,18 @@ func TestSetEnvRemote(t *testing.T) {
}, },
}, },
}, },
testAPIGroup: "extensions", groupVersion: extensionsv1beta1.SchemeGroupVersion,
apiPrefix: "/apis", apiGroup: "extensions", apiVersion: "v1beta1", path: "/namespaces/test/replicasets/nginx",
args: []string{"replicaset", "nginx", "env=prod"}, args: []string{"replicaset", "nginx", "env=prod"},
}, },
{ {
name: "test apps.v1beta2 replicaset", name: "test apps.v1beta2 replicaset",
object: &appsv1beta2.ReplicaSet{ object: &appsv1beta2.ReplicaSet{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
Spec: appsv1beta2.ReplicaSetSpec{ Spec: appsv1beta2.ReplicaSetSpec{
Template: v1.PodTemplateSpec{ Template: corev1.PodTemplateSpec{
Spec: v1.PodSpec{ Spec: corev1.PodSpec{
Containers: []v1.Container{ Containers: []corev1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: "nginx", Image: "nginx",
@@ -165,18 +163,18 @@ func TestSetEnvRemote(t *testing.T) {
}, },
}, },
}, },
testAPIGroup: "extensions", groupVersion: appsv1beta2.SchemeGroupVersion,
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1beta2", path: "/namespaces/test/replicasets/nginx",
args: []string{"replicaset", "nginx", "env=prod"}, args: []string{"replicaset", "nginx", "env=prod"},
}, },
{ {
name: "test appsv1 replicaset", name: "test appsv1 replicaset",
object: &appsv1.ReplicaSet{ object: &appsv1.ReplicaSet{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
Spec: appsv1.ReplicaSetSpec{ Spec: appsv1.ReplicaSetSpec{
Template: v1.PodTemplateSpec{ Template: corev1.PodTemplateSpec{
Spec: v1.PodSpec{ Spec: corev1.PodSpec{
Containers: []v1.Container{ Containers: []corev1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: "nginx", Image: "nginx",
@@ -186,18 +184,18 @@ func TestSetEnvRemote(t *testing.T) {
}, },
}, },
}, },
testAPIGroup: "extensions", groupVersion: appsv1.SchemeGroupVersion,
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1", path: "/namespaces/test/replicasets/nginx",
args: []string{"replicaset", "nginx", "env=prod"}, args: []string{"replicaset", "nginx", "env=prod"},
}, },
{ {
name: "test extensions.v1beta1 daemonset", name: "test extensions.v1beta1 daemonset",
object: &extensionsv1beta1.DaemonSet{ object: &extensionsv1beta1.DaemonSet{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
Spec: extensionsv1beta1.DaemonSetSpec{ Spec: extensionsv1beta1.DaemonSetSpec{
Template: v1.PodTemplateSpec{ Template: corev1.PodTemplateSpec{
Spec: v1.PodSpec{ Spec: corev1.PodSpec{
Containers: []v1.Container{ Containers: []corev1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: "nginx", Image: "nginx",
@@ -207,18 +205,18 @@ func TestSetEnvRemote(t *testing.T) {
}, },
}, },
}, },
testAPIGroup: "extensions", groupVersion: extensionsv1beta1.SchemeGroupVersion,
apiPrefix: "/apis", apiGroup: "extensions", apiVersion: "v1beta1", path: "/namespaces/test/daemonsets/nginx",
args: []string{"daemonset", "nginx", "env=prod"}, args: []string{"daemonset", "nginx", "env=prod"},
}, },
{ {
name: "test appsv1beta2 daemonset", name: "test appsv1beta2 daemonset",
object: &appsv1beta2.DaemonSet{ object: &appsv1beta2.DaemonSet{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
Spec: appsv1beta2.DaemonSetSpec{ Spec: appsv1beta2.DaemonSetSpec{
Template: v1.PodTemplateSpec{ Template: corev1.PodTemplateSpec{
Spec: v1.PodSpec{ Spec: corev1.PodSpec{
Containers: []v1.Container{ Containers: []corev1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: "nginx", Image: "nginx",
@@ -228,18 +226,18 @@ func TestSetEnvRemote(t *testing.T) {
}, },
}, },
}, },
testAPIGroup: "extensions", groupVersion: appsv1beta2.SchemeGroupVersion,
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1beta2", path: "/namespaces/test/daemonsets/nginx",
args: []string{"daemonset", "nginx", "env=prod"}, args: []string{"daemonset", "nginx", "env=prod"},
}, },
{ {
name: "test appsv1 daemonset", name: "test appsv1 daemonset",
object: &appsv1.DaemonSet{ object: &appsv1.DaemonSet{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
Spec: appsv1.DaemonSetSpec{ Spec: appsv1.DaemonSetSpec{
Template: v1.PodTemplateSpec{ Template: corev1.PodTemplateSpec{
Spec: v1.PodSpec{ Spec: corev1.PodSpec{
Containers: []v1.Container{ Containers: []corev1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: "nginx", Image: "nginx",
@@ -249,18 +247,18 @@ func TestSetEnvRemote(t *testing.T) {
}, },
}, },
}, },
testAPIGroup: "extensions", groupVersion: appsv1.SchemeGroupVersion,
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1", path: "/namespaces/test/daemonsets/nginx",
args: []string{"daemonset", "nginx", "env=prod"}, args: []string{"daemonset", "nginx", "env=prod"},
}, },
{ {
name: "test extensions.v1beta1 deployment", name: "test extensions.v1beta1 deployment",
object: &extensionsv1beta1.Deployment{ object: &extensionsv1beta1.Deployment{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
Spec: extensionsv1beta1.DeploymentSpec{ Spec: extensionsv1beta1.DeploymentSpec{
Template: v1.PodTemplateSpec{ Template: corev1.PodTemplateSpec{
Spec: v1.PodSpec{ Spec: corev1.PodSpec{
Containers: []v1.Container{ Containers: []corev1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: "nginx", Image: "nginx",
@@ -270,18 +268,18 @@ func TestSetEnvRemote(t *testing.T) {
}, },
}, },
}, },
testAPIGroup: "extensions", groupVersion: extensionsv1beta1.SchemeGroupVersion,
apiPrefix: "/apis", apiGroup: "extensions", apiVersion: "v1beta1", path: "/namespaces/test/deployments/nginx",
args: []string{"deployment", "nginx", "env=prod"}, args: []string{"deployment", "nginx", "env=prod"},
}, },
{ {
name: "test appsv1bta1 deployment", name: "test appsv1beta1 deployment",
object: &appsv1beta1.Deployment{ object: &appsv1beta1.Deployment{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
Spec: appsv1beta1.DeploymentSpec{ Spec: appsv1beta1.DeploymentSpec{
Template: v1.PodTemplateSpec{ Template: corev1.PodTemplateSpec{
Spec: v1.PodSpec{ Spec: corev1.PodSpec{
Containers: []v1.Container{ Containers: []corev1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: "nginx", Image: "nginx",
@@ -291,18 +289,18 @@ func TestSetEnvRemote(t *testing.T) {
}, },
}, },
}, },
testAPIGroup: "extensions", groupVersion: appsv1beta1.SchemeGroupVersion,
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1beta1", path: "/namespaces/test/deployments/nginx",
args: []string{"deployment", "nginx", "env=prod"}, args: []string{"deployment", "nginx", "env=prod"},
}, },
{ {
name: "test appsv1beta2n deployment", name: "test appsv1beta2 deployment",
object: &appsv1beta2.Deployment{ object: &appsv1beta2.Deployment{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
Spec: appsv1beta2.DeploymentSpec{ Spec: appsv1beta2.DeploymentSpec{
Template: v1.PodTemplateSpec{ Template: corev1.PodTemplateSpec{
Spec: v1.PodSpec{ Spec: corev1.PodSpec{
Containers: []v1.Container{ Containers: []corev1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: "nginx", Image: "nginx",
@@ -312,18 +310,18 @@ func TestSetEnvRemote(t *testing.T) {
}, },
}, },
}, },
testAPIGroup: "extensions", groupVersion: appsv1beta2.SchemeGroupVersion,
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1beta2", path: "/namespaces/test/deployments/nginx",
args: []string{"deployment", "nginx", "env=prod"}, args: []string{"deployment", "nginx", "env=prod"},
}, },
{ {
name: "test appsv1 deployment", name: "test appsv1 deployment",
object: &appsv1.Deployment{ object: &appsv1.Deployment{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
Spec: appsv1.DeploymentSpec{ Spec: appsv1.DeploymentSpec{
Template: v1.PodTemplateSpec{ Template: corev1.PodTemplateSpec{
Spec: v1.PodSpec{ Spec: corev1.PodSpec{
Containers: []v1.Container{ Containers: []corev1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: "nginx", Image: "nginx",
@@ -333,18 +331,18 @@ func TestSetEnvRemote(t *testing.T) {
}, },
}, },
}, },
testAPIGroup: "extensions", groupVersion: appsv1.SchemeGroupVersion,
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1", path: "/namespaces/test/deployments/nginx",
args: []string{"deployment", "nginx", "env=prod"}, args: []string{"deployment", "nginx", "env=prod"},
}, },
{ {
name: "test appsv1beta1 statefulset", name: "test appsv1beta1 statefulset",
object: &appsv1beta1.StatefulSet{ object: &appsv1beta1.StatefulSet{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
Spec: appsv1beta1.StatefulSetSpec{ Spec: appsv1beta1.StatefulSetSpec{
Template: v1.PodTemplateSpec{ Template: corev1.PodTemplateSpec{
Spec: v1.PodSpec{ Spec: corev1.PodSpec{
Containers: []v1.Container{ Containers: []corev1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: "nginx", Image: "nginx",
@@ -354,18 +352,18 @@ func TestSetEnvRemote(t *testing.T) {
}, },
}, },
}, },
testAPIGroup: "apps", groupVersion: appsv1beta1.SchemeGroupVersion,
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1beta1", path: "/namespaces/test/statefulsets/nginx",
args: []string{"statefulset", "nginx", "env=prod"}, args: []string{"statefulset", "nginx", "env=prod"},
}, },
{ {
name: "test appsv1beta2 statefulset", name: "test appsv1beta2 statefulset",
object: &appsv1beta2.StatefulSet{ object: &appsv1beta2.StatefulSet{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
Spec: appsv1beta2.StatefulSetSpec{ Spec: appsv1beta2.StatefulSetSpec{
Template: v1.PodTemplateSpec{ Template: corev1.PodTemplateSpec{
Spec: v1.PodSpec{ Spec: corev1.PodSpec{
Containers: []v1.Container{ Containers: []corev1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: "nginx", Image: "nginx",
@@ -375,18 +373,18 @@ func TestSetEnvRemote(t *testing.T) {
}, },
}, },
}, },
testAPIGroup: "apps", groupVersion: appsv1beta2.SchemeGroupVersion,
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1beta2", path: "/namespaces/test/statefulsets/nginx",
args: []string{"statefulset", "nginx", "env=prod"}, args: []string{"statefulset", "nginx", "env=prod"},
}, },
{ {
name: "test appsv1 statefulset", name: "test appsv1 statefulset",
object: &appsv1.StatefulSet{ object: &appsv1.StatefulSet{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
Spec: appsv1.StatefulSetSpec{ Spec: appsv1.StatefulSetSpec{
Template: v1.PodTemplateSpec{ Template: corev1.PodTemplateSpec{
Spec: v1.PodSpec{ Spec: corev1.PodSpec{
Containers: []v1.Container{ Containers: []corev1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: "nginx", Image: "nginx",
@@ -396,17 +394,18 @@ func TestSetEnvRemote(t *testing.T) {
}, },
}, },
}, },
testAPIGroup: "apps", groupVersion: appsv1.SchemeGroupVersion,
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1", path: "/namespaces/test/statefulsets/nginx",
args: []string{"statefulset", "nginx", "env=prod"}, args: []string{"statefulset", "nginx", "env=prod"},
}, },
{ {
name: "test batchv1 Job",
object: &batchv1.Job{ object: &batchv1.Job{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
Spec: batchv1.JobSpec{ Spec: batchv1.JobSpec{
Template: v1.PodTemplateSpec{ Template: corev1.PodTemplateSpec{
Spec: v1.PodSpec{ Spec: corev1.PodSpec{
Containers: []v1.Container{ Containers: []corev1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: "nginx", Image: "nginx",
@@ -416,17 +415,18 @@ func TestSetEnvRemote(t *testing.T) {
}, },
}, },
}, },
testAPIGroup: "batch", groupVersion: batchv1.SchemeGroupVersion,
apiPrefix: "/apis", apiGroup: "batch", apiVersion: "v1", path: "/namespaces/test/jobs/nginx",
args: []string{"job", "nginx", "env=prod"}, args: []string{"job", "nginx", "env=prod"},
}, },
{ {
object: &v1.ReplicationController{ name: "test corev1 replication controller",
object: &corev1.ReplicationController{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
Spec: v1.ReplicationControllerSpec{ Spec: corev1.ReplicationControllerSpec{
Template: &v1.PodTemplateSpec{ Template: &corev1.PodTemplateSpec{
Spec: v1.PodSpec{ Spec: corev1.PodSpec{
Containers: []v1.Container{ Containers: []corev1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: "nginx", Image: "nginx",
@@ -436,28 +436,24 @@ func TestSetEnvRemote(t *testing.T) {
}, },
}, },
}, },
testAPIGroup: "", groupVersion: corev1.SchemeGroupVersion,
apiPrefix: "/api", apiGroup: "", apiVersion: "v1", path: "/namespaces/test/replicationcontrollers/nginx",
args: []string{"replicationcontroller", "nginx", "env=prod"}, args: []string{"replicationcontroller", "nginx", "env=prod"},
}, },
} }
for _, input := range inputs { for _, input := range inputs {
t.Run(input.name, func(t *testing.T) { t.Run(input.name, func(t *testing.T) {
groupVersion := schema.GroupVersion{Group: input.apiGroup, Version: input.apiVersion}
testapi.Default = testapi.Groups[input.testAPIGroup]
tf := cmdtesting.NewTestFactory().WithNamespace("test") tf := cmdtesting.NewTestFactory().WithNamespace("test")
tf.ClientConfigVal = &restclient.Config{ContentConfig: restclient.ContentConfig{GroupVersion: &schema.GroupVersion{Version: ""}}}
defer tf.Cleanup() defer tf.Cleanup()
tf.Client = &fake.RESTClient{ tf.Client = &fake.RESTClient{
GroupVersion: groupVersion, GroupVersion: input.groupVersion,
NegotiatedSerializer: serializer.DirectCodecFactory{CodecFactory: scheme.Codecs}, NegotiatedSerializer: serializer.DirectCodecFactory{CodecFactory: scheme.Codecs},
Client: fake.CreateHTTPClient(func(req *http.Request) (*http.Response, error) { Client: fake.CreateHTTPClient(func(req *http.Request) (*http.Response, error) {
resourcePath := testapi.Default.ResourcePath(input.args[0]+"s", "test", input.args[1])
switch p, m := req.URL.Path, req.Method; { switch p, m := req.URL.Path, req.Method; {
case p == resourcePath && m == http.MethodGet: case p == input.path && m == http.MethodGet:
return &http.Response{StatusCode: http.StatusOK, Header: defaultHeader(), Body: objBody(input.object)}, nil return &http.Response{StatusCode: http.StatusOK, Header: defaultHeader(), Body: objBody(input.object)}, nil
case p == resourcePath && m == http.MethodPatch: case p == input.path && m == http.MethodPatch:
stream, err := req.GetBody() stream, err := req.GetBody()
if err != nil { if err != nil {
return nil, err return nil, err
@@ -473,7 +469,6 @@ func TestSetEnvRemote(t *testing.T) {
return nil, fmt.Errorf("unexpected request") return nil, fmt.Errorf("unexpected request")
} }
}), }),
VersionedAPIPath: path.Join(input.apiPrefix, testapi.Default.GroupVersion().String()),
} }
outputFormat := "yaml" outputFormat := "yaml"
@@ -491,7 +486,7 @@ func TestSetEnvRemote(t *testing.T) {
} }
func TestSetEnvFromResource(t *testing.T) { func TestSetEnvFromResource(t *testing.T) {
mockConfigMap := &v1.ConfigMap{ mockConfigMap := &corev1.ConfigMap{
ObjectMeta: metav1.ObjectMeta{Name: "testconfigmap"}, ObjectMeta: metav1.ObjectMeta{Name: "testconfigmap"},
Data: map[string]string{ Data: map[string]string{
"env": "prod", "env": "prod",
@@ -500,7 +495,7 @@ func TestSetEnvFromResource(t *testing.T) {
}, },
} }
mockSecret := &v1.Secret{ mockSecret := &corev1.Secret{
ObjectMeta: metav1.ObjectMeta{Name: "testsecret"}, ObjectMeta: metav1.ObjectMeta{Name: "testsecret"},
Data: map[string][]byte{ Data: map[string][]byte{
"env": []byte("prod"), "env": []byte("prod"),
@@ -569,9 +564,9 @@ func TestSetEnvFromResource(t *testing.T) {
mockDeployment := &appsv1.Deployment{ mockDeployment := &appsv1.Deployment{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
Spec: appsv1.DeploymentSpec{ Spec: appsv1.DeploymentSpec{
Template: v1.PodTemplateSpec{ Template: corev1.PodTemplateSpec{
Spec: v1.PodSpec{ Spec: corev1.PodSpec{
Containers: []v1.Container{ Containers: []corev1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: "nginx", Image: "nginx",

210
pkg/kubectl/cmd/set/set_image_test.go
View File

@@ -20,7 +20,6 @@ import (
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"net/http" "net/http"
"path"
"strings" "strings"
"testing" "testing"
@@ -30,7 +29,7 @@ import (
appsv1beta1 "k8s.io/api/apps/v1beta1" appsv1beta1 "k8s.io/api/apps/v1beta1"
appsv1beta2 "k8s.io/api/apps/v1beta2" appsv1beta2 "k8s.io/api/apps/v1beta2"
batchv1 "k8s.io/api/batch/v1" batchv1 "k8s.io/api/batch/v1"
"k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
extensionsv1beta1 "k8s.io/api/extensions/v1beta1" extensionsv1beta1 "k8s.io/api/extensions/v1beta1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
@@ -40,7 +39,6 @@ import (
"k8s.io/cli-runtime/pkg/genericclioptions/resource" "k8s.io/cli-runtime/pkg/genericclioptions/resource"
restclient "k8s.io/client-go/rest" restclient "k8s.io/client-go/rest"
"k8s.io/client-go/rest/fake" "k8s.io/client-go/rest/fake"
"k8s.io/kubernetes/pkg/api/testapi"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing"
"k8s.io/kubernetes/pkg/kubectl/scheme" "k8s.io/kubernetes/pkg/kubectl/scheme"
) )
@@ -204,20 +202,20 @@ func TestSetMultiResourcesImageLocal(t *testing.T) {
func TestSetImageRemote(t *testing.T) { func TestSetImageRemote(t *testing.T) {
inputs := []struct { inputs := []struct {
name string name string
object runtime.Object object runtime.Object
apiPrefix, apiGroup, apiVersion string groupVersion schema.GroupVersion
testAPIGroup string path string
args []string args []string
}{ }{
{ {
name: "set image extensionsv1beta1 ReplicaSet", name: "set image extensionsv1beta1 ReplicaSet",
object: &extensionsv1beta1.ReplicaSet{ object: &extensionsv1beta1.ReplicaSet{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
Spec: extensionsv1beta1.ReplicaSetSpec{ Spec: extensionsv1beta1.ReplicaSetSpec{
Template: v1.PodTemplateSpec{ Template: corev1.PodTemplateSpec{
Spec: v1.PodSpec{ Spec: corev1.PodSpec{
Containers: []v1.Container{ Containers: []corev1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: "nginx", Image: "nginx",
@@ -227,18 +225,18 @@ func TestSetImageRemote(t *testing.T) {
}, },
}, },
}, },
testAPIGroup: "extensions", groupVersion: extensionsv1beta1.SchemeGroupVersion,
apiPrefix: "/apis", apiGroup: "extensions", apiVersion: "v1beta1", path: "/namespaces/test/replicasets/nginx",
args: []string{"replicaset", "nginx", "*=thingy"}, args: []string{"replicaset", "nginx", "*=thingy"},
}, },
{ {
name: "set image appsv1beta2 ReplicaSet", name: "set image appsv1beta2 ReplicaSet",
object: &appsv1beta2.ReplicaSet{ object: &appsv1beta2.ReplicaSet{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
Spec: appsv1beta2.ReplicaSetSpec{ Spec: appsv1beta2.ReplicaSetSpec{
Template: v1.PodTemplateSpec{ Template: corev1.PodTemplateSpec{
Spec: v1.PodSpec{ Spec: corev1.PodSpec{
Containers: []v1.Container{ Containers: []corev1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: "nginx", Image: "nginx",
@@ -248,18 +246,18 @@ func TestSetImageRemote(t *testing.T) {
}, },
}, },
}, },
testAPIGroup: "extensions", groupVersion: appsv1beta2.SchemeGroupVersion,
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1beta2", path: "/namespaces/test/replicasets/nginx",
args: []string{"replicaset", "nginx", "*=thingy"}, args: []string{"replicaset", "nginx", "*=thingy"},
}, },
{ {
name: "set image appsv1 ReplicaSet", name: "set image appsv1 ReplicaSet",
object: &appsv1.ReplicaSet{ object: &appsv1.ReplicaSet{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
Spec: appsv1.ReplicaSetSpec{ Spec: appsv1.ReplicaSetSpec{
Template: v1.PodTemplateSpec{ Template: corev1.PodTemplateSpec{
Spec: v1.PodSpec{ Spec: corev1.PodSpec{
Containers: []v1.Container{ Containers: []corev1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: "nginx", Image: "nginx",
@@ -269,18 +267,18 @@ func TestSetImageRemote(t *testing.T) {
}, },
}, },
}, },
testAPIGroup: "extensions", groupVersion: appsv1.SchemeGroupVersion,
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1", path: "/namespaces/test/replicasets/nginx",
args: []string{"replicaset", "nginx", "*=thingy"}, args: []string{"replicaset", "nginx", "*=thingy"},
}, },
{ {
name: "set image extensionsv1beta1 DaemonSet", name: "set image extensionsv1beta1 DaemonSet",
object: &extensionsv1beta1.DaemonSet{ object: &extensionsv1beta1.DaemonSet{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
Spec: extensionsv1beta1.DaemonSetSpec{ Spec: extensionsv1beta1.DaemonSetSpec{
Template: v1.PodTemplateSpec{ Template: corev1.PodTemplateSpec{
Spec: v1.PodSpec{ Spec: corev1.PodSpec{
Containers: []v1.Container{ Containers: []corev1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: "nginx", Image: "nginx",
@@ -290,18 +288,18 @@ func TestSetImageRemote(t *testing.T) {
}, },
}, },
}, },
testAPIGroup: "extensions", groupVersion: extensionsv1beta1.SchemeGroupVersion,
apiPrefix: "/apis", apiGroup: "extensions", apiVersion: "v1beta1", path: "/namespaces/test/daemonsets/nginx",
args: []string{"daemonset", "nginx", "*=thingy"}, args: []string{"daemonset", "nginx", "*=thingy"},
}, },
{ {
name: "set image appsv1beta2 DaemonSet", name: "set image appsv1beta2 DaemonSet",
object: &appsv1beta2.DaemonSet{ object: &appsv1beta2.DaemonSet{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
Spec: appsv1beta2.DaemonSetSpec{ Spec: appsv1beta2.DaemonSetSpec{
Template: v1.PodTemplateSpec{ Template: corev1.PodTemplateSpec{
Spec: v1.PodSpec{ Spec: corev1.PodSpec{
Containers: []v1.Container{ Containers: []corev1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: "nginx", Image: "nginx",
@@ -311,18 +309,18 @@ func TestSetImageRemote(t *testing.T) {
}, },
}, },
}, },
testAPIGroup: "extensions", groupVersion: appsv1beta2.SchemeGroupVersion,
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1beta2", path: "/namespaces/test/daemonsets/nginx",
args: []string{"daemonset", "nginx", "*=thingy"}, args: []string{"daemonset", "nginx", "*=thingy"},
}, },
{ {
name: "set image appsv1 DaemonSet", name: "set image appsv1 DaemonSet",
object: &appsv1.DaemonSet{ object: &appsv1.DaemonSet{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
Spec: appsv1.DaemonSetSpec{ Spec: appsv1.DaemonSetSpec{
Template: v1.PodTemplateSpec{ Template: corev1.PodTemplateSpec{
Spec: v1.PodSpec{ Spec: corev1.PodSpec{
Containers: []v1.Container{ Containers: []corev1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: "nginx", Image: "nginx",
@@ -332,18 +330,18 @@ func TestSetImageRemote(t *testing.T) {
}, },
}, },
}, },
testAPIGroup: "extensions", groupVersion: appsv1.SchemeGroupVersion,
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1", path: "/namespaces/test/daemonsets/nginx",
args: []string{"daemonset", "nginx", "*=thingy"}, args: []string{"daemonset", "nginx", "*=thingy"},
}, },
{ {
name: "set image extensionsv1beta1 Deployment", name: "set image extensionsv1beta1 Deployment",
object: &extensionsv1beta1.Deployment{ object: &extensionsv1beta1.Deployment{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
Spec: extensionsv1beta1.DeploymentSpec{ Spec: extensionsv1beta1.DeploymentSpec{
Template: v1.PodTemplateSpec{ Template: corev1.PodTemplateSpec{
Spec: v1.PodSpec{ Spec: corev1.PodSpec{
Containers: []v1.Container{ Containers: []corev1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: "nginx", Image: "nginx",
@@ -353,18 +351,18 @@ func TestSetImageRemote(t *testing.T) {
}, },
}, },
}, },
testAPIGroup: "extensions", groupVersion: extensionsv1beta1.SchemeGroupVersion,
apiPrefix: "/apis", apiGroup: "extensions", apiVersion: "v1beta1", path: "/namespaces/test/deployments/nginx",
args: []string{"deployment", "nginx", "*=thingy"}, args: []string{"deployment", "nginx", "*=thingy"},
}, },
{ {
name: "set image appsv1beta1 Deployment", name: "set image appsv1beta1 Deployment",
object: &appsv1beta1.Deployment{ object: &appsv1beta1.Deployment{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
Spec: appsv1beta1.DeploymentSpec{ Spec: appsv1beta1.DeploymentSpec{
Template: v1.PodTemplateSpec{ Template: corev1.PodTemplateSpec{
Spec: v1.PodSpec{ Spec: corev1.PodSpec{
Containers: []v1.Container{ Containers: []corev1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: "nginx", Image: "nginx",
@@ -374,18 +372,18 @@ func TestSetImageRemote(t *testing.T) {
}, },
}, },
}, },
testAPIGroup: "extensions", groupVersion: appsv1beta1.SchemeGroupVersion,
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1beta1", path: "/namespaces/test/deployments/nginx",
args: []string{"deployment", "nginx", "*=thingy"}, args: []string{"deployment", "nginx", "*=thingy"},
}, },
{ {
name: "set image appsv1beta2 Deployment", name: "set image appsv1beta2 Deployment",
object: &appsv1beta2.Deployment{ object: &appsv1beta2.Deployment{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
Spec: appsv1beta2.DeploymentSpec{ Spec: appsv1beta2.DeploymentSpec{
Template: v1.PodTemplateSpec{ Template: corev1.PodTemplateSpec{
Spec: v1.PodSpec{ Spec: corev1.PodSpec{
Containers: []v1.Container{ Containers: []corev1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: "nginx", Image: "nginx",
@@ -395,18 +393,18 @@ func TestSetImageRemote(t *testing.T) {
}, },
}, },
}, },
testAPIGroup: "extensions", groupVersion: appsv1beta2.SchemeGroupVersion,
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1beta2", path: "/namespaces/test/deployments/nginx",
args: []string{"deployment", "nginx", "*=thingy"}, args: []string{"deployment", "nginx", "*=thingy"},
}, },
{ {
name: "set image appsv1 Deployment", name: "set image appsv1 Deployment",
object: &appsv1.Deployment{ object: &appsv1.Deployment{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
Spec: appsv1.DeploymentSpec{ Spec: appsv1.DeploymentSpec{
Template: v1.PodTemplateSpec{ Template: corev1.PodTemplateSpec{
Spec: v1.PodSpec{ Spec: corev1.PodSpec{
Containers: []v1.Container{ Containers: []corev1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: "nginx", Image: "nginx",
@@ -416,18 +414,18 @@ func TestSetImageRemote(t *testing.T) {
}, },
}, },
}, },
testAPIGroup: "extensions", groupVersion: appsv1.SchemeGroupVersion,
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1", path: "/namespaces/test/deployments/nginx",
args: []string{"deployment", "nginx", "*=thingy"}, args: []string{"deployment", "nginx", "*=thingy"},
}, },
{ {
name: "set image appsv1beta1 StatefulSet", name: "set image appsv1beta1 StatefulSet",
object: &appsv1beta1.StatefulSet{ object: &appsv1beta1.StatefulSet{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
Spec: appsv1beta1.StatefulSetSpec{ Spec: appsv1beta1.StatefulSetSpec{
Template: v1.PodTemplateSpec{ Template: corev1.PodTemplateSpec{
Spec: v1.PodSpec{ Spec: corev1.PodSpec{
Containers: []v1.Container{ Containers: []corev1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: "nginx", Image: "nginx",
@@ -437,18 +435,18 @@ func TestSetImageRemote(t *testing.T) {
}, },
}, },
}, },
testAPIGroup: "apps", groupVersion: appsv1beta1.SchemeGroupVersion,
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1beta1", path: "/namespaces/test/statefulsets/nginx",
args: []string{"statefulset", "nginx", "*=thingy"}, args: []string{"statefulset", "nginx", "*=thingy"},
}, },
{ {
name: "set image appsv1beta2 StatefulSet", name: "set image appsv1beta2 StatefulSet",
object: &appsv1beta2.StatefulSet{ object: &appsv1beta2.StatefulSet{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
Spec: appsv1beta2.StatefulSetSpec{ Spec: appsv1beta2.StatefulSetSpec{
Template: v1.PodTemplateSpec{ Template: corev1.PodTemplateSpec{
Spec: v1.PodSpec{ Spec: corev1.PodSpec{
Containers: []v1.Container{ Containers: []corev1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: "nginx", Image: "nginx",
@@ -458,18 +456,18 @@ func TestSetImageRemote(t *testing.T) {
}, },
}, },
}, },
testAPIGroup: "apps", groupVersion: appsv1beta2.SchemeGroupVersion,
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1beta2", path: "/namespaces/test/statefulsets/nginx",
args: []string{"statefulset", "nginx", "*=thingy"}, args: []string{"statefulset", "nginx", "*=thingy"},
}, },
{ {
name: "set image appsv1 StatefulSet", name: "set image appsv1 StatefulSet",
object: &appsv1.StatefulSet{ object: &appsv1.StatefulSet{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
Spec: appsv1.StatefulSetSpec{ Spec: appsv1.StatefulSetSpec{
Template: v1.PodTemplateSpec{ Template: corev1.PodTemplateSpec{
Spec: v1.PodSpec{ Spec: corev1.PodSpec{
Containers: []v1.Container{ Containers: []corev1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: "nginx", Image: "nginx",
@@ -479,18 +477,18 @@ func TestSetImageRemote(t *testing.T) {
}, },
}, },
}, },
testAPIGroup: "apps", groupVersion: appsv1.SchemeGroupVersion,
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1", path: "/namespaces/test/statefulsets/nginx",
args: []string{"statefulset", "nginx", "*=thingy"}, args: []string{"statefulset", "nginx", "*=thingy"},
}, },
{ {
name: "set image batchv1 Job", name: "set image batchv1 Job",
object: &batchv1.Job{ object: &batchv1.Job{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
Spec: batchv1.JobSpec{ Spec: batchv1.JobSpec{
Template: v1.PodTemplateSpec{ Template: corev1.PodTemplateSpec{
Spec: v1.PodSpec{ Spec: corev1.PodSpec{
Containers: []v1.Container{ Containers: []corev1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: "nginx", Image: "nginx",
@@ -500,18 +498,18 @@ func TestSetImageRemote(t *testing.T) {
}, },
}, },
}, },
testAPIGroup: "batch", groupVersion: batchv1.SchemeGroupVersion,
apiPrefix: "/apis", apiGroup: "batch", apiVersion: "v1", path: "/namespaces/test/jobs/nginx",
args: []string{"job", "nginx", "*=thingy"}, args: []string{"job", "nginx", "*=thingy"},
}, },
{ {
name: "set image v1.ReplicationController", name: "set image corev1.ReplicationController",
object: &v1.ReplicationController{ object: &corev1.ReplicationController{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
Spec: v1.ReplicationControllerSpec{ Spec: corev1.ReplicationControllerSpec{
Template: &v1.PodTemplateSpec{ Template: &corev1.PodTemplateSpec{
Spec: v1.PodSpec{ Spec: corev1.PodSpec{
Containers: []v1.Container{ Containers: []corev1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: "nginx", Image: "nginx",
@@ -521,27 +519,24 @@ func TestSetImageRemote(t *testing.T) {
}, },
}, },
}, },
testAPIGroup: "", groupVersion: corev1.SchemeGroupVersion,
apiPrefix: "/api", apiGroup: "", apiVersion: "v1", path: "/namespaces/test/replicationcontrollers/nginx",
args: []string{"replicationcontroller", "nginx", "*=thingy"}, args: []string{"replicationcontroller", "nginx", "*=thingy"},
}, },
} }
for _, input := range inputs { for _, input := range inputs {
t.Run(input.name, func(t *testing.T) { t.Run(input.name, func(t *testing.T) {
groupVersion := schema.GroupVersion{Group: input.apiGroup, Version: input.apiVersion}
testapi.Default = testapi.Groups[input.testAPIGroup]
tf := cmdtesting.NewTestFactory().WithNamespace("test") tf := cmdtesting.NewTestFactory().WithNamespace("test")
defer tf.Cleanup() defer tf.Cleanup()
tf.Client = &fake.RESTClient{ tf.Client = &fake.RESTClient{
GroupVersion: groupVersion, GroupVersion: input.groupVersion,
NegotiatedSerializer: serializer.DirectCodecFactory{CodecFactory: scheme.Codecs}, NegotiatedSerializer: serializer.DirectCodecFactory{CodecFactory: scheme.Codecs},
Client: fake.CreateHTTPClient(func(req *http.Request) (*http.Response, error) { Client: fake.CreateHTTPClient(func(req *http.Request) (*http.Response, error) {
resourcePath := testapi.Default.ResourcePath(input.args[0]+"s", "test", input.args[1])
switch p, m := req.URL.Path, req.Method; { switch p, m := req.URL.Path, req.Method; {
case p == resourcePath && m == http.MethodGet: case p == input.path && m == http.MethodGet:
return &http.Response{StatusCode: http.StatusOK, Header: defaultHeader(), Body: objBody(input.object)}, nil return &http.Response{StatusCode: http.StatusOK, Header: defaultHeader(), Body: objBody(input.object)}, nil
case p == resourcePath && m == http.MethodPatch: case p == input.path && m == http.MethodPatch:
stream, err := req.GetBody() stream, err := req.GetBody()
if err != nil { if err != nil {
return nil, err return nil, err
@@ -557,7 +552,6 @@ func TestSetImageRemote(t *testing.T) {
return nil, fmt.Errorf("unexpected request") return nil, fmt.Errorf("unexpected request")
} }
}), }),
VersionedAPIPath: path.Join(input.apiPrefix, testapi.Default.GroupVersion().String()),
} }
outputFormat := "yaml" outputFormat := "yaml"

223
pkg/kubectl/cmd/set/set_resources_test.go
View File

@@ -20,7 +20,6 @@ import (
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"net/http" "net/http"
"path"
"strings" "strings"
"testing" "testing"
@@ -29,7 +28,7 @@ import (
appsv1beta1 "k8s.io/api/apps/v1beta1" appsv1beta1 "k8s.io/api/apps/v1beta1"
appsv1beta2 "k8s.io/api/apps/v1beta2" appsv1beta2 "k8s.io/api/apps/v1beta2"
batchv1 "k8s.io/api/batch/v1" batchv1 "k8s.io/api/batch/v1"
"k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
extensionsv1beta1 "k8s.io/api/extensions/v1beta1" extensionsv1beta1 "k8s.io/api/extensions/v1beta1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
@@ -39,7 +38,6 @@ import (
"k8s.io/cli-runtime/pkg/genericclioptions/resource" "k8s.io/cli-runtime/pkg/genericclioptions/resource"
restclient "k8s.io/client-go/rest" restclient "k8s.io/client-go/rest"
"k8s.io/client-go/rest/fake" "k8s.io/client-go/rest/fake"
"k8s.io/kubernetes/pkg/api/testapi"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing"
"k8s.io/kubernetes/pkg/kubectl/scheme" "k8s.io/kubernetes/pkg/kubectl/scheme"
) )
@@ -143,18 +141,20 @@ func TestSetMultiResourcesLimitsLocal(t *testing.T) {
func TestSetResourcesRemote(t *testing.T) { func TestSetResourcesRemote(t *testing.T) {
inputs := []struct { inputs := []struct {
object runtime.Object name string
apiPrefix, apiGroup, apiVersion string object runtime.Object
testAPIGroup string groupVersion schema.GroupVersion
args []string path string
args []string
}{ }{
{ {
name: "set image extensionsv1beta1 ReplicaSet",
object: &extensionsv1beta1.ReplicaSet{ object: &extensionsv1beta1.ReplicaSet{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
Spec: extensionsv1beta1.ReplicaSetSpec{ Spec: extensionsv1beta1.ReplicaSetSpec{
Template: v1.PodTemplateSpec{ Template: corev1.PodTemplateSpec{
Spec: v1.PodSpec{ Spec: corev1.PodSpec{
Containers: []v1.Container{ Containers: []corev1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: "nginx", Image: "nginx",
@@ -164,17 +164,18 @@ func TestSetResourcesRemote(t *testing.T) {
}, },
}, },
}, },
testAPIGroup: "extensions", groupVersion: extensionsv1beta1.SchemeGroupVersion,
apiPrefix: "/apis", apiGroup: "extensions", apiVersion: "v1beta1", path: "/namespaces/test/replicasets/nginx",
args: []string{"replicaset", "nginx"}, args: []string{"replicaset", "nginx"},
}, },
{ {
name: "set image appsv1beta2 ReplicaSet",
object: &appsv1beta2.ReplicaSet{ object: &appsv1beta2.ReplicaSet{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
Spec: appsv1beta2.ReplicaSetSpec{ Spec: appsv1beta2.ReplicaSetSpec{
Template: v1.PodTemplateSpec{ Template: corev1.PodTemplateSpec{
Spec: v1.PodSpec{ Spec: corev1.PodSpec{
Containers: []v1.Container{ Containers: []corev1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: "nginx", Image: "nginx",
@@ -184,17 +185,18 @@ func TestSetResourcesRemote(t *testing.T) {
}, },
}, },
}, },
testAPIGroup: "extensions", groupVersion: appsv1beta2.SchemeGroupVersion,
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1beta2", path: "/namespaces/test/replicasets/nginx",
args: []string{"replicaset", "nginx"}, args: []string{"replicaset", "nginx"},
}, },
{ {
name: "set image appsv1 ReplicaSet",
object: &appsv1.ReplicaSet{ object: &appsv1.ReplicaSet{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
Spec: appsv1.ReplicaSetSpec{ Spec: appsv1.ReplicaSetSpec{
Template: v1.PodTemplateSpec{ Template: corev1.PodTemplateSpec{
Spec: v1.PodSpec{ Spec: corev1.PodSpec{
Containers: []v1.Container{ Containers: []corev1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: "nginx", Image: "nginx",
@@ -204,17 +206,18 @@ func TestSetResourcesRemote(t *testing.T) {
}, },
}, },
}, },
testAPIGroup: "extensions", groupVersion: appsv1.SchemeGroupVersion,
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1", path: "/namespaces/test/replicasets/nginx",
args: []string{"replicaset", "nginx"}, args: []string{"replicaset", "nginx"},
}, },
{ {
name: "set image extensionsv1beta1 DaemonSet",
object: &extensionsv1beta1.DaemonSet{ object: &extensionsv1beta1.DaemonSet{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
Spec: extensionsv1beta1.DaemonSetSpec{ Spec: extensionsv1beta1.DaemonSetSpec{
Template: v1.PodTemplateSpec{ Template: corev1.PodTemplateSpec{
Spec: v1.PodSpec{ Spec: corev1.PodSpec{
Containers: []v1.Container{ Containers: []corev1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: "nginx", Image: "nginx",
@@ -224,17 +227,18 @@ func TestSetResourcesRemote(t *testing.T) {
}, },
}, },
}, },
testAPIGroup: "extensions", groupVersion: extensionsv1beta1.SchemeGroupVersion,
apiPrefix: "/apis", apiGroup: "extensions", apiVersion: "v1beta1", path: "/namespaces/test/daemonsets/nginx",
args: []string{"daemonset", "nginx"}, args: []string{"daemonset", "nginx"},
}, },
{ {
name: "set image appsv1beta2 DaemonSet",
object: &appsv1beta2.DaemonSet{ object: &appsv1beta2.DaemonSet{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
Spec: appsv1beta2.DaemonSetSpec{ Spec: appsv1beta2.DaemonSetSpec{
Template: v1.PodTemplateSpec{ Template: corev1.PodTemplateSpec{
Spec: v1.PodSpec{ Spec: corev1.PodSpec{
Containers: []v1.Container{ Containers: []corev1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: "nginx", Image: "nginx",
@@ -244,17 +248,18 @@ func TestSetResourcesRemote(t *testing.T) {
}, },
}, },
}, },
testAPIGroup: "extensions", groupVersion: appsv1beta2.SchemeGroupVersion,
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1beta2", path: "/namespaces/test/daemonsets/nginx",
args: []string{"daemonset", "nginx"}, args: []string{"daemonset", "nginx"},
}, },
{ {
name: "set image appsv1 DaemonSet",
object: &appsv1.DaemonSet{ object: &appsv1.DaemonSet{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
Spec: appsv1.DaemonSetSpec{ Spec: appsv1.DaemonSetSpec{
Template: v1.PodTemplateSpec{ Template: corev1.PodTemplateSpec{
Spec: v1.PodSpec{ Spec: corev1.PodSpec{
Containers: []v1.Container{ Containers: []corev1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: "nginx", Image: "nginx",
@@ -264,17 +269,18 @@ func TestSetResourcesRemote(t *testing.T) {
}, },
}, },
}, },
testAPIGroup: "extensions", groupVersion: appsv1.SchemeGroupVersion,
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1", path: "/namespaces/test/daemonsets/nginx",
args: []string{"daemonset", "nginx"}, args: []string{"daemonset", "nginx"},
}, },
{ {
name: "set image extensionsv1beta1 Deployment",
object: &extensionsv1beta1.Deployment{ object: &extensionsv1beta1.Deployment{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
Spec: extensionsv1beta1.DeploymentSpec{ Spec: extensionsv1beta1.DeploymentSpec{
Template: v1.PodTemplateSpec{ Template: corev1.PodTemplateSpec{
Spec: v1.PodSpec{ Spec: corev1.PodSpec{
Containers: []v1.Container{ Containers: []corev1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: "nginx", Image: "nginx",
@@ -284,17 +290,18 @@ func TestSetResourcesRemote(t *testing.T) {
}, },
}, },
}, },
testAPIGroup: "extensions", groupVersion: extensionsv1beta1.SchemeGroupVersion,
apiPrefix: "/apis", apiGroup: "extensions", apiVersion: "v1beta1", path: "/namespaces/test/deployments/nginx",
args: []string{"deployment", "nginx"}, args: []string{"deployment", "nginx"},
}, },
{ {
name: "set image appsv1beta1 Deployment",
object: &appsv1beta1.Deployment{ object: &appsv1beta1.Deployment{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
Spec: appsv1beta1.DeploymentSpec{ Spec: appsv1beta1.DeploymentSpec{
Template: v1.PodTemplateSpec{ Template: corev1.PodTemplateSpec{
Spec: v1.PodSpec{ Spec: corev1.PodSpec{
Containers: []v1.Container{ Containers: []corev1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: "nginx", Image: "nginx",
@@ -304,17 +311,18 @@ func TestSetResourcesRemote(t *testing.T) {
}, },
}, },
}, },
testAPIGroup: "extensions", groupVersion: appsv1beta1.SchemeGroupVersion,
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1beta1", path: "/namespaces/test/deployments/nginx",
args: []string{"deployment", "nginx"}, args: []string{"deployment", "nginx"},
}, },
{ {
name: "set image appsv1beta2 Deployment",
object: &appsv1beta2.Deployment{ object: &appsv1beta2.Deployment{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
Spec: appsv1beta2.DeploymentSpec{ Spec: appsv1beta2.DeploymentSpec{
Template: v1.PodTemplateSpec{ Template: corev1.PodTemplateSpec{
Spec: v1.PodSpec{ Spec: corev1.PodSpec{
Containers: []v1.Container{ Containers: []corev1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: "nginx", Image: "nginx",
@@ -324,17 +332,18 @@ func TestSetResourcesRemote(t *testing.T) {
}, },
}, },
}, },
testAPIGroup: "extensions", groupVersion: appsv1beta2.SchemeGroupVersion,
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1beta2", path: "/namespaces/test/deployments/nginx",
args: []string{"deployment", "nginx"}, args: []string{"deployment", "nginx"},
}, },
{ {
name: "set image appsv1 Deployment",
object: &appsv1.Deployment{ object: &appsv1.Deployment{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
Spec: appsv1.DeploymentSpec{ Spec: appsv1.DeploymentSpec{
Template: v1.PodTemplateSpec{ Template: corev1.PodTemplateSpec{
Spec: v1.PodSpec{ Spec: corev1.PodSpec{
Containers: []v1.Container{ Containers: []corev1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: "nginx", Image: "nginx",
@@ -344,17 +353,18 @@ func TestSetResourcesRemote(t *testing.T) {
}, },
}, },
}, },
testAPIGroup: "extensions", groupVersion: appsv1.SchemeGroupVersion,
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1", path: "/namespaces/test/deployments/nginx",
args: []string{"deployment", "nginx"}, args: []string{"deployment", "nginx"},
}, },
{ {
name: "set image appsv1beta1 StatefulSet",
object: &appsv1beta1.StatefulSet{ object: &appsv1beta1.StatefulSet{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
Spec: appsv1beta1.StatefulSetSpec{ Spec: appsv1beta1.StatefulSetSpec{
Template: v1.PodTemplateSpec{ Template: corev1.PodTemplateSpec{
Spec: v1.PodSpec{ Spec: corev1.PodSpec{
Containers: []v1.Container{ Containers: []corev1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: "nginx", Image: "nginx",
@@ -364,17 +374,18 @@ func TestSetResourcesRemote(t *testing.T) {
}, },
}, },
}, },
testAPIGroup: "apps", groupVersion: appsv1beta1.SchemeGroupVersion,
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1beta1", path: "/namespaces/test/statefulsets/nginx",
args: []string{"statefulset", "nginx"}, args: []string{"statefulset", "nginx"},
}, },
{ {
name: "set image appsv1beta2 StatefulSet",
object: &appsv1beta2.StatefulSet{ object: &appsv1beta2.StatefulSet{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
Spec: appsv1beta2.StatefulSetSpec{ Spec: appsv1beta2.StatefulSetSpec{
Template: v1.PodTemplateSpec{ Template: corev1.PodTemplateSpec{
Spec: v1.PodSpec{ Spec: corev1.PodSpec{
Containers: []v1.Container{ Containers: []corev1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: "nginx", Image: "nginx",
@@ -384,17 +395,18 @@ func TestSetResourcesRemote(t *testing.T) {
}, },
}, },
}, },
testAPIGroup: "apps", groupVersion: appsv1beta2.SchemeGroupVersion,
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1beta2", path: "/namespaces/test/statefulsets/nginx",
args: []string{"statefulset", "nginx"}, args: []string{"statefulset", "nginx"},
}, },
{ {
name: "set image appsv1 StatefulSet",
object: &appsv1.StatefulSet{ object: &appsv1.StatefulSet{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
Spec: appsv1.StatefulSetSpec{ Spec: appsv1.StatefulSetSpec{
Template: v1.PodTemplateSpec{ Template: corev1.PodTemplateSpec{
Spec: v1.PodSpec{ Spec: corev1.PodSpec{
Containers: []v1.Container{ Containers: []corev1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: "nginx", Image: "nginx",
@@ -404,17 +416,18 @@ func TestSetResourcesRemote(t *testing.T) {
}, },
}, },
}, },
testAPIGroup: "apps", groupVersion: appsv1.SchemeGroupVersion,
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1", path: "/namespaces/test/statefulsets/nginx",
args: []string{"statefulset", "nginx"}, args: []string{"statefulset", "nginx"},
}, },
{ {
name: "set image batchv1 Job",
object: &batchv1.Job{ object: &batchv1.Job{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
Spec: batchv1.JobSpec{ Spec: batchv1.JobSpec{
Template: v1.PodTemplateSpec{ Template: corev1.PodTemplateSpec{
Spec: v1.PodSpec{ Spec: corev1.PodSpec{
Containers: []v1.Container{ Containers: []corev1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: "nginx", Image: "nginx",
@@ -424,17 +437,18 @@ func TestSetResourcesRemote(t *testing.T) {
}, },
}, },
}, },
testAPIGroup: "batch", groupVersion: batchv1.SchemeGroupVersion,
apiPrefix: "/apis", apiGroup: "batch", apiVersion: "v1", path: "/namespaces/test/jobs/nginx",
args: []string{"job", "nginx"}, args: []string{"job", "nginx"},
}, },
{ {
object: &v1.ReplicationController{ name: "set image corev1.ReplicationController",
object: &corev1.ReplicationController{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
Spec: v1.ReplicationControllerSpec{ Spec: corev1.ReplicationControllerSpec{
Template: &v1.PodTemplateSpec{ Template: &corev1.PodTemplateSpec{
Spec: v1.PodSpec{ Spec: corev1.PodSpec{
Containers: []v1.Container{ Containers: []corev1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: "nginx", Image: "nginx",
@@ -444,27 +458,25 @@ func TestSetResourcesRemote(t *testing.T) {
}, },
}, },
}, },
testAPIGroup: "", groupVersion: corev1.SchemeGroupVersion,
apiPrefix: "/api", apiGroup: "", apiVersion: "v1", path: "/namespaces/test/replicationcontrollers/nginx",
args: []string{"replicationcontroller", "nginx"}, args: []string{"replicationcontroller", "nginx"},
}, },
} }
for i, input := range inputs { for i, input := range inputs {
t.Run(fmt.Sprintf("%d", i), func(t *testing.T) { t.Run(fmt.Sprintf("%d", i), func(t *testing.T) {
groupVersion := schema.GroupVersion{Group: input.apiGroup, Version: input.apiVersion}
testapi.Default = testapi.Groups[input.testAPIGroup]
tf := cmdtesting.NewTestFactory().WithNamespace("test") tf := cmdtesting.NewTestFactory().WithNamespace("test")
defer tf.Cleanup() defer tf.Cleanup()
tf.Client = &fake.RESTClient{ tf.Client = &fake.RESTClient{
GroupVersion: groupVersion, GroupVersion: input.groupVersion,
NegotiatedSerializer: serializer.DirectCodecFactory{CodecFactory: scheme.Codecs}, NegotiatedSerializer: serializer.DirectCodecFactory{CodecFactory: scheme.Codecs},
Client: fake.CreateHTTPClient(func(req *http.Request) (*http.Response, error) { Client: fake.CreateHTTPClient(func(req *http.Request) (*http.Response, error) {
resourcePath := testapi.Default.ResourcePath(input.args[0]+"s", "test", input.args[1])
switch p, m := req.URL.Path, req.Method; { switch p, m := req.URL.Path, req.Method; {
case p == resourcePath && m == http.MethodGet: case p == input.path && m == http.MethodGet:
return &http.Response{StatusCode: http.StatusOK, Header: defaultHeader(), Body: objBody(input.object)}, nil return &http.Response{StatusCode: http.StatusOK, Header: defaultHeader(), Body: objBody(input.object)}, nil
case p == resourcePath && m == http.MethodPatch: case p == input.path && m == http.MethodPatch:
stream, err := req.GetBody() stream, err := req.GetBody()
if err != nil { if err != nil {
return nil, err return nil, err
@@ -480,7 +492,6 @@ func TestSetResourcesRemote(t *testing.T) {
return nil, fmt.Errorf("unexpected request") return nil, fmt.Errorf("unexpected request")
} }
}), }),
VersionedAPIPath: path.Join(input.apiPrefix, testapi.Default.GroupVersion().String()),
} }
outputFormat := "yaml" outputFormat := "yaml"

144
pkg/kubectl/cmd/set/set_serviceaccount_test.go
View File

@@ -22,7 +22,6 @@ import (
"io" "io"
"io/ioutil" "io/ioutil"
"net/http" "net/http"
"path"
"testing" "testing"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
@@ -30,7 +29,7 @@ import (
appsv1beta1 "k8s.io/api/apps/v1beta1" appsv1beta1 "k8s.io/api/apps/v1beta1"
appsv1beta2 "k8s.io/api/apps/v1beta2" appsv1beta2 "k8s.io/api/apps/v1beta2"
batchv1 "k8s.io/api/batch/v1" batchv1 "k8s.io/api/batch/v1"
"k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
extensionsv1beta1 "k8s.io/api/extensions/v1beta1" extensionsv1beta1 "k8s.io/api/extensions/v1beta1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
@@ -40,7 +39,6 @@ import (
"k8s.io/cli-runtime/pkg/genericclioptions/resource" "k8s.io/cli-runtime/pkg/genericclioptions/resource"
restclient "k8s.io/client-go/rest" restclient "k8s.io/client-go/rest"
"k8s.io/client-go/rest/fake" "k8s.io/client-go/rest/fake"
"k8s.io/kubernetes/pkg/api/testapi"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing"
"k8s.io/kubernetes/pkg/kubectl/scheme" "k8s.io/kubernetes/pkg/kubectl/scheme"
) )
@@ -85,7 +83,6 @@ func TestSetServiceAccountLocal(t *testing.T) {
cmd := NewCmdServiceAccount(tf, streams) cmd := NewCmdServiceAccount(tf, streams)
cmd.Flags().Set("output", outputFormat) cmd.Flags().Set("output", outputFormat)
cmd.Flags().Set("local", "true") cmd.Flags().Set("local", "true")
testapi.Default = testapi.Groups[input.apiGroup]
saConfig := SetServiceAccountOptions{ saConfig := SetServiceAccountOptions{
PrintFlags: genericclioptions.NewPrintFlags("").WithDefaultOutput(outputFormat).WithTypeSetter(scheme.Scheme), PrintFlags: genericclioptions.NewPrintFlags("").WithDefaultOutput(outputFormat).WithTypeSetter(scheme.Scheme),
fileNameOptions: resource.FilenameOptions{ fileNameOptions: resource.FilenameOptions{
@@ -103,7 +100,6 @@ func TestSetServiceAccountLocal(t *testing.T) {
} }
func TestSetServiceAccountMultiLocal(t *testing.T) { func TestSetServiceAccountMultiLocal(t *testing.T) {
testapi.Default = testapi.Groups[""]
tf := cmdtesting.NewTestFactory().WithNamespace("test") tf := cmdtesting.NewTestFactory().WithNamespace("test")
defer tf.Cleanup() defer tf.Cleanup()
@@ -146,26 +142,26 @@ func TestSetServiceAccountMultiLocal(t *testing.T) {
func TestSetServiceAccountRemote(t *testing.T) { func TestSetServiceAccountRemote(t *testing.T) {
inputs := []struct { inputs := []struct {
object runtime.Object object runtime.Object
apiPrefix, apiGroup, apiVersion string groupVersion schema.GroupVersion
testAPIGroup string path string
args []string args []string
}{ }{
{ {
object: &extensionsv1beta1.ReplicaSet{ object: &extensionsv1beta1.ReplicaSet{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
}, },
testAPIGroup: "extensions", groupVersion: extensionsv1beta1.SchemeGroupVersion,
apiPrefix: "/apis", apiGroup: "extensions", apiVersion: "v1beta1", path: "/namespaces/test/replicasets/nginx",
args: []string{"replicaset", "nginx", serviceAccount}, args: []string{"replicaset", "nginx", serviceAccount},
}, },
{ {
object: &appsv1beta2.ReplicaSet{ object: &appsv1beta2.ReplicaSet{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
Spec: appsv1beta2.ReplicaSetSpec{ Spec: appsv1beta2.ReplicaSetSpec{
Template: v1.PodTemplateSpec{ Template: corev1.PodTemplateSpec{
Spec: v1.PodSpec{ Spec: corev1.PodSpec{
Containers: []v1.Container{ Containers: []corev1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: "nginx", Image: "nginx",
@@ -175,17 +171,17 @@ func TestSetServiceAccountRemote(t *testing.T) {
}, },
}, },
}, },
testAPIGroup: "extensions", groupVersion: appsv1beta2.SchemeGroupVersion,
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1beta2", path: "/namespaces/test/replicasets/nginx",
args: []string{"replicaset", "nginx", serviceAccount}, args: []string{"replicaset", "nginx", serviceAccount},
}, },
{ {
object: &appsv1.ReplicaSet{ object: &appsv1.ReplicaSet{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
Spec: appsv1.ReplicaSetSpec{ Spec: appsv1.ReplicaSetSpec{
Template: v1.PodTemplateSpec{ Template: corev1.PodTemplateSpec{
Spec: v1.PodSpec{ Spec: corev1.PodSpec{
Containers: []v1.Container{ Containers: []corev1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: "nginx", Image: "nginx",
@@ -195,65 +191,65 @@ func TestSetServiceAccountRemote(t *testing.T) {
}, },
}, },
}, },
testAPIGroup: "extensions", groupVersion: appsv1.SchemeGroupVersion,
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1", path: "/namespaces/test/replicasets/nginx",
args: []string{"replicaset", "nginx", serviceAccount}, args: []string{"replicaset", "nginx", serviceAccount},
}, },
{ {
object: &extensionsv1beta1.DaemonSet{ object: &extensionsv1beta1.DaemonSet{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
}, },
testAPIGroup: "extensions", groupVersion: extensionsv1beta1.SchemeGroupVersion,
apiPrefix: "/apis", apiGroup: "extensions", apiVersion: "v1beta1", path: "/namespaces/test/daemonsets/nginx",
args: []string{"daemonset", "nginx", serviceAccount}, args: []string{"daemonset", "nginx", serviceAccount},
}, },
{ {
object: &appsv1beta2.DaemonSet{ object: &appsv1beta2.DaemonSet{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
}, },
testAPIGroup: "extensions", groupVersion: appsv1beta2.SchemeGroupVersion,
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1beta2", path: "/namespaces/test/daemonsets/nginx",
args: []string{"daemonset", "nginx", serviceAccount}, args: []string{"daemonset", "nginx", serviceAccount},
}, },
{ {
object: &appsv1.DaemonSet{ object: &appsv1.DaemonSet{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
}, },
testAPIGroup: "extensions", groupVersion: appsv1.SchemeGroupVersion,
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1", path: "/namespaces/test/daemonsets/nginx",
args: []string{"daemonset", "nginx", serviceAccount}, args: []string{"daemonset", "nginx", serviceAccount},
}, },
{ {
object: &extensionsv1beta1.Deployment{ object: &extensionsv1beta1.Deployment{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
}, },
testAPIGroup: "extensions", groupVersion: extensionsv1beta1.SchemeGroupVersion,
apiPrefix: "/apis", apiGroup: "extensions", apiVersion: "v1beta1", path: "/namespaces/test/deployments/nginx",
args: []string{"deployment", "nginx", serviceAccount}, args: []string{"deployment", "nginx", serviceAccount},
}, },
{ {
object: &appsv1beta1.Deployment{ object: &appsv1beta1.Deployment{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
}, },
testAPIGroup: "extensions", groupVersion: appsv1beta1.SchemeGroupVersion,
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1beta1", path: "/namespaces/test/deployments/nginx",
args: []string{"deployment", "nginx", serviceAccount}, args: []string{"deployment", "nginx", serviceAccount},
}, },
{ {
object: &appsv1beta2.Deployment{ object: &appsv1beta2.Deployment{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
}, },
testAPIGroup: "extensions", groupVersion: appsv1beta2.SchemeGroupVersion,
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1beta2", path: "/namespaces/test/deployments/nginx",
args: []string{"deployment", "nginx", serviceAccount}, args: []string{"deployment", "nginx", serviceAccount},
}, },
{ {
object: &appsv1.Deployment{ object: &appsv1.Deployment{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
Spec: appsv1.DeploymentSpec{ Spec: appsv1.DeploymentSpec{
Template: v1.PodTemplateSpec{ Template: corev1.PodTemplateSpec{
Spec: v1.PodSpec{ Spec: corev1.PodSpec{
Containers: []v1.Container{ Containers: []corev1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: "nginx", Image: "nginx",
@@ -263,33 +259,33 @@ func TestSetServiceAccountRemote(t *testing.T) {
}, },
}, },
}, },
testAPIGroup: "extensions", groupVersion: appsv1.SchemeGroupVersion,
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1", path: "/namespaces/test/deployments/nginx",
args: []string{"deployment", "nginx", serviceAccount}, args: []string{"deployment", "nginx", serviceAccount},
}, },
{ {
object: &appsv1beta1.StatefulSet{ object: &appsv1beta1.StatefulSet{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
}, },
testAPIGroup: "apps", groupVersion: appsv1beta1.SchemeGroupVersion,
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1beta1", path: "/namespaces/test/statefulsets/nginx",
args: []string{"statefulset", "nginx", serviceAccount}, args: []string{"statefulset", "nginx", serviceAccount},
}, },
{ {
object: &appsv1beta2.StatefulSet{ object: &appsv1beta2.StatefulSet{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
}, },
testAPIGroup: "apps", groupVersion: appsv1beta2.SchemeGroupVersion,
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1beta2", path: "/namespaces/test/statefulsets/nginx",
args: []string{"statefulset", "nginx", serviceAccount}, args: []string{"statefulset", "nginx", serviceAccount},
}, },
{ {
object: &appsv1.StatefulSet{ object: &appsv1.StatefulSet{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
Spec: appsv1.StatefulSetSpec{ Spec: appsv1.StatefulSetSpec{
Template: v1.PodTemplateSpec{ Template: corev1.PodTemplateSpec{
Spec: v1.PodSpec{ Spec: corev1.PodSpec{
Containers: []v1.Container{ Containers: []corev1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: "nginx", Image: "nginx",
@@ -299,43 +295,40 @@ func TestSetServiceAccountRemote(t *testing.T) {
}, },
}, },
}, },
testAPIGroup: "apps", groupVersion: appsv1.SchemeGroupVersion,
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1", path: "/namespaces/test/statefulsets/nginx",
args: []string{"statefulset", "nginx", serviceAccount}, args: []string{"statefulset", "nginx", serviceAccount},
}, },
{ {
object: &batchv1.Job{ object: &batchv1.Job{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
}, },
testAPIGroup: "batch", groupVersion: batchv1.SchemeGroupVersion,
apiPrefix: "/apis", apiGroup: "batch", apiVersion: "v1", path: "/namespaces/test/jobs/nginx",
args: []string{"job", "nginx", serviceAccount}, args: []string{"job", "nginx", serviceAccount},
}, },
{ {
object: &v1.ReplicationController{ object: &corev1.ReplicationController{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
}, },
testAPIGroup: "", groupVersion: corev1.SchemeGroupVersion,
apiPrefix: "/api", apiGroup: "", apiVersion: "v1", path: "/namespaces/test/replicationcontrollers/nginx",
args: []string{"replicationcontroller", "nginx", serviceAccount}, args: []string{"replicationcontroller", "nginx", serviceAccount},
}, },
} }
for _, input := range inputs { for i, input := range inputs {
t.Run(input.apiPrefix, func(t *testing.T) { t.Run(fmt.Sprintf("%d", i), func(t *testing.T) {
groupVersion := schema.GroupVersion{Group: input.apiGroup, Version: input.apiVersion}
testapi.Default = testapi.Groups[input.testAPIGroup]
tf := cmdtesting.NewTestFactory().WithNamespace("test") tf := cmdtesting.NewTestFactory().WithNamespace("test")
defer tf.Cleanup() defer tf.Cleanup()
tf.Client = &fake.RESTClient{ tf.Client = &fake.RESTClient{
GroupVersion: groupVersion, GroupVersion: input.groupVersion,
NegotiatedSerializer: serializer.DirectCodecFactory{CodecFactory: scheme.Codecs}, NegotiatedSerializer: serializer.DirectCodecFactory{CodecFactory: scheme.Codecs},
Client: fake.CreateHTTPClient(func(req *http.Request) (*http.Response, error) { Client: fake.CreateHTTPClient(func(req *http.Request) (*http.Response, error) {
resourcePath := testapi.Default.ResourcePath(input.args[0]+"s", "test", input.args[1])
switch p, m := req.URL.Path, req.Method; { switch p, m := req.URL.Path, req.Method; {
case p == resourcePath && m == http.MethodGet: case p == input.path && m == http.MethodGet:
return &http.Response{StatusCode: http.StatusOK, Header: defaultHeader(), Body: objBody(input.object)}, nil return &http.Response{StatusCode: http.StatusOK, Header: defaultHeader(), Body: objBody(input.object)}, nil
case p == resourcePath && m == http.MethodPatch: case p == input.path && m == http.MethodPatch:
stream, err := req.GetBody() stream, err := req.GetBody()
if err != nil { if err != nil {
return nil, err return nil, err
@@ -351,7 +344,6 @@ func TestSetServiceAccountRemote(t *testing.T) {
return nil, fmt.Errorf("unexpected request") return nil, fmt.Errorf("unexpected request")
} }
}), }),
VersionedAPIPath: path.Join(input.apiPrefix, testapi.Default.GroupVersion().String()),
} }
outputFormat := "yaml" outputFormat := "yaml"