mirror of https://github.com/k3s-io/k3s
Merge pull request #69335 from seans3/set-tests-fix
kubectl set tests: remove testapi core dependencypull/58/head
k8s-ci-robot
GitHub
commit
f7df7f8a25
|
|
@ -63,7 +63,6 @@ go_test(
|
|||
],
|
||||
embed = [":go_default_library"],
|
||||
deps = [
|
||||
"//pkg/api/testapi:go_default_library",
|
||||
"//pkg/kubectl/cmd/testing:go_default_library",
|
||||
"//pkg/kubectl/cmd/util:go_default_library",
|
||||
"//pkg/kubectl/scheme:go_default_library",
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@ import (
|
|||
"fmt"
|
||||
"io/ioutil"
|
||||
"net/http"
|
||||
"path"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
|
|
@ -29,7 +28,7 @@ import (
|
|||
appsv1beta1 "k8s.io/api/apps/v1beta1"
|
||||
appsv1beta2 "k8s.io/api/apps/v1beta2"
|
||||
batchv1 "k8s.io/api/batch/v1"
|
||||
"k8s.io/api/core/v1"
|
||||
corev1 "k8s.io/api/core/v1"
|
||||
extensionsv1beta1 "k8s.io/api/extensions/v1beta1"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
|
|
@ -39,7 +38,6 @@ import (
|
|||
"k8s.io/cli-runtime/pkg/genericclioptions/resource"
|
||||
restclient "k8s.io/client-go/rest"
|
||||
"k8s.io/client-go/rest/fake"
|
||||
"k8s.io/kubernetes/pkg/api/testapi"
|
||||
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing"
|
||||
"k8s.io/kubernetes/pkg/kubectl/scheme"
|
||||
)
|
||||
|
|
@ -123,8 +121,8 @@ func TestSetEnvRemote(t *testing.T) {
|
|||
inputs := []struct {
|
||||
name string
|
||||
object runtime.Object
|
||||
apiPrefix, apiGroup, apiVersion string
|
||||
testAPIGroup string
|
||||
groupVersion schema.GroupVersion
|
||||
path string
|
||||
args []string
|
||||
}{
|
||||
{
|
||||
|
|
@ -132,9 +130,9 @@ func TestSetEnvRemote(t *testing.T) {
|
|||
object: &extensionsv1beta1.ReplicaSet{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
Spec: extensionsv1beta1.ReplicaSetSpec{
|
||||
Template: v1.PodTemplateSpec{
|
||||
Spec: v1.PodSpec{
|
||||
Containers: []v1.Container{
|
||||
Template: corev1.PodTemplateSpec{
|
||||
Spec: corev1.PodSpec{
|
||||
Containers: []corev1.Container{
|
||||
{
|
||||
Name: "nginx",
|
||||
Image: "nginx",
|
||||
|
|
@ -144,8 +142,8 @@ func TestSetEnvRemote(t *testing.T) {
|
|||
},
|
||||
},
|
||||
},
|
||||
testAPIGroup: "extensions",
|
||||
apiPrefix: "/apis", apiGroup: "extensions", apiVersion: "v1beta1",
|
||||
groupVersion: extensionsv1beta1.SchemeGroupVersion,
|
||||
path: "/namespaces/test/replicasets/nginx",
|
||||
args: []string{"replicaset", "nginx", "env=prod"},
|
||||
},
|
||||
{
|
||||
|
|
@ -153,9 +151,9 @@ func TestSetEnvRemote(t *testing.T) {
|
|||
object: &appsv1beta2.ReplicaSet{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
Spec: appsv1beta2.ReplicaSetSpec{
|
||||
Template: v1.PodTemplateSpec{
|
||||
Spec: v1.PodSpec{
|
||||
Containers: []v1.Container{
|
||||
Template: corev1.PodTemplateSpec{
|
||||
Spec: corev1.PodSpec{
|
||||
Containers: []corev1.Container{
|
||||
{
|
||||
Name: "nginx",
|
||||
Image: "nginx",
|
||||
|
|
@ -165,8 +163,8 @@ func TestSetEnvRemote(t *testing.T) {
|
|||
},
|
||||
},
|
||||
},
|
||||
testAPIGroup: "extensions",
|
||||
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1beta2",
|
||||
groupVersion: appsv1beta2.SchemeGroupVersion,
|
||||
path: "/namespaces/test/replicasets/nginx",
|
||||
args: []string{"replicaset", "nginx", "env=prod"},
|
||||
},
|
||||
{
|
||||
|
|
@ -174,9 +172,9 @@ func TestSetEnvRemote(t *testing.T) {
|
|||
object: &appsv1.ReplicaSet{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
Spec: appsv1.ReplicaSetSpec{
|
||||
Template: v1.PodTemplateSpec{
|
||||
Spec: v1.PodSpec{
|
||||
Containers: []v1.Container{
|
||||
Template: corev1.PodTemplateSpec{
|
||||
Spec: corev1.PodSpec{
|
||||
Containers: []corev1.Container{
|
||||
{
|
||||
Name: "nginx",
|
||||
Image: "nginx",
|
||||
|
|
@ -186,8 +184,8 @@ func TestSetEnvRemote(t *testing.T) {
|
|||
},
|
||||
},
|
||||
},
|
||||
testAPIGroup: "extensions",
|
||||
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1",
|
||||
groupVersion: appsv1.SchemeGroupVersion,
|
||||
path: "/namespaces/test/replicasets/nginx",
|
||||
args: []string{"replicaset", "nginx", "env=prod"},
|
||||
},
|
||||
{
|
||||
|
|
@ -195,9 +193,9 @@ func TestSetEnvRemote(t *testing.T) {
|
|||
object: &extensionsv1beta1.DaemonSet{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
Spec: extensionsv1beta1.DaemonSetSpec{
|
||||
Template: v1.PodTemplateSpec{
|
||||
Spec: v1.PodSpec{
|
||||
Containers: []v1.Container{
|
||||
Template: corev1.PodTemplateSpec{
|
||||
Spec: corev1.PodSpec{
|
||||
Containers: []corev1.Container{
|
||||
{
|
||||
Name: "nginx",
|
||||
Image: "nginx",
|
||||
|
|
@ -207,8 +205,8 @@ func TestSetEnvRemote(t *testing.T) {
|
|||
},
|
||||
},
|
||||
},
|
||||
testAPIGroup: "extensions",
|
||||
apiPrefix: "/apis", apiGroup: "extensions", apiVersion: "v1beta1",
|
||||
groupVersion: extensionsv1beta1.SchemeGroupVersion,
|
||||
path: "/namespaces/test/daemonsets/nginx",
|
||||
args: []string{"daemonset", "nginx", "env=prod"},
|
||||
},
|
||||
{
|
||||
|
|
@ -216,9 +214,9 @@ func TestSetEnvRemote(t *testing.T) {
|
|||
object: &appsv1beta2.DaemonSet{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
Spec: appsv1beta2.DaemonSetSpec{
|
||||
Template: v1.PodTemplateSpec{
|
||||
Spec: v1.PodSpec{
|
||||
Containers: []v1.Container{
|
||||
Template: corev1.PodTemplateSpec{
|
||||
Spec: corev1.PodSpec{
|
||||
Containers: []corev1.Container{
|
||||
{
|
||||
Name: "nginx",
|
||||
Image: "nginx",
|
||||
|
|
@ -228,8 +226,8 @@ func TestSetEnvRemote(t *testing.T) {
|
|||
},
|
||||
},
|
||||
},
|
||||
testAPIGroup: "extensions",
|
||||
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1beta2",
|
||||
groupVersion: appsv1beta2.SchemeGroupVersion,
|
||||
path: "/namespaces/test/daemonsets/nginx",
|
||||
args: []string{"daemonset", "nginx", "env=prod"},
|
||||
},
|
||||
{
|
||||
|
|
@ -237,9 +235,9 @@ func TestSetEnvRemote(t *testing.T) {
|
|||
object: &appsv1.DaemonSet{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
Spec: appsv1.DaemonSetSpec{
|
||||
Template: v1.PodTemplateSpec{
|
||||
Spec: v1.PodSpec{
|
||||
Containers: []v1.Container{
|
||||
Template: corev1.PodTemplateSpec{
|
||||
Spec: corev1.PodSpec{
|
||||
Containers: []corev1.Container{
|
||||
{
|
||||
Name: "nginx",
|
||||
Image: "nginx",
|
||||
|
|
@ -249,8 +247,8 @@ func TestSetEnvRemote(t *testing.T) {
|
|||
},
|
||||
},
|
||||
},
|
||||
testAPIGroup: "extensions",
|
||||
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1",
|
||||
groupVersion: appsv1.SchemeGroupVersion,
|
||||
path: "/namespaces/test/daemonsets/nginx",
|
||||
args: []string{"daemonset", "nginx", "env=prod"},
|
||||
},
|
||||
{
|
||||
|
|
@ -258,9 +256,9 @@ func TestSetEnvRemote(t *testing.T) {
|
|||
object: &extensionsv1beta1.Deployment{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
Spec: extensionsv1beta1.DeploymentSpec{
|
||||
Template: v1.PodTemplateSpec{
|
||||
Spec: v1.PodSpec{
|
||||
Containers: []v1.Container{
|
||||
Template: corev1.PodTemplateSpec{
|
||||
Spec: corev1.PodSpec{
|
||||
Containers: []corev1.Container{
|
||||
{
|
||||
Name: "nginx",
|
||||
Image: "nginx",
|
||||
|
|
@ -270,18 +268,18 @@ func TestSetEnvRemote(t *testing.T) {
|
|||
},
|
||||
},
|
||||
},
|
||||
testAPIGroup: "extensions",
|
||||
apiPrefix: "/apis", apiGroup: "extensions", apiVersion: "v1beta1",
|
||||
groupVersion: extensionsv1beta1.SchemeGroupVersion,
|
||||
path: "/namespaces/test/deployments/nginx",
|
||||
args: []string{"deployment", "nginx", "env=prod"},
|
||||
},
|
||||
{
|
||||
name: "test appsv1bta1 deployment",
|
||||
name: "test appsv1beta1 deployment",
|
||||
object: &appsv1beta1.Deployment{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
Spec: appsv1beta1.DeploymentSpec{
|
||||
Template: v1.PodTemplateSpec{
|
||||
Spec: v1.PodSpec{
|
||||
Containers: []v1.Container{
|
||||
Template: corev1.PodTemplateSpec{
|
||||
Spec: corev1.PodSpec{
|
||||
Containers: []corev1.Container{
|
||||
{
|
||||
Name: "nginx",
|
||||
Image: "nginx",
|
||||
|
|
@ -291,18 +289,18 @@ func TestSetEnvRemote(t *testing.T) {
|
|||
},
|
||||
},
|
||||
},
|
||||
testAPIGroup: "extensions",
|
||||
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1beta1",
|
||||
groupVersion: appsv1beta1.SchemeGroupVersion,
|
||||
path: "/namespaces/test/deployments/nginx",
|
||||
args: []string{"deployment", "nginx", "env=prod"},
|
||||
},
|
||||
{
|
||||
name: "test appsv1beta2n deployment",
|
||||
name: "test appsv1beta2 deployment",
|
||||
object: &appsv1beta2.Deployment{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
Spec: appsv1beta2.DeploymentSpec{
|
||||
Template: v1.PodTemplateSpec{
|
||||
Spec: v1.PodSpec{
|
||||
Containers: []v1.Container{
|
||||
Template: corev1.PodTemplateSpec{
|
||||
Spec: corev1.PodSpec{
|
||||
Containers: []corev1.Container{
|
||||
{
|
||||
Name: "nginx",
|
||||
Image: "nginx",
|
||||
|
|
@ -312,8 +310,8 @@ func TestSetEnvRemote(t *testing.T) {
|
|||
},
|
||||
},
|
||||
},
|
||||
testAPIGroup: "extensions",
|
||||
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1beta2",
|
||||
groupVersion: appsv1beta2.SchemeGroupVersion,
|
||||
path: "/namespaces/test/deployments/nginx",
|
||||
args: []string{"deployment", "nginx", "env=prod"},
|
||||
},
|
||||
{
|
||||
|
|
@ -321,9 +319,9 @@ func TestSetEnvRemote(t *testing.T) {
|
|||
object: &appsv1.Deployment{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
Spec: appsv1.DeploymentSpec{
|
||||
Template: v1.PodTemplateSpec{
|
||||
Spec: v1.PodSpec{
|
||||
Containers: []v1.Container{
|
||||
Template: corev1.PodTemplateSpec{
|
||||
Spec: corev1.PodSpec{
|
||||
Containers: []corev1.Container{
|
||||
{
|
||||
Name: "nginx",
|
||||
Image: "nginx",
|
||||
|
|
@ -333,8 +331,8 @@ func TestSetEnvRemote(t *testing.T) {
|
|||
},
|
||||
},
|
||||
},
|
||||
testAPIGroup: "extensions",
|
||||
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1",
|
||||
groupVersion: appsv1.SchemeGroupVersion,
|
||||
path: "/namespaces/test/deployments/nginx",
|
||||
args: []string{"deployment", "nginx", "env=prod"},
|
||||
},
|
||||
{
|
||||
|
|
@ -342,9 +340,9 @@ func TestSetEnvRemote(t *testing.T) {
|
|||
object: &appsv1beta1.StatefulSet{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
Spec: appsv1beta1.StatefulSetSpec{
|
||||
Template: v1.PodTemplateSpec{
|
||||
Spec: v1.PodSpec{
|
||||
Containers: []v1.Container{
|
||||
Template: corev1.PodTemplateSpec{
|
||||
Spec: corev1.PodSpec{
|
||||
Containers: []corev1.Container{
|
||||
{
|
||||
Name: "nginx",
|
||||
Image: "nginx",
|
||||
|
|
@ -354,8 +352,8 @@ func TestSetEnvRemote(t *testing.T) {
|
|||
},
|
||||
},
|
||||
},
|
||||
testAPIGroup: "apps",
|
||||
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1beta1",
|
||||
groupVersion: appsv1beta1.SchemeGroupVersion,
|
||||
path: "/namespaces/test/statefulsets/nginx",
|
||||
args: []string{"statefulset", "nginx", "env=prod"},
|
||||
},
|
||||
{
|
||||
|
|
@ -363,9 +361,9 @@ func TestSetEnvRemote(t *testing.T) {
|
|||
object: &appsv1beta2.StatefulSet{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
Spec: appsv1beta2.StatefulSetSpec{
|
||||
Template: v1.PodTemplateSpec{
|
||||
Spec: v1.PodSpec{
|
||||
Containers: []v1.Container{
|
||||
Template: corev1.PodTemplateSpec{
|
||||
Spec: corev1.PodSpec{
|
||||
Containers: []corev1.Container{
|
||||
{
|
||||
Name: "nginx",
|
||||
Image: "nginx",
|
||||
|
|
@ -375,8 +373,8 @@ func TestSetEnvRemote(t *testing.T) {
|
|||
},
|
||||
},
|
||||
},
|
||||
testAPIGroup: "apps",
|
||||
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1beta2",
|
||||
groupVersion: appsv1beta2.SchemeGroupVersion,
|
||||
path: "/namespaces/test/statefulsets/nginx",
|
||||
args: []string{"statefulset", "nginx", "env=prod"},
|
||||
},
|
||||
{
|
||||
|
|
@ -384,9 +382,9 @@ func TestSetEnvRemote(t *testing.T) {
|
|||
object: &appsv1.StatefulSet{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
Spec: appsv1.StatefulSetSpec{
|
||||
Template: v1.PodTemplateSpec{
|
||||
Spec: v1.PodSpec{
|
||||
Containers: []v1.Container{
|
||||
Template: corev1.PodTemplateSpec{
|
||||
Spec: corev1.PodSpec{
|
||||
Containers: []corev1.Container{
|
||||
{
|
||||
Name: "nginx",
|
||||
Image: "nginx",
|
||||
|
|
@ -396,17 +394,18 @@ func TestSetEnvRemote(t *testing.T) {
|
|||
},
|
||||
},
|
||||
},
|
||||
testAPIGroup: "apps",
|
||||
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1",
|
||||
groupVersion: appsv1.SchemeGroupVersion,
|
||||
path: "/namespaces/test/statefulsets/nginx",
|
||||
args: []string{"statefulset", "nginx", "env=prod"},
|
||||
},
|
||||
{
|
||||
name: "test batchv1 Job",
|
||||
object: &batchv1.Job{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
Spec: batchv1.JobSpec{
|
||||
Template: v1.PodTemplateSpec{
|
||||
Spec: v1.PodSpec{
|
||||
Containers: []v1.Container{
|
||||
Template: corev1.PodTemplateSpec{
|
||||
Spec: corev1.PodSpec{
|
||||
Containers: []corev1.Container{
|
||||
{
|
||||
Name: "nginx",
|
||||
Image: "nginx",
|
||||
|
|
@ -416,17 +415,18 @@ func TestSetEnvRemote(t *testing.T) {
|
|||
},
|
||||
},
|
||||
},
|
||||
testAPIGroup: "batch",
|
||||
apiPrefix: "/apis", apiGroup: "batch", apiVersion: "v1",
|
||||
groupVersion: batchv1.SchemeGroupVersion,
|
||||
path: "/namespaces/test/jobs/nginx",
|
||||
args: []string{"job", "nginx", "env=prod"},
|
||||
},
|
||||
{
|
||||
object: &v1.ReplicationController{
|
||||
name: "test corev1 replication controller",
|
||||
object: &corev1.ReplicationController{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
Spec: v1.ReplicationControllerSpec{
|
||||
Template: &v1.PodTemplateSpec{
|
||||
Spec: v1.PodSpec{
|
||||
Containers: []v1.Container{
|
||||
Spec: corev1.ReplicationControllerSpec{
|
||||
Template: &corev1.PodTemplateSpec{
|
||||
Spec: corev1.PodSpec{
|
||||
Containers: []corev1.Container{
|
||||
{
|
||||
Name: "nginx",
|
||||
Image: "nginx",
|
||||
|
|
@ -436,28 +436,24 @@ func TestSetEnvRemote(t *testing.T) {
|
|||
},
|
||||
},
|
||||
},
|
||||
testAPIGroup: "",
|
||||
apiPrefix: "/api", apiGroup: "", apiVersion: "v1",
|
||||
groupVersion: corev1.SchemeGroupVersion,
|
||||
path: "/namespaces/test/replicationcontrollers/nginx",
|
||||
args: []string{"replicationcontroller", "nginx", "env=prod"},
|
||||
},
|
||||
}
|
||||
for _, input := range inputs {
|
||||
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.ClientConfigVal = &restclient.Config{ContentConfig: restclient.ContentConfig{GroupVersion: &schema.GroupVersion{Version: ""}}}
|
||||
defer tf.Cleanup()
|
||||
|
||||
tf.Client = &fake.RESTClient{
|
||||
GroupVersion: groupVersion,
|
||||
GroupVersion: input.groupVersion,
|
||||
NegotiatedSerializer: serializer.DirectCodecFactory{CodecFactory: scheme.Codecs},
|
||||
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; {
|
||||
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
|
||||
case p == resourcePath && m == http.MethodPatch:
|
||||
case p == input.path && m == http.MethodPatch:
|
||||
stream, err := req.GetBody()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
|
@ -473,7 +469,6 @@ func TestSetEnvRemote(t *testing.T) {
|
|||
return nil, fmt.Errorf("unexpected request")
|
||||
}
|
||||
}),
|
||||
VersionedAPIPath: path.Join(input.apiPrefix, testapi.Default.GroupVersion().String()),
|
||||
}
|
||||
|
||||
outputFormat := "yaml"
|
||||
|
|
@ -491,7 +486,7 @@ func TestSetEnvRemote(t *testing.T) {
|
|||
}
|
||||
|
||||
func TestSetEnvFromResource(t *testing.T) {
|
||||
mockConfigMap := &v1.ConfigMap{
|
||||
mockConfigMap := &corev1.ConfigMap{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "testconfigmap"},
|
||||
Data: map[string]string{
|
||||
"env": "prod",
|
||||
|
|
@ -500,7 +495,7 @@ func TestSetEnvFromResource(t *testing.T) {
|
|||
},
|
||||
}
|
||||
|
||||
mockSecret := &v1.Secret{
|
||||
mockSecret := &corev1.Secret{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "testsecret"},
|
||||
Data: map[string][]byte{
|
||||
"env": []byte("prod"),
|
||||
|
|
@ -569,9 +564,9 @@ func TestSetEnvFromResource(t *testing.T) {
|
|||
mockDeployment := &appsv1.Deployment{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
Spec: appsv1.DeploymentSpec{
|
||||
Template: v1.PodTemplateSpec{
|
||||
Spec: v1.PodSpec{
|
||||
Containers: []v1.Container{
|
||||
Template: corev1.PodTemplateSpec{
|
||||
Spec: corev1.PodSpec{
|
||||
Containers: []corev1.Container{
|
||||
{
|
||||
Name: "nginx",
|
||||
Image: "nginx",
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@ import (
|
|||
"fmt"
|
||||
"io/ioutil"
|
||||
"net/http"
|
||||
"path"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
|
|
@ -30,7 +29,7 @@ import (
|
|||
appsv1beta1 "k8s.io/api/apps/v1beta1"
|
||||
appsv1beta2 "k8s.io/api/apps/v1beta2"
|
||||
batchv1 "k8s.io/api/batch/v1"
|
||||
"k8s.io/api/core/v1"
|
||||
corev1 "k8s.io/api/core/v1"
|
||||
extensionsv1beta1 "k8s.io/api/extensions/v1beta1"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
|
|
@ -40,7 +39,6 @@ import (
|
|||
"k8s.io/cli-runtime/pkg/genericclioptions/resource"
|
||||
restclient "k8s.io/client-go/rest"
|
||||
"k8s.io/client-go/rest/fake"
|
||||
"k8s.io/kubernetes/pkg/api/testapi"
|
||||
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing"
|
||||
"k8s.io/kubernetes/pkg/kubectl/scheme"
|
||||
)
|
||||
|
|
@ -206,8 +204,8 @@ func TestSetImageRemote(t *testing.T) {
|
|||
inputs := []struct {
|
||||
name string
|
||||
object runtime.Object
|
||||
apiPrefix, apiGroup, apiVersion string
|
||||
testAPIGroup string
|
||||
groupVersion schema.GroupVersion
|
||||
path string
|
||||
args []string
|
||||
}{
|
||||
{
|
||||
|
|
@ -215,9 +213,9 @@ func TestSetImageRemote(t *testing.T) {
|
|||
object: &extensionsv1beta1.ReplicaSet{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
Spec: extensionsv1beta1.ReplicaSetSpec{
|
||||
Template: v1.PodTemplateSpec{
|
||||
Spec: v1.PodSpec{
|
||||
Containers: []v1.Container{
|
||||
Template: corev1.PodTemplateSpec{
|
||||
Spec: corev1.PodSpec{
|
||||
Containers: []corev1.Container{
|
||||
{
|
||||
Name: "nginx",
|
||||
Image: "nginx",
|
||||
|
|
@ -227,8 +225,8 @@ func TestSetImageRemote(t *testing.T) {
|
|||
},
|
||||
},
|
||||
},
|
||||
testAPIGroup: "extensions",
|
||||
apiPrefix: "/apis", apiGroup: "extensions", apiVersion: "v1beta1",
|
||||
groupVersion: extensionsv1beta1.SchemeGroupVersion,
|
||||
path: "/namespaces/test/replicasets/nginx",
|
||||
args: []string{"replicaset", "nginx", "*=thingy"},
|
||||
},
|
||||
{
|
||||
|
|
@ -236,9 +234,9 @@ func TestSetImageRemote(t *testing.T) {
|
|||
object: &appsv1beta2.ReplicaSet{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
Spec: appsv1beta2.ReplicaSetSpec{
|
||||
Template: v1.PodTemplateSpec{
|
||||
Spec: v1.PodSpec{
|
||||
Containers: []v1.Container{
|
||||
Template: corev1.PodTemplateSpec{
|
||||
Spec: corev1.PodSpec{
|
||||
Containers: []corev1.Container{
|
||||
{
|
||||
Name: "nginx",
|
||||
Image: "nginx",
|
||||
|
|
@ -248,8 +246,8 @@ func TestSetImageRemote(t *testing.T) {
|
|||
},
|
||||
},
|
||||
},
|
||||
testAPIGroup: "extensions",
|
||||
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1beta2",
|
||||
groupVersion: appsv1beta2.SchemeGroupVersion,
|
||||
path: "/namespaces/test/replicasets/nginx",
|
||||
args: []string{"replicaset", "nginx", "*=thingy"},
|
||||
},
|
||||
{
|
||||
|
|
@ -257,9 +255,9 @@ func TestSetImageRemote(t *testing.T) {
|
|||
object: &appsv1.ReplicaSet{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
Spec: appsv1.ReplicaSetSpec{
|
||||
Template: v1.PodTemplateSpec{
|
||||
Spec: v1.PodSpec{
|
||||
Containers: []v1.Container{
|
||||
Template: corev1.PodTemplateSpec{
|
||||
Spec: corev1.PodSpec{
|
||||
Containers: []corev1.Container{
|
||||
{
|
||||
Name: "nginx",
|
||||
Image: "nginx",
|
||||
|
|
@ -269,8 +267,8 @@ func TestSetImageRemote(t *testing.T) {
|
|||
},
|
||||
},
|
||||
},
|
||||
testAPIGroup: "extensions",
|
||||
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1",
|
||||
groupVersion: appsv1.SchemeGroupVersion,
|
||||
path: "/namespaces/test/replicasets/nginx",
|
||||
args: []string{"replicaset", "nginx", "*=thingy"},
|
||||
},
|
||||
{
|
||||
|
|
@ -278,9 +276,9 @@ func TestSetImageRemote(t *testing.T) {
|
|||
object: &extensionsv1beta1.DaemonSet{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
Spec: extensionsv1beta1.DaemonSetSpec{
|
||||
Template: v1.PodTemplateSpec{
|
||||
Spec: v1.PodSpec{
|
||||
Containers: []v1.Container{
|
||||
Template: corev1.PodTemplateSpec{
|
||||
Spec: corev1.PodSpec{
|
||||
Containers: []corev1.Container{
|
||||
{
|
||||
Name: "nginx",
|
||||
Image: "nginx",
|
||||
|
|
@ -290,8 +288,8 @@ func TestSetImageRemote(t *testing.T) {
|
|||
},
|
||||
},
|
||||
},
|
||||
testAPIGroup: "extensions",
|
||||
apiPrefix: "/apis", apiGroup: "extensions", apiVersion: "v1beta1",
|
||||
groupVersion: extensionsv1beta1.SchemeGroupVersion,
|
||||
path: "/namespaces/test/daemonsets/nginx",
|
||||
args: []string{"daemonset", "nginx", "*=thingy"},
|
||||
},
|
||||
{
|
||||
|
|
@ -299,9 +297,9 @@ func TestSetImageRemote(t *testing.T) {
|
|||
object: &appsv1beta2.DaemonSet{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
Spec: appsv1beta2.DaemonSetSpec{
|
||||
Template: v1.PodTemplateSpec{
|
||||
Spec: v1.PodSpec{
|
||||
Containers: []v1.Container{
|
||||
Template: corev1.PodTemplateSpec{
|
||||
Spec: corev1.PodSpec{
|
||||
Containers: []corev1.Container{
|
||||
{
|
||||
Name: "nginx",
|
||||
Image: "nginx",
|
||||
|
|
@ -311,8 +309,8 @@ func TestSetImageRemote(t *testing.T) {
|
|||
},
|
||||
},
|
||||
},
|
||||
testAPIGroup: "extensions",
|
||||
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1beta2",
|
||||
groupVersion: appsv1beta2.SchemeGroupVersion,
|
||||
path: "/namespaces/test/daemonsets/nginx",
|
||||
args: []string{"daemonset", "nginx", "*=thingy"},
|
||||
},
|
||||
{
|
||||
|
|
@ -320,9 +318,9 @@ func TestSetImageRemote(t *testing.T) {
|
|||
object: &appsv1.DaemonSet{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
Spec: appsv1.DaemonSetSpec{
|
||||
Template: v1.PodTemplateSpec{
|
||||
Spec: v1.PodSpec{
|
||||
Containers: []v1.Container{
|
||||
Template: corev1.PodTemplateSpec{
|
||||
Spec: corev1.PodSpec{
|
||||
Containers: []corev1.Container{
|
||||
{
|
||||
Name: "nginx",
|
||||
Image: "nginx",
|
||||
|
|
@ -332,8 +330,8 @@ func TestSetImageRemote(t *testing.T) {
|
|||
},
|
||||
},
|
||||
},
|
||||
testAPIGroup: "extensions",
|
||||
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1",
|
||||
groupVersion: appsv1.SchemeGroupVersion,
|
||||
path: "/namespaces/test/daemonsets/nginx",
|
||||
args: []string{"daemonset", "nginx", "*=thingy"},
|
||||
},
|
||||
{
|
||||
|
|
@ -341,9 +339,9 @@ func TestSetImageRemote(t *testing.T) {
|
|||
object: &extensionsv1beta1.Deployment{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
Spec: extensionsv1beta1.DeploymentSpec{
|
||||
Template: v1.PodTemplateSpec{
|
||||
Spec: v1.PodSpec{
|
||||
Containers: []v1.Container{
|
||||
Template: corev1.PodTemplateSpec{
|
||||
Spec: corev1.PodSpec{
|
||||
Containers: []corev1.Container{
|
||||
{
|
||||
Name: "nginx",
|
||||
Image: "nginx",
|
||||
|
|
@ -353,8 +351,8 @@ func TestSetImageRemote(t *testing.T) {
|
|||
},
|
||||
},
|
||||
},
|
||||
testAPIGroup: "extensions",
|
||||
apiPrefix: "/apis", apiGroup: "extensions", apiVersion: "v1beta1",
|
||||
groupVersion: extensionsv1beta1.SchemeGroupVersion,
|
||||
path: "/namespaces/test/deployments/nginx",
|
||||
args: []string{"deployment", "nginx", "*=thingy"},
|
||||
},
|
||||
{
|
||||
|
|
@ -362,9 +360,9 @@ func TestSetImageRemote(t *testing.T) {
|
|||
object: &appsv1beta1.Deployment{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
Spec: appsv1beta1.DeploymentSpec{
|
||||
Template: v1.PodTemplateSpec{
|
||||
Spec: v1.PodSpec{
|
||||
Containers: []v1.Container{
|
||||
Template: corev1.PodTemplateSpec{
|
||||
Spec: corev1.PodSpec{
|
||||
Containers: []corev1.Container{
|
||||
{
|
||||
Name: "nginx",
|
||||
Image: "nginx",
|
||||
|
|
@ -374,8 +372,8 @@ func TestSetImageRemote(t *testing.T) {
|
|||
},
|
||||
},
|
||||
},
|
||||
testAPIGroup: "extensions",
|
||||
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1beta1",
|
||||
groupVersion: appsv1beta1.SchemeGroupVersion,
|
||||
path: "/namespaces/test/deployments/nginx",
|
||||
args: []string{"deployment", "nginx", "*=thingy"},
|
||||
},
|
||||
{
|
||||
|
|
@ -383,9 +381,9 @@ func TestSetImageRemote(t *testing.T) {
|
|||
object: &appsv1beta2.Deployment{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
Spec: appsv1beta2.DeploymentSpec{
|
||||
Template: v1.PodTemplateSpec{
|
||||
Spec: v1.PodSpec{
|
||||
Containers: []v1.Container{
|
||||
Template: corev1.PodTemplateSpec{
|
||||
Spec: corev1.PodSpec{
|
||||
Containers: []corev1.Container{
|
||||
{
|
||||
Name: "nginx",
|
||||
Image: "nginx",
|
||||
|
|
@ -395,8 +393,8 @@ func TestSetImageRemote(t *testing.T) {
|
|||
},
|
||||
},
|
||||
},
|
||||
testAPIGroup: "extensions",
|
||||
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1beta2",
|
||||
groupVersion: appsv1beta2.SchemeGroupVersion,
|
||||
path: "/namespaces/test/deployments/nginx",
|
||||
args: []string{"deployment", "nginx", "*=thingy"},
|
||||
},
|
||||
{
|
||||
|
|
@ -404,9 +402,9 @@ func TestSetImageRemote(t *testing.T) {
|
|||
object: &appsv1.Deployment{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
Spec: appsv1.DeploymentSpec{
|
||||
Template: v1.PodTemplateSpec{
|
||||
Spec: v1.PodSpec{
|
||||
Containers: []v1.Container{
|
||||
Template: corev1.PodTemplateSpec{
|
||||
Spec: corev1.PodSpec{
|
||||
Containers: []corev1.Container{
|
||||
{
|
||||
Name: "nginx",
|
||||
Image: "nginx",
|
||||
|
|
@ -416,8 +414,8 @@ func TestSetImageRemote(t *testing.T) {
|
|||
},
|
||||
},
|
||||
},
|
||||
testAPIGroup: "extensions",
|
||||
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1",
|
||||
groupVersion: appsv1.SchemeGroupVersion,
|
||||
path: "/namespaces/test/deployments/nginx",
|
||||
args: []string{"deployment", "nginx", "*=thingy"},
|
||||
},
|
||||
{
|
||||
|
|
@ -425,9 +423,9 @@ func TestSetImageRemote(t *testing.T) {
|
|||
object: &appsv1beta1.StatefulSet{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
Spec: appsv1beta1.StatefulSetSpec{
|
||||
Template: v1.PodTemplateSpec{
|
||||
Spec: v1.PodSpec{
|
||||
Containers: []v1.Container{
|
||||
Template: corev1.PodTemplateSpec{
|
||||
Spec: corev1.PodSpec{
|
||||
Containers: []corev1.Container{
|
||||
{
|
||||
Name: "nginx",
|
||||
Image: "nginx",
|
||||
|
|
@ -437,8 +435,8 @@ func TestSetImageRemote(t *testing.T) {
|
|||
},
|
||||
},
|
||||
},
|
||||
testAPIGroup: "apps",
|
||||
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1beta1",
|
||||
groupVersion: appsv1beta1.SchemeGroupVersion,
|
||||
path: "/namespaces/test/statefulsets/nginx",
|
||||
args: []string{"statefulset", "nginx", "*=thingy"},
|
||||
},
|
||||
{
|
||||
|
|
@ -446,9 +444,9 @@ func TestSetImageRemote(t *testing.T) {
|
|||
object: &appsv1beta2.StatefulSet{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
Spec: appsv1beta2.StatefulSetSpec{
|
||||
Template: v1.PodTemplateSpec{
|
||||
Spec: v1.PodSpec{
|
||||
Containers: []v1.Container{
|
||||
Template: corev1.PodTemplateSpec{
|
||||
Spec: corev1.PodSpec{
|
||||
Containers: []corev1.Container{
|
||||
{
|
||||
Name: "nginx",
|
||||
Image: "nginx",
|
||||
|
|
@ -458,8 +456,8 @@ func TestSetImageRemote(t *testing.T) {
|
|||
},
|
||||
},
|
||||
},
|
||||
testAPIGroup: "apps",
|
||||
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1beta2",
|
||||
groupVersion: appsv1beta2.SchemeGroupVersion,
|
||||
path: "/namespaces/test/statefulsets/nginx",
|
||||
args: []string{"statefulset", "nginx", "*=thingy"},
|
||||
},
|
||||
{
|
||||
|
|
@ -467,9 +465,9 @@ func TestSetImageRemote(t *testing.T) {
|
|||
object: &appsv1.StatefulSet{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
Spec: appsv1.StatefulSetSpec{
|
||||
Template: v1.PodTemplateSpec{
|
||||
Spec: v1.PodSpec{
|
||||
Containers: []v1.Container{
|
||||
Template: corev1.PodTemplateSpec{
|
||||
Spec: corev1.PodSpec{
|
||||
Containers: []corev1.Container{
|
||||
{
|
||||
Name: "nginx",
|
||||
Image: "nginx",
|
||||
|
|
@ -479,8 +477,8 @@ func TestSetImageRemote(t *testing.T) {
|
|||
},
|
||||
},
|
||||
},
|
||||
testAPIGroup: "apps",
|
||||
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1",
|
||||
groupVersion: appsv1.SchemeGroupVersion,
|
||||
path: "/namespaces/test/statefulsets/nginx",
|
||||
args: []string{"statefulset", "nginx", "*=thingy"},
|
||||
},
|
||||
{
|
||||
|
|
@ -488,9 +486,9 @@ func TestSetImageRemote(t *testing.T) {
|
|||
object: &batchv1.Job{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
Spec: batchv1.JobSpec{
|
||||
Template: v1.PodTemplateSpec{
|
||||
Spec: v1.PodSpec{
|
||||
Containers: []v1.Container{
|
||||
Template: corev1.PodTemplateSpec{
|
||||
Spec: corev1.PodSpec{
|
||||
Containers: []corev1.Container{
|
||||
{
|
||||
Name: "nginx",
|
||||
Image: "nginx",
|
||||
|
|
@ -500,18 +498,18 @@ func TestSetImageRemote(t *testing.T) {
|
|||
},
|
||||
},
|
||||
},
|
||||
testAPIGroup: "batch",
|
||||
apiPrefix: "/apis", apiGroup: "batch", apiVersion: "v1",
|
||||
groupVersion: batchv1.SchemeGroupVersion,
|
||||
path: "/namespaces/test/jobs/nginx",
|
||||
args: []string{"job", "nginx", "*=thingy"},
|
||||
},
|
||||
{
|
||||
name: "set image v1.ReplicationController",
|
||||
object: &v1.ReplicationController{
|
||||
name: "set image corev1.ReplicationController",
|
||||
object: &corev1.ReplicationController{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
Spec: v1.ReplicationControllerSpec{
|
||||
Template: &v1.PodTemplateSpec{
|
||||
Spec: v1.PodSpec{
|
||||
Containers: []v1.Container{
|
||||
Spec: corev1.ReplicationControllerSpec{
|
||||
Template: &corev1.PodTemplateSpec{
|
||||
Spec: corev1.PodSpec{
|
||||
Containers: []corev1.Container{
|
||||
{
|
||||
Name: "nginx",
|
||||
Image: "nginx",
|
||||
|
|
@ -521,27 +519,24 @@ func TestSetImageRemote(t *testing.T) {
|
|||
},
|
||||
},
|
||||
},
|
||||
testAPIGroup: "",
|
||||
apiPrefix: "/api", apiGroup: "", apiVersion: "v1",
|
||||
groupVersion: corev1.SchemeGroupVersion,
|
||||
path: "/namespaces/test/replicationcontrollers/nginx",
|
||||
args: []string{"replicationcontroller", "nginx", "*=thingy"},
|
||||
},
|
||||
}
|
||||
for _, input := range inputs {
|
||||
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")
|
||||
defer tf.Cleanup()
|
||||
|
||||
tf.Client = &fake.RESTClient{
|
||||
GroupVersion: groupVersion,
|
||||
GroupVersion: input.groupVersion,
|
||||
NegotiatedSerializer: serializer.DirectCodecFactory{CodecFactory: scheme.Codecs},
|
||||
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; {
|
||||
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
|
||||
case p == resourcePath && m == http.MethodPatch:
|
||||
case p == input.path && m == http.MethodPatch:
|
||||
stream, err := req.GetBody()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
|
@ -557,7 +552,6 @@ func TestSetImageRemote(t *testing.T) {
|
|||
return nil, fmt.Errorf("unexpected request")
|
||||
}
|
||||
}),
|
||||
VersionedAPIPath: path.Join(input.apiPrefix, testapi.Default.GroupVersion().String()),
|
||||
}
|
||||
|
||||
outputFormat := "yaml"
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@ import (
|
|||
"fmt"
|
||||
"io/ioutil"
|
||||
"net/http"
|
||||
"path"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
|
|
@ -29,7 +28,7 @@ import (
|
|||
appsv1beta1 "k8s.io/api/apps/v1beta1"
|
||||
appsv1beta2 "k8s.io/api/apps/v1beta2"
|
||||
batchv1 "k8s.io/api/batch/v1"
|
||||
"k8s.io/api/core/v1"
|
||||
corev1 "k8s.io/api/core/v1"
|
||||
extensionsv1beta1 "k8s.io/api/extensions/v1beta1"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
|
|
@ -39,7 +38,6 @@ import (
|
|||
"k8s.io/cli-runtime/pkg/genericclioptions/resource"
|
||||
restclient "k8s.io/client-go/rest"
|
||||
"k8s.io/client-go/rest/fake"
|
||||
"k8s.io/kubernetes/pkg/api/testapi"
|
||||
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing"
|
||||
"k8s.io/kubernetes/pkg/kubectl/scheme"
|
||||
)
|
||||
|
|
@ -143,18 +141,20 @@ func TestSetMultiResourcesLimitsLocal(t *testing.T) {
|
|||
|
||||
func TestSetResourcesRemote(t *testing.T) {
|
||||
inputs := []struct {
|
||||
name string
|
||||
object runtime.Object
|
||||
apiPrefix, apiGroup, apiVersion string
|
||||
testAPIGroup string
|
||||
groupVersion schema.GroupVersion
|
||||
path string
|
||||
args []string
|
||||
}{
|
||||
{
|
||||
name: "set image extensionsv1beta1 ReplicaSet",
|
||||
object: &extensionsv1beta1.ReplicaSet{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
Spec: extensionsv1beta1.ReplicaSetSpec{
|
||||
Template: v1.PodTemplateSpec{
|
||||
Spec: v1.PodSpec{
|
||||
Containers: []v1.Container{
|
||||
Template: corev1.PodTemplateSpec{
|
||||
Spec: corev1.PodSpec{
|
||||
Containers: []corev1.Container{
|
||||
{
|
||||
Name: "nginx",
|
||||
Image: "nginx",
|
||||
|
|
@ -164,17 +164,18 @@ func TestSetResourcesRemote(t *testing.T) {
|
|||
},
|
||||
},
|
||||
},
|
||||
testAPIGroup: "extensions",
|
||||
apiPrefix: "/apis", apiGroup: "extensions", apiVersion: "v1beta1",
|
||||
groupVersion: extensionsv1beta1.SchemeGroupVersion,
|
||||
path: "/namespaces/test/replicasets/nginx",
|
||||
args: []string{"replicaset", "nginx"},
|
||||
},
|
||||
{
|
||||
name: "set image appsv1beta2 ReplicaSet",
|
||||
object: &appsv1beta2.ReplicaSet{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
Spec: appsv1beta2.ReplicaSetSpec{
|
||||
Template: v1.PodTemplateSpec{
|
||||
Spec: v1.PodSpec{
|
||||
Containers: []v1.Container{
|
||||
Template: corev1.PodTemplateSpec{
|
||||
Spec: corev1.PodSpec{
|
||||
Containers: []corev1.Container{
|
||||
{
|
||||
Name: "nginx",
|
||||
Image: "nginx",
|
||||
|
|
@ -184,17 +185,18 @@ func TestSetResourcesRemote(t *testing.T) {
|
|||
},
|
||||
},
|
||||
},
|
||||
testAPIGroup: "extensions",
|
||||
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1beta2",
|
||||
groupVersion: appsv1beta2.SchemeGroupVersion,
|
||||
path: "/namespaces/test/replicasets/nginx",
|
||||
args: []string{"replicaset", "nginx"},
|
||||
},
|
||||
{
|
||||
name: "set image appsv1 ReplicaSet",
|
||||
object: &appsv1.ReplicaSet{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
Spec: appsv1.ReplicaSetSpec{
|
||||
Template: v1.PodTemplateSpec{
|
||||
Spec: v1.PodSpec{
|
||||
Containers: []v1.Container{
|
||||
Template: corev1.PodTemplateSpec{
|
||||
Spec: corev1.PodSpec{
|
||||
Containers: []corev1.Container{
|
||||
{
|
||||
Name: "nginx",
|
||||
Image: "nginx",
|
||||
|
|
@ -204,17 +206,18 @@ func TestSetResourcesRemote(t *testing.T) {
|
|||
},
|
||||
},
|
||||
},
|
||||
testAPIGroup: "extensions",
|
||||
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1",
|
||||
groupVersion: appsv1.SchemeGroupVersion,
|
||||
path: "/namespaces/test/replicasets/nginx",
|
||||
args: []string{"replicaset", "nginx"},
|
||||
},
|
||||
{
|
||||
name: "set image extensionsv1beta1 DaemonSet",
|
||||
object: &extensionsv1beta1.DaemonSet{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
Spec: extensionsv1beta1.DaemonSetSpec{
|
||||
Template: v1.PodTemplateSpec{
|
||||
Spec: v1.PodSpec{
|
||||
Containers: []v1.Container{
|
||||
Template: corev1.PodTemplateSpec{
|
||||
Spec: corev1.PodSpec{
|
||||
Containers: []corev1.Container{
|
||||
{
|
||||
Name: "nginx",
|
||||
Image: "nginx",
|
||||
|
|
@ -224,17 +227,18 @@ func TestSetResourcesRemote(t *testing.T) {
|
|||
},
|
||||
},
|
||||
},
|
||||
testAPIGroup: "extensions",
|
||||
apiPrefix: "/apis", apiGroup: "extensions", apiVersion: "v1beta1",
|
||||
groupVersion: extensionsv1beta1.SchemeGroupVersion,
|
||||
path: "/namespaces/test/daemonsets/nginx",
|
||||
args: []string{"daemonset", "nginx"},
|
||||
},
|
||||
{
|
||||
name: "set image appsv1beta2 DaemonSet",
|
||||
object: &appsv1beta2.DaemonSet{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
Spec: appsv1beta2.DaemonSetSpec{
|
||||
Template: v1.PodTemplateSpec{
|
||||
Spec: v1.PodSpec{
|
||||
Containers: []v1.Container{
|
||||
Template: corev1.PodTemplateSpec{
|
||||
Spec: corev1.PodSpec{
|
||||
Containers: []corev1.Container{
|
||||
{
|
||||
Name: "nginx",
|
||||
Image: "nginx",
|
||||
|
|
@ -244,17 +248,18 @@ func TestSetResourcesRemote(t *testing.T) {
|
|||
},
|
||||
},
|
||||
},
|
||||
testAPIGroup: "extensions",
|
||||
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1beta2",
|
||||
groupVersion: appsv1beta2.SchemeGroupVersion,
|
||||
path: "/namespaces/test/daemonsets/nginx",
|
||||
args: []string{"daemonset", "nginx"},
|
||||
},
|
||||
{
|
||||
name: "set image appsv1 DaemonSet",
|
||||
object: &appsv1.DaemonSet{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
Spec: appsv1.DaemonSetSpec{
|
||||
Template: v1.PodTemplateSpec{
|
||||
Spec: v1.PodSpec{
|
||||
Containers: []v1.Container{
|
||||
Template: corev1.PodTemplateSpec{
|
||||
Spec: corev1.PodSpec{
|
||||
Containers: []corev1.Container{
|
||||
{
|
||||
Name: "nginx",
|
||||
Image: "nginx",
|
||||
|
|
@ -264,17 +269,18 @@ func TestSetResourcesRemote(t *testing.T) {
|
|||
},
|
||||
},
|
||||
},
|
||||
testAPIGroup: "extensions",
|
||||
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1",
|
||||
groupVersion: appsv1.SchemeGroupVersion,
|
||||
path: "/namespaces/test/daemonsets/nginx",
|
||||
args: []string{"daemonset", "nginx"},
|
||||
},
|
||||
{
|
||||
name: "set image extensionsv1beta1 Deployment",
|
||||
object: &extensionsv1beta1.Deployment{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
Spec: extensionsv1beta1.DeploymentSpec{
|
||||
Template: v1.PodTemplateSpec{
|
||||
Spec: v1.PodSpec{
|
||||
Containers: []v1.Container{
|
||||
Template: corev1.PodTemplateSpec{
|
||||
Spec: corev1.PodSpec{
|
||||
Containers: []corev1.Container{
|
||||
{
|
||||
Name: "nginx",
|
||||
Image: "nginx",
|
||||
|
|
@ -284,17 +290,18 @@ func TestSetResourcesRemote(t *testing.T) {
|
|||
},
|
||||
},
|
||||
},
|
||||
testAPIGroup: "extensions",
|
||||
apiPrefix: "/apis", apiGroup: "extensions", apiVersion: "v1beta1",
|
||||
groupVersion: extensionsv1beta1.SchemeGroupVersion,
|
||||
path: "/namespaces/test/deployments/nginx",
|
||||
args: []string{"deployment", "nginx"},
|
||||
},
|
||||
{
|
||||
name: "set image appsv1beta1 Deployment",
|
||||
object: &appsv1beta1.Deployment{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
Spec: appsv1beta1.DeploymentSpec{
|
||||
Template: v1.PodTemplateSpec{
|
||||
Spec: v1.PodSpec{
|
||||
Containers: []v1.Container{
|
||||
Template: corev1.PodTemplateSpec{
|
||||
Spec: corev1.PodSpec{
|
||||
Containers: []corev1.Container{
|
||||
{
|
||||
Name: "nginx",
|
||||
Image: "nginx",
|
||||
|
|
@ -304,17 +311,18 @@ func TestSetResourcesRemote(t *testing.T) {
|
|||
},
|
||||
},
|
||||
},
|
||||
testAPIGroup: "extensions",
|
||||
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1beta1",
|
||||
groupVersion: appsv1beta1.SchemeGroupVersion,
|
||||
path: "/namespaces/test/deployments/nginx",
|
||||
args: []string{"deployment", "nginx"},
|
||||
},
|
||||
{
|
||||
name: "set image appsv1beta2 Deployment",
|
||||
object: &appsv1beta2.Deployment{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
Spec: appsv1beta2.DeploymentSpec{
|
||||
Template: v1.PodTemplateSpec{
|
||||
Spec: v1.PodSpec{
|
||||
Containers: []v1.Container{
|
||||
Template: corev1.PodTemplateSpec{
|
||||
Spec: corev1.PodSpec{
|
||||
Containers: []corev1.Container{
|
||||
{
|
||||
Name: "nginx",
|
||||
Image: "nginx",
|
||||
|
|
@ -324,17 +332,18 @@ func TestSetResourcesRemote(t *testing.T) {
|
|||
},
|
||||
},
|
||||
},
|
||||
testAPIGroup: "extensions",
|
||||
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1beta2",
|
||||
groupVersion: appsv1beta2.SchemeGroupVersion,
|
||||
path: "/namespaces/test/deployments/nginx",
|
||||
args: []string{"deployment", "nginx"},
|
||||
},
|
||||
{
|
||||
name: "set image appsv1 Deployment",
|
||||
object: &appsv1.Deployment{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
Spec: appsv1.DeploymentSpec{
|
||||
Template: v1.PodTemplateSpec{
|
||||
Spec: v1.PodSpec{
|
||||
Containers: []v1.Container{
|
||||
Template: corev1.PodTemplateSpec{
|
||||
Spec: corev1.PodSpec{
|
||||
Containers: []corev1.Container{
|
||||
{
|
||||
Name: "nginx",
|
||||
Image: "nginx",
|
||||
|
|
@ -344,17 +353,18 @@ func TestSetResourcesRemote(t *testing.T) {
|
|||
},
|
||||
},
|
||||
},
|
||||
testAPIGroup: "extensions",
|
||||
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1",
|
||||
groupVersion: appsv1.SchemeGroupVersion,
|
||||
path: "/namespaces/test/deployments/nginx",
|
||||
args: []string{"deployment", "nginx"},
|
||||
},
|
||||
{
|
||||
name: "set image appsv1beta1 StatefulSet",
|
||||
object: &appsv1beta1.StatefulSet{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
Spec: appsv1beta1.StatefulSetSpec{
|
||||
Template: v1.PodTemplateSpec{
|
||||
Spec: v1.PodSpec{
|
||||
Containers: []v1.Container{
|
||||
Template: corev1.PodTemplateSpec{
|
||||
Spec: corev1.PodSpec{
|
||||
Containers: []corev1.Container{
|
||||
{
|
||||
Name: "nginx",
|
||||
Image: "nginx",
|
||||
|
|
@ -364,17 +374,18 @@ func TestSetResourcesRemote(t *testing.T) {
|
|||
},
|
||||
},
|
||||
},
|
||||
testAPIGroup: "apps",
|
||||
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1beta1",
|
||||
groupVersion: appsv1beta1.SchemeGroupVersion,
|
||||
path: "/namespaces/test/statefulsets/nginx",
|
||||
args: []string{"statefulset", "nginx"},
|
||||
},
|
||||
{
|
||||
name: "set image appsv1beta2 StatefulSet",
|
||||
object: &appsv1beta2.StatefulSet{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
Spec: appsv1beta2.StatefulSetSpec{
|
||||
Template: v1.PodTemplateSpec{
|
||||
Spec: v1.PodSpec{
|
||||
Containers: []v1.Container{
|
||||
Template: corev1.PodTemplateSpec{
|
||||
Spec: corev1.PodSpec{
|
||||
Containers: []corev1.Container{
|
||||
{
|
||||
Name: "nginx",
|
||||
Image: "nginx",
|
||||
|
|
@ -384,17 +395,18 @@ func TestSetResourcesRemote(t *testing.T) {
|
|||
},
|
||||
},
|
||||
},
|
||||
testAPIGroup: "apps",
|
||||
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1beta2",
|
||||
groupVersion: appsv1beta2.SchemeGroupVersion,
|
||||
path: "/namespaces/test/statefulsets/nginx",
|
||||
args: []string{"statefulset", "nginx"},
|
||||
},
|
||||
{
|
||||
name: "set image appsv1 StatefulSet",
|
||||
object: &appsv1.StatefulSet{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
Spec: appsv1.StatefulSetSpec{
|
||||
Template: v1.PodTemplateSpec{
|
||||
Spec: v1.PodSpec{
|
||||
Containers: []v1.Container{
|
||||
Template: corev1.PodTemplateSpec{
|
||||
Spec: corev1.PodSpec{
|
||||
Containers: []corev1.Container{
|
||||
{
|
||||
Name: "nginx",
|
||||
Image: "nginx",
|
||||
|
|
@ -404,17 +416,18 @@ func TestSetResourcesRemote(t *testing.T) {
|
|||
},
|
||||
},
|
||||
},
|
||||
testAPIGroup: "apps",
|
||||
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1",
|
||||
groupVersion: appsv1.SchemeGroupVersion,
|
||||
path: "/namespaces/test/statefulsets/nginx",
|
||||
args: []string{"statefulset", "nginx"},
|
||||
},
|
||||
{
|
||||
name: "set image batchv1 Job",
|
||||
object: &batchv1.Job{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
Spec: batchv1.JobSpec{
|
||||
Template: v1.PodTemplateSpec{
|
||||
Spec: v1.PodSpec{
|
||||
Containers: []v1.Container{
|
||||
Template: corev1.PodTemplateSpec{
|
||||
Spec: corev1.PodSpec{
|
||||
Containers: []corev1.Container{
|
||||
{
|
||||
Name: "nginx",
|
||||
Image: "nginx",
|
||||
|
|
@ -424,17 +437,18 @@ func TestSetResourcesRemote(t *testing.T) {
|
|||
},
|
||||
},
|
||||
},
|
||||
testAPIGroup: "batch",
|
||||
apiPrefix: "/apis", apiGroup: "batch", apiVersion: "v1",
|
||||
groupVersion: batchv1.SchemeGroupVersion,
|
||||
path: "/namespaces/test/jobs/nginx",
|
||||
args: []string{"job", "nginx"},
|
||||
},
|
||||
{
|
||||
object: &v1.ReplicationController{
|
||||
name: "set image corev1.ReplicationController",
|
||||
object: &corev1.ReplicationController{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
Spec: v1.ReplicationControllerSpec{
|
||||
Template: &v1.PodTemplateSpec{
|
||||
Spec: v1.PodSpec{
|
||||
Containers: []v1.Container{
|
||||
Spec: corev1.ReplicationControllerSpec{
|
||||
Template: &corev1.PodTemplateSpec{
|
||||
Spec: corev1.PodSpec{
|
||||
Containers: []corev1.Container{
|
||||
{
|
||||
Name: "nginx",
|
||||
Image: "nginx",
|
||||
|
|
@ -444,27 +458,25 @@ func TestSetResourcesRemote(t *testing.T) {
|
|||
},
|
||||
},
|
||||
},
|
||||
testAPIGroup: "",
|
||||
apiPrefix: "/api", apiGroup: "", apiVersion: "v1",
|
||||
groupVersion: corev1.SchemeGroupVersion,
|
||||
path: "/namespaces/test/replicationcontrollers/nginx",
|
||||
args: []string{"replicationcontroller", "nginx"},
|
||||
},
|
||||
}
|
||||
|
||||
for i, input := range inputs {
|
||||
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")
|
||||
defer tf.Cleanup()
|
||||
|
||||
tf.Client = &fake.RESTClient{
|
||||
GroupVersion: groupVersion,
|
||||
GroupVersion: input.groupVersion,
|
||||
NegotiatedSerializer: serializer.DirectCodecFactory{CodecFactory: scheme.Codecs},
|
||||
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; {
|
||||
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
|
||||
case p == resourcePath && m == http.MethodPatch:
|
||||
case p == input.path && m == http.MethodPatch:
|
||||
stream, err := req.GetBody()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
|
@ -480,7 +492,6 @@ func TestSetResourcesRemote(t *testing.T) {
|
|||
return nil, fmt.Errorf("unexpected request")
|
||||
}
|
||||
}),
|
||||
VersionedAPIPath: path.Join(input.apiPrefix, testapi.Default.GroupVersion().String()),
|
||||
}
|
||||
|
||||
outputFormat := "yaml"
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@ import (
|
|||
"io"
|
||||
"io/ioutil"
|
||||
"net/http"
|
||||
"path"
|
||||
"testing"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
|
|
@ -30,7 +29,7 @@ import (
|
|||
appsv1beta1 "k8s.io/api/apps/v1beta1"
|
||||
appsv1beta2 "k8s.io/api/apps/v1beta2"
|
||||
batchv1 "k8s.io/api/batch/v1"
|
||||
"k8s.io/api/core/v1"
|
||||
corev1 "k8s.io/api/core/v1"
|
||||
extensionsv1beta1 "k8s.io/api/extensions/v1beta1"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
|
|
@ -40,7 +39,6 @@ import (
|
|||
"k8s.io/cli-runtime/pkg/genericclioptions/resource"
|
||||
restclient "k8s.io/client-go/rest"
|
||||
"k8s.io/client-go/rest/fake"
|
||||
"k8s.io/kubernetes/pkg/api/testapi"
|
||||
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing"
|
||||
"k8s.io/kubernetes/pkg/kubectl/scheme"
|
||||
)
|
||||
|
|
@ -85,7 +83,6 @@ func TestSetServiceAccountLocal(t *testing.T) {
|
|||
cmd := NewCmdServiceAccount(tf, streams)
|
||||
cmd.Flags().Set("output", outputFormat)
|
||||
cmd.Flags().Set("local", "true")
|
||||
testapi.Default = testapi.Groups[input.apiGroup]
|
||||
saConfig := SetServiceAccountOptions{
|
||||
PrintFlags: genericclioptions.NewPrintFlags("").WithDefaultOutput(outputFormat).WithTypeSetter(scheme.Scheme),
|
||||
fileNameOptions: resource.FilenameOptions{
|
||||
|
|
@ -103,7 +100,6 @@ func TestSetServiceAccountLocal(t *testing.T) {
|
|||
}
|
||||
|
||||
func TestSetServiceAccountMultiLocal(t *testing.T) {
|
||||
testapi.Default = testapi.Groups[""]
|
||||
tf := cmdtesting.NewTestFactory().WithNamespace("test")
|
||||
defer tf.Cleanup()
|
||||
|
||||
|
|
@ -147,25 +143,25 @@ func TestSetServiceAccountMultiLocal(t *testing.T) {
|
|||
func TestSetServiceAccountRemote(t *testing.T) {
|
||||
inputs := []struct {
|
||||
object runtime.Object
|
||||
apiPrefix, apiGroup, apiVersion string
|
||||
testAPIGroup string
|
||||
groupVersion schema.GroupVersion
|
||||
path string
|
||||
args []string
|
||||
}{
|
||||
{
|
||||
object: &extensionsv1beta1.ReplicaSet{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
},
|
||||
testAPIGroup: "extensions",
|
||||
apiPrefix: "/apis", apiGroup: "extensions", apiVersion: "v1beta1",
|
||||
groupVersion: extensionsv1beta1.SchemeGroupVersion,
|
||||
path: "/namespaces/test/replicasets/nginx",
|
||||
args: []string{"replicaset", "nginx", serviceAccount},
|
||||
},
|
||||
{
|
||||
object: &appsv1beta2.ReplicaSet{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
Spec: appsv1beta2.ReplicaSetSpec{
|
||||
Template: v1.PodTemplateSpec{
|
||||
Spec: v1.PodSpec{
|
||||
Containers: []v1.Container{
|
||||
Template: corev1.PodTemplateSpec{
|
||||
Spec: corev1.PodSpec{
|
||||
Containers: []corev1.Container{
|
||||
{
|
||||
Name: "nginx",
|
||||
Image: "nginx",
|
||||
|
|
@ -175,17 +171,17 @@ func TestSetServiceAccountRemote(t *testing.T) {
|
|||
},
|
||||
},
|
||||
},
|
||||
testAPIGroup: "extensions",
|
||||
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1beta2",
|
||||
groupVersion: appsv1beta2.SchemeGroupVersion,
|
||||
path: "/namespaces/test/replicasets/nginx",
|
||||
args: []string{"replicaset", "nginx", serviceAccount},
|
||||
},
|
||||
{
|
||||
object: &appsv1.ReplicaSet{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
Spec: appsv1.ReplicaSetSpec{
|
||||
Template: v1.PodTemplateSpec{
|
||||
Spec: v1.PodSpec{
|
||||
Containers: []v1.Container{
|
||||
Template: corev1.PodTemplateSpec{
|
||||
Spec: corev1.PodSpec{
|
||||
Containers: []corev1.Container{
|
||||
{
|
||||
Name: "nginx",
|
||||
Image: "nginx",
|
||||
|
|
@ -195,65 +191,65 @@ func TestSetServiceAccountRemote(t *testing.T) {
|
|||
},
|
||||
},
|
||||
},
|
||||
testAPIGroup: "extensions",
|
||||
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1",
|
||||
groupVersion: appsv1.SchemeGroupVersion,
|
||||
path: "/namespaces/test/replicasets/nginx",
|
||||
args: []string{"replicaset", "nginx", serviceAccount},
|
||||
},
|
||||
{
|
||||
object: &extensionsv1beta1.DaemonSet{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
},
|
||||
testAPIGroup: "extensions",
|
||||
apiPrefix: "/apis", apiGroup: "extensions", apiVersion: "v1beta1",
|
||||
groupVersion: extensionsv1beta1.SchemeGroupVersion,
|
||||
path: "/namespaces/test/daemonsets/nginx",
|
||||
args: []string{"daemonset", "nginx", serviceAccount},
|
||||
},
|
||||
{
|
||||
object: &appsv1beta2.DaemonSet{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
},
|
||||
testAPIGroup: "extensions",
|
||||
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1beta2",
|
||||
groupVersion: appsv1beta2.SchemeGroupVersion,
|
||||
path: "/namespaces/test/daemonsets/nginx",
|
||||
args: []string{"daemonset", "nginx", serviceAccount},
|
||||
},
|
||||
{
|
||||
object: &appsv1.DaemonSet{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
},
|
||||
testAPIGroup: "extensions",
|
||||
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1",
|
||||
groupVersion: appsv1.SchemeGroupVersion,
|
||||
path: "/namespaces/test/daemonsets/nginx",
|
||||
args: []string{"daemonset", "nginx", serviceAccount},
|
||||
},
|
||||
{
|
||||
object: &extensionsv1beta1.Deployment{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
},
|
||||
testAPIGroup: "extensions",
|
||||
apiPrefix: "/apis", apiGroup: "extensions", apiVersion: "v1beta1",
|
||||
groupVersion: extensionsv1beta1.SchemeGroupVersion,
|
||||
path: "/namespaces/test/deployments/nginx",
|
||||
args: []string{"deployment", "nginx", serviceAccount},
|
||||
},
|
||||
{
|
||||
object: &appsv1beta1.Deployment{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
},
|
||||
testAPIGroup: "extensions",
|
||||
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1beta1",
|
||||
groupVersion: appsv1beta1.SchemeGroupVersion,
|
||||
path: "/namespaces/test/deployments/nginx",
|
||||
args: []string{"deployment", "nginx", serviceAccount},
|
||||
},
|
||||
{
|
||||
object: &appsv1beta2.Deployment{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
},
|
||||
testAPIGroup: "extensions",
|
||||
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1beta2",
|
||||
groupVersion: appsv1beta2.SchemeGroupVersion,
|
||||
path: "/namespaces/test/deployments/nginx",
|
||||
args: []string{"deployment", "nginx", serviceAccount},
|
||||
},
|
||||
{
|
||||
object: &appsv1.Deployment{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
Spec: appsv1.DeploymentSpec{
|
||||
Template: v1.PodTemplateSpec{
|
||||
Spec: v1.PodSpec{
|
||||
Containers: []v1.Container{
|
||||
Template: corev1.PodTemplateSpec{
|
||||
Spec: corev1.PodSpec{
|
||||
Containers: []corev1.Container{
|
||||
{
|
||||
Name: "nginx",
|
||||
Image: "nginx",
|
||||
|
|
@ -263,33 +259,33 @@ func TestSetServiceAccountRemote(t *testing.T) {
|
|||
},
|
||||
},
|
||||
},
|
||||
testAPIGroup: "extensions",
|
||||
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1",
|
||||
groupVersion: appsv1.SchemeGroupVersion,
|
||||
path: "/namespaces/test/deployments/nginx",
|
||||
args: []string{"deployment", "nginx", serviceAccount},
|
||||
},
|
||||
{
|
||||
object: &appsv1beta1.StatefulSet{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
},
|
||||
testAPIGroup: "apps",
|
||||
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1beta1",
|
||||
groupVersion: appsv1beta1.SchemeGroupVersion,
|
||||
path: "/namespaces/test/statefulsets/nginx",
|
||||
args: []string{"statefulset", "nginx", serviceAccount},
|
||||
},
|
||||
{
|
||||
object: &appsv1beta2.StatefulSet{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
},
|
||||
testAPIGroup: "apps",
|
||||
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1beta2",
|
||||
groupVersion: appsv1beta2.SchemeGroupVersion,
|
||||
path: "/namespaces/test/statefulsets/nginx",
|
||||
args: []string{"statefulset", "nginx", serviceAccount},
|
||||
},
|
||||
{
|
||||
object: &appsv1.StatefulSet{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
Spec: appsv1.StatefulSetSpec{
|
||||
Template: v1.PodTemplateSpec{
|
||||
Spec: v1.PodSpec{
|
||||
Containers: []v1.Container{
|
||||
Template: corev1.PodTemplateSpec{
|
||||
Spec: corev1.PodSpec{
|
||||
Containers: []corev1.Container{
|
||||
{
|
||||
Name: "nginx",
|
||||
Image: "nginx",
|
||||
|
|
@ -299,43 +295,40 @@ func TestSetServiceAccountRemote(t *testing.T) {
|
|||
},
|
||||
},
|
||||
},
|
||||
testAPIGroup: "apps",
|
||||
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1",
|
||||
groupVersion: appsv1.SchemeGroupVersion,
|
||||
path: "/namespaces/test/statefulsets/nginx",
|
||||
args: []string{"statefulset", "nginx", serviceAccount},
|
||||
},
|
||||
{
|
||||
object: &batchv1.Job{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
},
|
||||
testAPIGroup: "batch",
|
||||
apiPrefix: "/apis", apiGroup: "batch", apiVersion: "v1",
|
||||
groupVersion: batchv1.SchemeGroupVersion,
|
||||
path: "/namespaces/test/jobs/nginx",
|
||||
args: []string{"job", "nginx", serviceAccount},
|
||||
},
|
||||
{
|
||||
object: &v1.ReplicationController{
|
||||
object: &corev1.ReplicationController{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
},
|
||||
testAPIGroup: "",
|
||||
apiPrefix: "/api", apiGroup: "", apiVersion: "v1",
|
||||
groupVersion: corev1.SchemeGroupVersion,
|
||||
path: "/namespaces/test/replicationcontrollers/nginx",
|
||||
args: []string{"replicationcontroller", "nginx", serviceAccount},
|
||||
},
|
||||
}
|
||||
for _, input := range inputs {
|
||||
t.Run(input.apiPrefix, func(t *testing.T) {
|
||||
groupVersion := schema.GroupVersion{Group: input.apiGroup, Version: input.apiVersion}
|
||||
testapi.Default = testapi.Groups[input.testAPIGroup]
|
||||
for i, input := range inputs {
|
||||
t.Run(fmt.Sprintf("%d", i), func(t *testing.T) {
|
||||
tf := cmdtesting.NewTestFactory().WithNamespace("test")
|
||||
defer tf.Cleanup()
|
||||
|
||||
tf.Client = &fake.RESTClient{
|
||||
GroupVersion: groupVersion,
|
||||
GroupVersion: input.groupVersion,
|
||||
NegotiatedSerializer: serializer.DirectCodecFactory{CodecFactory: scheme.Codecs},
|
||||
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; {
|
||||
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
|
||||
case p == resourcePath && m == http.MethodPatch:
|
||||
case p == input.path && m == http.MethodPatch:
|
||||
stream, err := req.GetBody()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
|
@ -351,7 +344,6 @@ func TestSetServiceAccountRemote(t *testing.T) {
|
|||
return nil, fmt.Errorf("unexpected request")
|
||||
}
|
||||
}),
|
||||
VersionedAPIPath: path.Join(input.apiPrefix, testapi.Default.GroupVersion().String()),
|
||||
}
|
||||
|
||||
outputFormat := "yaml"
|
||||
|
|
|
|||
Loading…
Reference in New Issue