2015-01-14 15:11:31 +00:00
|
|
|
/*
|
2015-05-01 16:19:44 +00:00
|
|
|
Copyright 2014 The Kubernetes Authors All rights reserved.
|
2015-01-14 15:11:31 +00:00
|
|
|
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
you may not use this file except in compliance with the License.
|
|
|
|
You may obtain a copy of the License at
|
|
|
|
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
See the License for the specific language governing permissions and
|
|
|
|
limitations under the License.
|
|
|
|
*/
|
|
|
|
|
|
|
|
package kubectl
|
|
|
|
|
|
|
|
import (
|
|
|
|
"reflect"
|
|
|
|
"testing"
|
|
|
|
|
2015-08-05 22:03:47 +00:00
|
|
|
"k8s.io/kubernetes/pkg/api"
|
2015-09-09 21:22:56 +00:00
|
|
|
"k8s.io/kubernetes/pkg/api/resource"
|
2016-02-02 05:34:42 +00:00
|
|
|
"k8s.io/kubernetes/pkg/api/unversioned"
|
2016-04-18 15:44:19 +00:00
|
|
|
"k8s.io/kubernetes/pkg/apis/batch"
|
2015-11-13 01:07:21 +00:00
|
|
|
"k8s.io/kubernetes/pkg/apis/extensions"
|
2015-01-14 15:11:31 +00:00
|
|
|
)
|
|
|
|
|
|
|
|
func TestGenerate(t *testing.T) {
|
|
|
|
tests := []struct {
|
2015-08-12 05:48:00 +00:00
|
|
|
params map[string]interface{}
|
2015-01-14 15:11:31 +00:00
|
|
|
expected *api.ReplicationController
|
|
|
|
expectErr bool
|
|
|
|
}{
|
|
|
|
{
|
2015-08-12 05:48:00 +00:00
|
|
|
params: map[string]interface{}{
|
2015-01-14 15:11:31 +00:00
|
|
|
"name": "foo",
|
|
|
|
"image": "someimage",
|
|
|
|
"replicas": "1",
|
2015-02-11 21:20:51 +00:00
|
|
|
"port": "-1",
|
2015-01-14 15:11:31 +00:00
|
|
|
},
|
|
|
|
expected: &api.ReplicationController{
|
|
|
|
ObjectMeta: api.ObjectMeta{
|
|
|
|
Name: "foo",
|
2015-05-21 20:53:10 +00:00
|
|
|
Labels: map[string]string{"run": "foo"},
|
2015-01-14 15:11:31 +00:00
|
|
|
},
|
|
|
|
Spec: api.ReplicationControllerSpec{
|
|
|
|
Replicas: 1,
|
2015-05-21 20:53:10 +00:00
|
|
|
Selector: map[string]string{"run": "foo"},
|
2015-01-14 15:11:31 +00:00
|
|
|
Template: &api.PodTemplateSpec{
|
|
|
|
ObjectMeta: api.ObjectMeta{
|
2015-05-21 20:53:10 +00:00
|
|
|
Labels: map[string]string{"run": "foo"},
|
2015-01-14 15:11:31 +00:00
|
|
|
},
|
|
|
|
Spec: api.PodSpec{
|
|
|
|
Containers: []api.Container{
|
|
|
|
{
|
|
|
|
Name: "foo",
|
|
|
|
Image: "someimage",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
2015-09-01 03:03:29 +00:00
|
|
|
|
|
|
|
{
|
|
|
|
params: map[string]interface{}{
|
|
|
|
"name": "foo",
|
|
|
|
"image": "someimage",
|
|
|
|
"replicas": "1",
|
|
|
|
"port": "-1",
|
|
|
|
"env": []string{"a=b", "c=d"},
|
|
|
|
},
|
|
|
|
expected: &api.ReplicationController{
|
|
|
|
ObjectMeta: api.ObjectMeta{
|
|
|
|
Name: "foo",
|
|
|
|
Labels: map[string]string{"run": "foo"},
|
|
|
|
},
|
|
|
|
Spec: api.ReplicationControllerSpec{
|
|
|
|
Replicas: 1,
|
|
|
|
Selector: map[string]string{"run": "foo"},
|
|
|
|
Template: &api.PodTemplateSpec{
|
|
|
|
ObjectMeta: api.ObjectMeta{
|
|
|
|
Labels: map[string]string{"run": "foo"},
|
|
|
|
},
|
|
|
|
Spec: api.PodSpec{
|
|
|
|
Containers: []api.Container{
|
|
|
|
{
|
|
|
|
Name: "foo",
|
|
|
|
Image: "someimage",
|
|
|
|
Env: []api.EnvVar{
|
|
|
|
{
|
|
|
|
Name: "a",
|
|
|
|
Value: "b",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
Name: "c",
|
|
|
|
Value: "d",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
|
2015-01-31 04:51:40 +00:00
|
|
|
{
|
2015-08-12 05:48:00 +00:00
|
|
|
params: map[string]interface{}{
|
|
|
|
"name": "foo",
|
|
|
|
"image": "someimage",
|
|
|
|
"replicas": "1",
|
|
|
|
"port": "-1",
|
|
|
|
"args": []string{"bar", "baz", "blah"},
|
|
|
|
},
|
|
|
|
expected: &api.ReplicationController{
|
|
|
|
ObjectMeta: api.ObjectMeta{
|
|
|
|
Name: "foo",
|
|
|
|
Labels: map[string]string{"run": "foo"},
|
|
|
|
},
|
|
|
|
Spec: api.ReplicationControllerSpec{
|
|
|
|
Replicas: 1,
|
|
|
|
Selector: map[string]string{"run": "foo"},
|
|
|
|
Template: &api.PodTemplateSpec{
|
|
|
|
ObjectMeta: api.ObjectMeta{
|
|
|
|
Labels: map[string]string{"run": "foo"},
|
|
|
|
},
|
|
|
|
Spec: api.PodSpec{
|
|
|
|
Containers: []api.Container{
|
|
|
|
{
|
|
|
|
Name: "foo",
|
|
|
|
Image: "someimage",
|
|
|
|
Args: []string{"bar", "baz", "blah"},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
params: map[string]interface{}{
|
|
|
|
"name": "foo",
|
|
|
|
"image": "someimage",
|
|
|
|
"replicas": "1",
|
|
|
|
"port": "-1",
|
|
|
|
"args": []string{"bar", "baz", "blah"},
|
|
|
|
"command": "true",
|
|
|
|
},
|
|
|
|
expected: &api.ReplicationController{
|
|
|
|
ObjectMeta: api.ObjectMeta{
|
|
|
|
Name: "foo",
|
|
|
|
Labels: map[string]string{"run": "foo"},
|
|
|
|
},
|
|
|
|
Spec: api.ReplicationControllerSpec{
|
|
|
|
Replicas: 1,
|
|
|
|
Selector: map[string]string{"run": "foo"},
|
|
|
|
Template: &api.PodTemplateSpec{
|
|
|
|
ObjectMeta: api.ObjectMeta{
|
|
|
|
Labels: map[string]string{"run": "foo"},
|
|
|
|
},
|
|
|
|
Spec: api.PodSpec{
|
|
|
|
Containers: []api.Container{
|
|
|
|
{
|
|
|
|
Name: "foo",
|
|
|
|
Image: "someimage",
|
|
|
|
Command: []string{"bar", "baz", "blah"},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
params: map[string]interface{}{
|
2015-01-31 04:51:40 +00:00
|
|
|
"name": "foo",
|
|
|
|
"image": "someimage",
|
|
|
|
"replicas": "1",
|
|
|
|
"port": "80",
|
|
|
|
},
|
|
|
|
expected: &api.ReplicationController{
|
|
|
|
ObjectMeta: api.ObjectMeta{
|
|
|
|
Name: "foo",
|
2015-05-21 20:53:10 +00:00
|
|
|
Labels: map[string]string{"run": "foo"},
|
2015-01-31 04:51:40 +00:00
|
|
|
},
|
|
|
|
Spec: api.ReplicationControllerSpec{
|
|
|
|
Replicas: 1,
|
2015-05-21 20:53:10 +00:00
|
|
|
Selector: map[string]string{"run": "foo"},
|
2015-01-31 04:51:40 +00:00
|
|
|
Template: &api.PodTemplateSpec{
|
|
|
|
ObjectMeta: api.ObjectMeta{
|
2015-05-21 20:53:10 +00:00
|
|
|
Labels: map[string]string{"run": "foo"},
|
2015-01-31 04:51:40 +00:00
|
|
|
},
|
|
|
|
Spec: api.PodSpec{
|
|
|
|
Containers: []api.Container{
|
|
|
|
{
|
|
|
|
Name: "foo",
|
|
|
|
Image: "someimage",
|
2015-02-23 22:25:56 +00:00
|
|
|
Ports: []api.ContainerPort{
|
2015-01-31 04:51:40 +00:00
|
|
|
{
|
|
|
|
ContainerPort: 80,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
2015-04-29 23:54:23 +00:00
|
|
|
{
|
2015-08-12 05:48:00 +00:00
|
|
|
params: map[string]interface{}{
|
2015-04-29 23:54:23 +00:00
|
|
|
"name": "foo",
|
|
|
|
"image": "someimage",
|
|
|
|
"replicas": "1",
|
|
|
|
"port": "80",
|
|
|
|
"hostport": "80",
|
|
|
|
},
|
|
|
|
expected: &api.ReplicationController{
|
|
|
|
ObjectMeta: api.ObjectMeta{
|
|
|
|
Name: "foo",
|
2015-05-21 20:53:10 +00:00
|
|
|
Labels: map[string]string{"run": "foo"},
|
2015-04-29 23:54:23 +00:00
|
|
|
},
|
|
|
|
Spec: api.ReplicationControllerSpec{
|
|
|
|
Replicas: 1,
|
2015-05-21 20:53:10 +00:00
|
|
|
Selector: map[string]string{"run": "foo"},
|
2015-04-29 23:54:23 +00:00
|
|
|
Template: &api.PodTemplateSpec{
|
|
|
|
ObjectMeta: api.ObjectMeta{
|
2015-05-21 20:53:10 +00:00
|
|
|
Labels: map[string]string{"run": "foo"},
|
2015-04-29 23:54:23 +00:00
|
|
|
},
|
|
|
|
Spec: api.PodSpec{
|
|
|
|
Containers: []api.Container{
|
|
|
|
{
|
|
|
|
Name: "foo",
|
|
|
|
Image: "someimage",
|
|
|
|
Ports: []api.ContainerPort{
|
|
|
|
{
|
|
|
|
ContainerPort: 80,
|
|
|
|
HostPort: 80,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
2015-08-12 05:48:00 +00:00
|
|
|
params: map[string]interface{}{
|
2015-04-29 23:54:23 +00:00
|
|
|
"name": "foo",
|
|
|
|
"image": "someimage",
|
|
|
|
"replicas": "1",
|
|
|
|
"hostport": "80",
|
|
|
|
},
|
|
|
|
expected: nil,
|
|
|
|
expectErr: true,
|
|
|
|
},
|
2015-01-14 15:11:31 +00:00
|
|
|
{
|
2015-08-12 05:48:00 +00:00
|
|
|
params: map[string]interface{}{
|
2015-01-14 15:11:31 +00:00
|
|
|
"name": "foo",
|
|
|
|
"image": "someimage",
|
|
|
|
"replicas": "1",
|
|
|
|
"labels": "foo=bar,baz=blah",
|
|
|
|
},
|
|
|
|
expected: &api.ReplicationController{
|
|
|
|
ObjectMeta: api.ObjectMeta{
|
|
|
|
Name: "foo",
|
|
|
|
Labels: map[string]string{"foo": "bar", "baz": "blah"},
|
|
|
|
},
|
|
|
|
Spec: api.ReplicationControllerSpec{
|
|
|
|
Replicas: 1,
|
|
|
|
Selector: map[string]string{"foo": "bar", "baz": "blah"},
|
|
|
|
Template: &api.PodTemplateSpec{
|
|
|
|
ObjectMeta: api.ObjectMeta{
|
|
|
|
Labels: map[string]string{"foo": "bar", "baz": "blah"},
|
|
|
|
},
|
|
|
|
Spec: api.PodSpec{
|
|
|
|
Containers: []api.Container{
|
|
|
|
{
|
|
|
|
Name: "foo",
|
|
|
|
Image: "someimage",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
2015-09-09 21:22:56 +00:00
|
|
|
{
|
|
|
|
params: map[string]interface{}{
|
|
|
|
"name": "foo",
|
|
|
|
"image": "someimage",
|
|
|
|
"replicas": "1",
|
|
|
|
"hostport": "80",
|
|
|
|
},
|
|
|
|
expected: nil,
|
|
|
|
expectErr: true,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
params: map[string]interface{}{
|
|
|
|
"name": "foo",
|
|
|
|
"image": "someimage",
|
|
|
|
"replicas": "1",
|
|
|
|
"labels": "foo=bar,baz=blah",
|
|
|
|
"requests": "cpu100m,memory=100Mi",
|
|
|
|
},
|
|
|
|
expected: nil,
|
|
|
|
expectErr: true,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
params: map[string]interface{}{
|
|
|
|
"name": "foo",
|
|
|
|
"image": "someimage",
|
|
|
|
"replicas": "1",
|
|
|
|
"labels": "foo=bar,baz=blah",
|
|
|
|
"requests": "cpu=100m&memory=100Mi",
|
|
|
|
},
|
|
|
|
expected: nil,
|
|
|
|
expectErr: true,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
params: map[string]interface{}{
|
|
|
|
"name": "foo",
|
|
|
|
"image": "someimage",
|
|
|
|
"replicas": "1",
|
|
|
|
"labels": "foo=bar,baz=blah",
|
|
|
|
"requests": "cpu=",
|
|
|
|
},
|
|
|
|
expected: nil,
|
|
|
|
expectErr: true,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
params: map[string]interface{}{
|
|
|
|
"name": "foo",
|
|
|
|
"image": "someimage",
|
|
|
|
"replicas": "1",
|
|
|
|
"labels": "foo=bar,baz=blah",
|
|
|
|
"requests": "cpu=100m,memory=100Mi",
|
|
|
|
"limits": "cpu=400m,memory=200Mi",
|
|
|
|
},
|
|
|
|
expected: &api.ReplicationController{
|
|
|
|
ObjectMeta: api.ObjectMeta{
|
|
|
|
Name: "foo",
|
|
|
|
Labels: map[string]string{"foo": "bar", "baz": "blah"},
|
|
|
|
},
|
|
|
|
Spec: api.ReplicationControllerSpec{
|
|
|
|
Replicas: 1,
|
|
|
|
Selector: map[string]string{"foo": "bar", "baz": "blah"},
|
|
|
|
Template: &api.PodTemplateSpec{
|
|
|
|
ObjectMeta: api.ObjectMeta{
|
|
|
|
Labels: map[string]string{"foo": "bar", "baz": "blah"},
|
|
|
|
},
|
|
|
|
Spec: api.PodSpec{
|
|
|
|
Containers: []api.Container{
|
|
|
|
{
|
|
|
|
Name: "foo",
|
|
|
|
Image: "someimage",
|
|
|
|
Resources: api.ResourceRequirements{
|
|
|
|
Requests: api.ResourceList{
|
|
|
|
api.ResourceCPU: resource.MustParse("100m"),
|
|
|
|
api.ResourceMemory: resource.MustParse("100Mi"),
|
|
|
|
},
|
|
|
|
Limits: api.ResourceList{
|
|
|
|
api.ResourceCPU: resource.MustParse("400m"),
|
|
|
|
api.ResourceMemory: resource.MustParse("200Mi"),
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
2015-01-14 15:11:31 +00:00
|
|
|
}
|
|
|
|
generator := BasicReplicationController{}
|
2016-05-17 04:36:56 +00:00
|
|
|
for i, test := range tests {
|
2015-01-14 15:11:31 +00:00
|
|
|
obj, err := generator.Generate(test.params)
|
2016-05-17 04:36:56 +00:00
|
|
|
t.Logf("%d: %#v", i, obj)
|
2015-01-14 15:11:31 +00:00
|
|
|
if !test.expectErr && err != nil {
|
|
|
|
t.Errorf("unexpected error: %v", err)
|
2016-05-17 04:36:56 +00:00
|
|
|
continue
|
2015-01-14 15:11:31 +00:00
|
|
|
}
|
2015-04-29 23:54:23 +00:00
|
|
|
if test.expectErr && err != nil {
|
|
|
|
continue
|
|
|
|
}
|
2015-01-31 04:51:40 +00:00
|
|
|
if !reflect.DeepEqual(obj.(*api.ReplicationController).Spec.Template, test.expected.Spec.Template) {
|
|
|
|
t.Errorf("\nexpected:\n%#v\nsaw:\n%#v", test.expected.Spec.Template, obj.(*api.ReplicationController).Spec.Template)
|
2015-01-14 15:11:31 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2015-08-04 19:54:17 +00:00
|
|
|
|
|
|
|
func TestGeneratePod(t *testing.T) {
|
|
|
|
tests := []struct {
|
2015-08-12 05:48:00 +00:00
|
|
|
params map[string]interface{}
|
2015-08-04 19:54:17 +00:00
|
|
|
expected *api.Pod
|
|
|
|
expectErr bool
|
|
|
|
}{
|
|
|
|
{
|
2015-08-12 05:48:00 +00:00
|
|
|
params: map[string]interface{}{
|
2015-08-04 19:54:17 +00:00
|
|
|
"name": "foo",
|
|
|
|
"image": "someimage",
|
|
|
|
"port": "-1",
|
|
|
|
},
|
|
|
|
expected: &api.Pod{
|
|
|
|
ObjectMeta: api.ObjectMeta{
|
|
|
|
Name: "foo",
|
|
|
|
},
|
|
|
|
Spec: api.PodSpec{
|
|
|
|
Containers: []api.Container{
|
|
|
|
{
|
|
|
|
Name: "foo",
|
|
|
|
Image: "someimage",
|
|
|
|
ImagePullPolicy: api.PullIfNotPresent,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
DNSPolicy: api.DNSClusterFirst,
|
|
|
|
RestartPolicy: api.RestartPolicyAlways,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
2015-09-01 03:03:29 +00:00
|
|
|
{
|
|
|
|
params: map[string]interface{}{
|
|
|
|
"name": "foo",
|
|
|
|
"image": "someimage",
|
|
|
|
"env": []string{"a", "c"},
|
|
|
|
},
|
|
|
|
|
|
|
|
expected: nil,
|
|
|
|
expectErr: true,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
params: map[string]interface{}{
|
|
|
|
"name": "foo",
|
|
|
|
"image": "someimage",
|
|
|
|
"env": []string{"a=b", "c=d"},
|
|
|
|
},
|
|
|
|
expected: &api.Pod{
|
|
|
|
ObjectMeta: api.ObjectMeta{
|
|
|
|
Name: "foo",
|
|
|
|
},
|
|
|
|
Spec: api.PodSpec{
|
|
|
|
Containers: []api.Container{
|
|
|
|
{
|
|
|
|
Name: "foo",
|
|
|
|
Image: "someimage",
|
|
|
|
ImagePullPolicy: api.PullIfNotPresent,
|
|
|
|
Env: []api.EnvVar{
|
|
|
|
{
|
|
|
|
Name: "a",
|
|
|
|
Value: "b",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
Name: "c",
|
|
|
|
Value: "d",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
DNSPolicy: api.DNSClusterFirst,
|
|
|
|
RestartPolicy: api.RestartPolicyAlways,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
2015-08-04 19:54:17 +00:00
|
|
|
{
|
2015-08-12 05:48:00 +00:00
|
|
|
params: map[string]interface{}{
|
2015-08-04 19:54:17 +00:00
|
|
|
"name": "foo",
|
|
|
|
"image": "someimage",
|
|
|
|
"port": "80",
|
|
|
|
},
|
|
|
|
expected: &api.Pod{
|
|
|
|
ObjectMeta: api.ObjectMeta{
|
|
|
|
Name: "foo",
|
|
|
|
},
|
|
|
|
Spec: api.PodSpec{
|
|
|
|
Containers: []api.Container{
|
|
|
|
{
|
|
|
|
Name: "foo",
|
|
|
|
Image: "someimage",
|
|
|
|
ImagePullPolicy: api.PullIfNotPresent,
|
|
|
|
Ports: []api.ContainerPort{
|
|
|
|
{
|
|
|
|
ContainerPort: 80,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
DNSPolicy: api.DNSClusterFirst,
|
|
|
|
RestartPolicy: api.RestartPolicyAlways,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
2015-08-12 05:48:00 +00:00
|
|
|
params: map[string]interface{}{
|
2015-08-04 19:54:17 +00:00
|
|
|
"name": "foo",
|
|
|
|
"image": "someimage",
|
|
|
|
"port": "80",
|
|
|
|
"hostport": "80",
|
|
|
|
},
|
|
|
|
expected: &api.Pod{
|
|
|
|
ObjectMeta: api.ObjectMeta{
|
|
|
|
Name: "foo",
|
|
|
|
},
|
|
|
|
Spec: api.PodSpec{
|
|
|
|
Containers: []api.Container{
|
|
|
|
{
|
|
|
|
Name: "foo",
|
|
|
|
Image: "someimage",
|
|
|
|
ImagePullPolicy: api.PullIfNotPresent,
|
|
|
|
Ports: []api.ContainerPort{
|
|
|
|
{
|
|
|
|
ContainerPort: 80,
|
|
|
|
HostPort: 80,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
DNSPolicy: api.DNSClusterFirst,
|
|
|
|
RestartPolicy: api.RestartPolicyAlways,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
2015-08-12 05:48:00 +00:00
|
|
|
params: map[string]interface{}{
|
2015-08-04 19:54:17 +00:00
|
|
|
"name": "foo",
|
|
|
|
"image": "someimage",
|
|
|
|
"hostport": "80",
|
|
|
|
},
|
|
|
|
expected: nil,
|
|
|
|
expectErr: true,
|
|
|
|
},
|
|
|
|
{
|
2015-08-12 05:48:00 +00:00
|
|
|
params: map[string]interface{}{
|
2015-08-04 19:54:17 +00:00
|
|
|
"name": "foo",
|
|
|
|
"image": "someimage",
|
|
|
|
"replicas": "1",
|
|
|
|
"labels": "foo=bar,baz=blah",
|
|
|
|
},
|
|
|
|
expected: &api.Pod{
|
|
|
|
ObjectMeta: api.ObjectMeta{
|
|
|
|
Name: "foo",
|
|
|
|
Labels: map[string]string{"foo": "bar", "baz": "blah"},
|
|
|
|
},
|
|
|
|
Spec: api.PodSpec{
|
|
|
|
Containers: []api.Container{
|
|
|
|
{
|
|
|
|
Name: "foo",
|
|
|
|
Image: "someimage",
|
|
|
|
ImagePullPolicy: api.PullIfNotPresent,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
DNSPolicy: api.DNSClusterFirst,
|
|
|
|
RestartPolicy: api.RestartPolicyAlways,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
2015-10-06 15:31:48 +00:00
|
|
|
{
|
|
|
|
params: map[string]interface{}{
|
|
|
|
"name": "foo",
|
|
|
|
"image": "someimage",
|
|
|
|
"replicas": "1",
|
|
|
|
"labels": "foo=bar,baz=blah",
|
|
|
|
"stdin": "true",
|
|
|
|
},
|
|
|
|
expected: &api.Pod{
|
|
|
|
ObjectMeta: api.ObjectMeta{
|
|
|
|
Name: "foo",
|
|
|
|
Labels: map[string]string{"foo": "bar", "baz": "blah"},
|
|
|
|
},
|
|
|
|
Spec: api.PodSpec{
|
|
|
|
Containers: []api.Container{
|
|
|
|
{
|
|
|
|
Name: "foo",
|
|
|
|
Image: "someimage",
|
|
|
|
ImagePullPolicy: api.PullIfNotPresent,
|
|
|
|
Stdin: true,
|
|
|
|
StdinOnce: true,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
DNSPolicy: api.DNSClusterFirst,
|
|
|
|
RestartPolicy: api.RestartPolicyAlways,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
params: map[string]interface{}{
|
|
|
|
"name": "foo",
|
|
|
|
"image": "someimage",
|
|
|
|
"replicas": "1",
|
|
|
|
"labels": "foo=bar,baz=blah",
|
|
|
|
"stdin": "true",
|
|
|
|
"leave-stdin-open": "true",
|
|
|
|
},
|
|
|
|
expected: &api.Pod{
|
|
|
|
ObjectMeta: api.ObjectMeta{
|
|
|
|
Name: "foo",
|
|
|
|
Labels: map[string]string{"foo": "bar", "baz": "blah"},
|
|
|
|
},
|
|
|
|
Spec: api.PodSpec{
|
|
|
|
Containers: []api.Container{
|
|
|
|
{
|
|
|
|
Name: "foo",
|
|
|
|
Image: "someimage",
|
|
|
|
ImagePullPolicy: api.PullIfNotPresent,
|
|
|
|
Stdin: true,
|
|
|
|
StdinOnce: false,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
DNSPolicy: api.DNSClusterFirst,
|
|
|
|
RestartPolicy: api.RestartPolicyAlways,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
2015-08-04 19:54:17 +00:00
|
|
|
}
|
|
|
|
generator := BasicPod{}
|
|
|
|
for _, test := range tests {
|
|
|
|
obj, err := generator.Generate(test.params)
|
|
|
|
if !test.expectErr && err != nil {
|
|
|
|
t.Errorf("unexpected error: %v", err)
|
|
|
|
}
|
|
|
|
if test.expectErr && err != nil {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
if !reflect.DeepEqual(obj.(*api.Pod), test.expected) {
|
|
|
|
t.Errorf("\nexpected:\n%#v\nsaw:\n%#v", test.expected, obj.(*api.Pod))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2015-11-13 01:07:21 +00:00
|
|
|
|
|
|
|
func TestGenerateDeployment(t *testing.T) {
|
|
|
|
tests := []struct {
|
|
|
|
params map[string]interface{}
|
|
|
|
expected *extensions.Deployment
|
|
|
|
expectErr bool
|
|
|
|
}{
|
|
|
|
{
|
|
|
|
params: map[string]interface{}{
|
|
|
|
"labels": "foo=bar,baz=blah",
|
|
|
|
"name": "foo",
|
|
|
|
"replicas": "3",
|
|
|
|
"image": "someimage",
|
|
|
|
"port": "80",
|
|
|
|
"hostport": "80",
|
|
|
|
"stdin": "true",
|
|
|
|
"command": "true",
|
|
|
|
"args": []string{"bar", "baz", "blah"},
|
|
|
|
"env": []string{"a=b", "c=d"},
|
|
|
|
"requests": "cpu=100m,memory=100Mi",
|
|
|
|
"limits": "cpu=400m,memory=200Mi",
|
|
|
|
},
|
|
|
|
expected: &extensions.Deployment{
|
|
|
|
ObjectMeta: api.ObjectMeta{
|
|
|
|
Name: "foo",
|
|
|
|
Labels: map[string]string{"foo": "bar", "baz": "blah"},
|
|
|
|
},
|
|
|
|
Spec: extensions.DeploymentSpec{
|
2016-02-05 22:45:05 +00:00
|
|
|
Replicas: 3,
|
2016-02-06 02:43:02 +00:00
|
|
|
Selector: &unversioned.LabelSelector{MatchLabels: map[string]string{"foo": "bar", "baz": "blah"}},
|
2015-11-13 01:07:21 +00:00
|
|
|
Template: api.PodTemplateSpec{
|
|
|
|
ObjectMeta: api.ObjectMeta{
|
|
|
|
Labels: map[string]string{"foo": "bar", "baz": "blah"},
|
|
|
|
},
|
|
|
|
Spec: api.PodSpec{
|
|
|
|
Containers: []api.Container{
|
|
|
|
{
|
|
|
|
Name: "foo",
|
|
|
|
Image: "someimage",
|
|
|
|
Stdin: true,
|
|
|
|
Ports: []api.ContainerPort{
|
|
|
|
{
|
|
|
|
ContainerPort: 80,
|
|
|
|
HostPort: 80,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
Command: []string{"bar", "baz", "blah"},
|
|
|
|
Env: []api.EnvVar{
|
|
|
|
{
|
|
|
|
Name: "a",
|
|
|
|
Value: "b",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
Name: "c",
|
|
|
|
Value: "d",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
Resources: api.ResourceRequirements{
|
|
|
|
Requests: api.ResourceList{
|
|
|
|
api.ResourceCPU: resource.MustParse("100m"),
|
|
|
|
api.ResourceMemory: resource.MustParse("100Mi"),
|
|
|
|
},
|
|
|
|
Limits: api.ResourceList{
|
|
|
|
api.ResourceCPU: resource.MustParse("400m"),
|
|
|
|
api.ResourceMemory: resource.MustParse("200Mi"),
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
generator := DeploymentV1Beta1{}
|
|
|
|
for _, test := range tests {
|
|
|
|
obj, err := generator.Generate(test.params)
|
|
|
|
if !test.expectErr && err != nil {
|
|
|
|
t.Errorf("unexpected error: %v", err)
|
|
|
|
}
|
|
|
|
if test.expectErr && err != nil {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
if !reflect.DeepEqual(obj.(*extensions.Deployment), test.expected) {
|
|
|
|
t.Errorf("\nexpected:\n%#v\nsaw:\n%#v", test.expected, obj.(*extensions.Deployment))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestGenerateJob(t *testing.T) {
|
|
|
|
tests := []struct {
|
|
|
|
params map[string]interface{}
|
2016-04-18 15:44:19 +00:00
|
|
|
expected *batch.Job
|
2015-11-13 01:07:21 +00:00
|
|
|
expectErr bool
|
|
|
|
}{
|
|
|
|
{
|
|
|
|
params: map[string]interface{}{
|
|
|
|
"labels": "foo=bar,baz=blah",
|
|
|
|
"name": "foo",
|
|
|
|
"image": "someimage",
|
|
|
|
"port": "80",
|
|
|
|
"hostport": "80",
|
|
|
|
"stdin": "true",
|
|
|
|
"leave-stdin-open": "true",
|
|
|
|
"command": "true",
|
|
|
|
"args": []string{"bar", "baz", "blah"},
|
|
|
|
"env": []string{"a=b", "c=d"},
|
|
|
|
"requests": "cpu=100m,memory=100Mi",
|
|
|
|
"limits": "cpu=400m,memory=200Mi",
|
|
|
|
"restart": "OnFailure",
|
|
|
|
},
|
2016-04-18 15:44:19 +00:00
|
|
|
expected: &batch.Job{
|
2015-11-13 01:07:21 +00:00
|
|
|
ObjectMeta: api.ObjectMeta{
|
|
|
|
Name: "foo",
|
|
|
|
Labels: map[string]string{"foo": "bar", "baz": "blah"},
|
|
|
|
},
|
2016-04-18 15:44:19 +00:00
|
|
|
Spec: batch.JobSpec{
|
2016-02-02 05:34:42 +00:00
|
|
|
Selector: &unversioned.LabelSelector{
|
2015-11-13 01:07:21 +00:00
|
|
|
MatchLabels: map[string]string{"foo": "bar", "baz": "blah"},
|
|
|
|
},
|
Added Selector Generation to Job.
Added selector generation to Job's
strategy.Validate, right before validation.
Can't do in defaulting since UID is not known.
Added a validation to Job to ensure that the generated
labels and selector are correct when generation was requested.
This happens right after generation, but validation is in a better
place to return an error.
Adds "manualSelector" field to batch/v1 Job to control selector generation.
Adds same field to extensions/__internal. Conversion between those two
is automatic.
Adds "autoSelector" field to extensions/v1beta1 Job. Used for storing batch/v1 Jobs
- Default for v1 is to do generation.
- Default for v1beta1 is to not do it.
- In both cases, unset == false == do the default thing.
Release notes:
Added batch/v1 group, which contains just Job, and which is the next
version of extensions/v1beta1 Job.
The changes from the previous version are:
- Users no longer need to ensure labels on their pod template are unique to the enclosing
job (but may add labels as needed for categorization).
- In v1beta1, job.spec.selector was defaulted from pod labels, with the user responsible for uniqueness.
In v1, a unique label is generated and added to the pod template, and used as the selector (other
labels added by user stay on pod template, but need not be used by selector).
- a new field called "manualSelector" field exists to control whether the new behavior is used,
versus a more error-prone but more flexible "manual" (not generated) seletor. Most users
will not need to use this field and should leave it unset.
Users who are creating extensions.Job go objects and then posting them using the go client
will see a change in the default behavior. They need to either stop providing a selector (relying on
selector generation) or else specify "spec.manualSelector" until they are ready to do the former.
2016-02-08 23:55:40 +00:00
|
|
|
ManualSelector: newBool(true),
|
2015-11-13 01:07:21 +00:00
|
|
|
Template: api.PodTemplateSpec{
|
|
|
|
ObjectMeta: api.ObjectMeta{
|
|
|
|
Labels: map[string]string{"foo": "bar", "baz": "blah"},
|
|
|
|
},
|
|
|
|
Spec: api.PodSpec{
|
|
|
|
RestartPolicy: api.RestartPolicyOnFailure,
|
|
|
|
Containers: []api.Container{
|
|
|
|
{
|
|
|
|
Name: "foo",
|
|
|
|
Image: "someimage",
|
|
|
|
Stdin: true,
|
|
|
|
StdinOnce: false,
|
|
|
|
Ports: []api.ContainerPort{
|
|
|
|
{
|
|
|
|
ContainerPort: 80,
|
|
|
|
HostPort: 80,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
Command: []string{"bar", "baz", "blah"},
|
|
|
|
Env: []api.EnvVar{
|
|
|
|
{
|
|
|
|
Name: "a",
|
|
|
|
Value: "b",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
Name: "c",
|
|
|
|
Value: "d",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
Resources: api.ResourceRequirements{
|
|
|
|
Requests: api.ResourceList{
|
|
|
|
api.ResourceCPU: resource.MustParse("100m"),
|
|
|
|
api.ResourceMemory: resource.MustParse("100Mi"),
|
|
|
|
},
|
|
|
|
Limits: api.ResourceList{
|
|
|
|
api.ResourceCPU: resource.MustParse("400m"),
|
|
|
|
api.ResourceMemory: resource.MustParse("200Mi"),
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
generator := JobV1Beta1{}
|
|
|
|
for _, test := range tests {
|
|
|
|
obj, err := generator.Generate(test.params)
|
|
|
|
if !test.expectErr && err != nil {
|
|
|
|
t.Errorf("unexpected error: %v", err)
|
|
|
|
}
|
|
|
|
if test.expectErr && err != nil {
|
|
|
|
continue
|
|
|
|
}
|
2016-04-18 15:44:19 +00:00
|
|
|
if !reflect.DeepEqual(obj.(*batch.Job), test.expected) {
|
|
|
|
t.Errorf("\nexpected:\n%#v\nsaw:\n%#v", test.expected, obj.(*batch.Job))
|
2015-11-13 01:07:21 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2015-12-22 07:00:26 +00:00
|
|
|
|
|
|
|
func TestParseEnv(t *testing.T) {
|
|
|
|
tests := []struct {
|
|
|
|
envArray []string
|
|
|
|
expected []api.EnvVar
|
|
|
|
expectErr bool
|
|
|
|
test string
|
|
|
|
}{
|
|
|
|
{
|
|
|
|
envArray: []string{
|
|
|
|
"THIS_ENV=isOK",
|
|
|
|
"HAS_COMMAS=foo,bar",
|
|
|
|
"HAS_EQUALS=jJnro54iUu75xNy==",
|
|
|
|
},
|
|
|
|
expected: []api.EnvVar{
|
|
|
|
{
|
|
|
|
Name: "THIS_ENV",
|
|
|
|
Value: "isOK",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
Name: "HAS_COMMAS",
|
|
|
|
Value: "foo,bar",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
Name: "HAS_EQUALS",
|
|
|
|
Value: "jJnro54iUu75xNy==",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
expectErr: false,
|
|
|
|
test: "test case 1",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
envArray: []string{
|
|
|
|
"WITH_OUT_EQUALS",
|
|
|
|
},
|
|
|
|
expected: []api.EnvVar{},
|
|
|
|
expectErr: true,
|
|
|
|
test: "test case 2",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
envArray: []string{
|
|
|
|
"WITH_OUT_VALUES=",
|
|
|
|
},
|
|
|
|
expected: []api.EnvVar{},
|
|
|
|
expectErr: true,
|
|
|
|
test: "test case 3",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
envArray: []string{
|
|
|
|
"=WITH_OUT_NAME",
|
|
|
|
},
|
|
|
|
expected: []api.EnvVar{},
|
|
|
|
expectErr: true,
|
|
|
|
test: "test case 4",
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, test := range tests {
|
|
|
|
envs, err := parseEnvs(test.envArray)
|
|
|
|
if !test.expectErr && err != nil {
|
|
|
|
t.Errorf("unexpected error: %v (%s)", err, test.test)
|
|
|
|
}
|
|
|
|
if test.expectErr && err != nil {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
if !reflect.DeepEqual(envs, test.expected) {
|
|
|
|
t.Errorf("\nexpected:\n%#v\nsaw:\n%#v (%s)", test.expected, envs, test.test)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|