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

DaemonSetSpec.Template should not be a pointer.

Browse Source 
Pod template for DaemonSets isn't optional, like Deployments and Jobs,
so the DaemonSetSpec.Template field should not be a pointer.
This commit is contained in:
Madhusudan.C.S
2016-01-11 14:17:42 -08:00
parent 992a85950f
commit 73fb6dca62
13 changed files with 52 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
pkg/apis/extensions/validation/validation_test.go
View File

@@ -376,7 +376,7 @@ func TestValidateDaemonSetUpdate(t *testing.T) {
ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault},
Spec: extensions.DaemonSetSpec{
Selector: &extensions.LabelSelector{MatchLabels: validSelector},
Template: &validPodTemplateAbc.Template,
Template: validPodTemplateAbc.Template,
UpdateStrategy: validUpdateStrategy,
},
},
@@ -384,7 +384,7 @@ func TestValidateDaemonSetUpdate(t *testing.T) {
ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault},
Spec: extensions.DaemonSetSpec{
Selector: &extensions.LabelSelector{MatchLabels: validSelector},
Template: &validPodTemplateAbc.Template,
Template: validPodTemplateAbc.Template,
UpdateStrategy: validUpdateStrategy,
},
},
@@ -394,7 +394,7 @@ func TestValidateDaemonSetUpdate(t *testing.T) {
ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault},
Spec: extensions.DaemonSetSpec{
Selector: &extensions.LabelSelector{MatchLabels: validSelector},
Template: &validPodTemplateAbc.Template,
Template: validPodTemplateAbc.Template,
UpdateStrategy: validUpdateStrategy,
},
},
@@ -402,7 +402,7 @@ func TestValidateDaemonSetUpdate(t *testing.T) {
ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault},
Spec: extensions.DaemonSetSpec{
Selector: &extensions.LabelSelector{MatchLabels: validSelector2},
Template: &validPodTemplateAbc2.Template,
Template: validPodTemplateAbc2.Template,
UpdateStrategy: validUpdateStrategy,
},
},
@@ -412,7 +412,7 @@ func TestValidateDaemonSetUpdate(t *testing.T) {
ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault},
Spec: extensions.DaemonSetSpec{
Selector: &extensions.LabelSelector{MatchLabels: validSelector},
Template: &validPodTemplateAbc.Template,
Template: validPodTemplateAbc.Template,
UpdateStrategy: validUpdateStrategy,
},
},
@@ -420,7 +420,7 @@ func TestValidateDaemonSetUpdate(t *testing.T) {
ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault},
Spec: extensions.DaemonSetSpec{
Selector: &extensions.LabelSelector{MatchLabels: validSelector},
Template: &validPodTemplateNodeSelector.Template,
Template: validPodTemplateNodeSelector.Template,
UpdateStrategy: validUpdateStrategy,
},
},
@@ -439,7 +439,7 @@ func TestValidateDaemonSetUpdate(t *testing.T) {
ObjectMeta: api.ObjectMeta{Name: "", Namespace: api.NamespaceDefault},
Spec: extensions.DaemonSetSpec{
Selector: &extensions.LabelSelector{MatchLabels: validSelector},
Template: &validPodTemplateAbc.Template,
Template: validPodTemplateAbc.Template,
UpdateStrategy: validUpdateStrategy,
},
},
@@ -447,7 +447,7 @@ func TestValidateDaemonSetUpdate(t *testing.T) {
ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault},
Spec: extensions.DaemonSetSpec{
Selector: &extensions.LabelSelector{MatchLabels: validSelector},
Template: &validPodTemplateAbc.Template,
Template: validPodTemplateAbc.Template,
UpdateStrategy: validUpdateStrategy,
},
},
@@ -457,7 +457,7 @@ func TestValidateDaemonSetUpdate(t *testing.T) {
ObjectMeta: api.ObjectMeta{Name: "", Namespace: api.NamespaceDefault},
Spec: extensions.DaemonSetSpec{
Selector: &extensions.LabelSelector{MatchLabels: validSelector},
Template: &validPodTemplateAbc.Template,
Template: validPodTemplateAbc.Template,
UpdateStrategy: validUpdateStrategy,
},
},
@@ -465,7 +465,7 @@ func TestValidateDaemonSetUpdate(t *testing.T) {
ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault},
Spec: extensions.DaemonSetSpec{
Selector: &extensions.LabelSelector{MatchLabels: invalidSelector},
Template: &validPodTemplateAbc.Template,
Template: validPodTemplateAbc.Template,
UpdateStrategy: validUpdateStrategy,
},
},
@@ -475,7 +475,7 @@ func TestValidateDaemonSetUpdate(t *testing.T) {
ObjectMeta: api.ObjectMeta{Name: "", Namespace: api.NamespaceDefault},
Spec: extensions.DaemonSetSpec{
Selector: &extensions.LabelSelector{MatchLabels: validSelector},
Template: &validPodTemplateAbc.Template,
Template: validPodTemplateAbc.Template,
UpdateStrategy: validUpdateStrategy,
},
},
@@ -483,7 +483,7 @@ func TestValidateDaemonSetUpdate(t *testing.T) {
ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault},
Spec: extensions.DaemonSetSpec{
Selector: &extensions.LabelSelector{MatchLabels: validSelector},
Template: &invalidPodTemplate.Template,
Template: invalidPodTemplate.Template,
UpdateStrategy: validUpdateStrategy,
},
},
@@ -493,7 +493,7 @@ func TestValidateDaemonSetUpdate(t *testing.T) {
ObjectMeta: api.ObjectMeta{Name: "", Namespace: api.NamespaceDefault},
Spec: extensions.DaemonSetSpec{
Selector: &extensions.LabelSelector{MatchLabels: validSelector},
Template: &validPodTemplateAbc.Template,
Template: validPodTemplateAbc.Template,
UpdateStrategy: validUpdateStrategy,
},
},
@@ -501,7 +501,7 @@ func TestValidateDaemonSetUpdate(t *testing.T) {
ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault},
Spec: extensions.DaemonSetSpec{
Selector: &extensions.LabelSelector{MatchLabels: validSelector},
Template: &validPodTemplateDef.Template,
Template: validPodTemplateDef.Template,
UpdateStrategy: validUpdateStrategy,
},
},
@@ -511,7 +511,7 @@ func TestValidateDaemonSetUpdate(t *testing.T) {
ObjectMeta: api.ObjectMeta{Name: "", Namespace: api.NamespaceDefault},
Spec: extensions.DaemonSetSpec{
Selector: &extensions.LabelSelector{MatchLabels: validSelector},
Template: &validPodTemplateAbc.Template,
Template: validPodTemplateAbc.Template,
UpdateStrategy: validUpdateStrategy,
},
},
@@ -519,7 +519,7 @@ func TestValidateDaemonSetUpdate(t *testing.T) {
ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault},
Spec: extensions.DaemonSetSpec{
Selector: &extensions.LabelSelector{MatchLabels: validSelector},
Template: &readWriteVolumePodTemplate.Template,
Template: readWriteVolumePodTemplate.Template,
UpdateStrategy: validUpdateStrategy,
},
},
@@ -529,7 +529,7 @@ func TestValidateDaemonSetUpdate(t *testing.T) {
ObjectMeta: api.ObjectMeta{Name: "", Namespace: api.NamespaceDefault},
Spec: extensions.DaemonSetSpec{
Selector: &extensions.LabelSelector{MatchLabels: validSelector},
Template: &validPodTemplateAbc.Template,
Template: validPodTemplateAbc.Template,
UpdateStrategy: validUpdateStrategy,
},
},
@@ -537,7 +537,7 @@ func TestValidateDaemonSetUpdate(t *testing.T) {
ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault},
Spec: extensions.DaemonSetSpec{
Selector: &extensions.LabelSelector{MatchLabels: invalidSelector},
Template: &validPodTemplateAbc.Template,
Template: validPodTemplateAbc.Template,
UpdateStrategy: extensions.DaemonSetUpdateStrategy{
Type: extensions.RollingUpdateDaemonSetStrategyType,
RollingUpdate: nil,
@@ -590,7 +590,7 @@ func TestValidateDaemonSet(t *testing.T) {
ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault},
Spec: extensions.DaemonSetSpec{
Selector: &extensions.LabelSelector{MatchLabels: validSelector},
Template: &validPodTemplate.Template,
Template: validPodTemplate.Template,
UpdateStrategy: validUpdateStrategy,
},
},
@@ -598,7 +598,7 @@ func TestValidateDaemonSet(t *testing.T) {
ObjectMeta: api.ObjectMeta{Name: "abc-123", Namespace: api.NamespaceDefault},
Spec: extensions.DaemonSetSpec{
Selector: &extensions.LabelSelector{MatchLabels: validSelector},
Template: &validPodTemplate.Template,
Template: validPodTemplate.Template,
UpdateStrategy: validUpdateStrategy,
},
},
@@ -614,27 +614,27 @@ func TestValidateDaemonSet(t *testing.T) {
ObjectMeta: api.ObjectMeta{Name: "", Namespace: api.NamespaceDefault},
Spec: extensions.DaemonSetSpec{
Selector: &extensions.LabelSelector{MatchLabels: validSelector},
Template: &validPodTemplate.Template,
Template: validPodTemplate.Template,
},
},
"missing-namespace": {
ObjectMeta: api.ObjectMeta{Name: "abc-123"},
Spec: extensions.DaemonSetSpec{
Selector: &extensions.LabelSelector{MatchLabels: validSelector},
Template: &validPodTemplate.Template,
Template: validPodTemplate.Template,
},
},
"empty selector": {
ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault},
Spec: extensions.DaemonSetSpec{
Template: &validPodTemplate.Template,
Template: validPodTemplate.Template,
},
},
"selector_doesnt_match": {
ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault},
Spec: extensions.DaemonSetSpec{
Selector: &extensions.LabelSelector{MatchLabels: map[string]string{"foo": "bar"}},
Template: &validPodTemplate.Template,
Template: validPodTemplate.Template,
},
},
"invalid template": {
@@ -653,7 +653,7 @@ func TestValidateDaemonSet(t *testing.T) {
},
Spec: extensions.DaemonSetSpec{
Selector: &extensions.LabelSelector{MatchLabels: validSelector},
Template: &validPodTemplate.Template,
Template: validPodTemplate.Template,
},
},
"invalid_label 2": {
@@ -665,7 +665,7 @@ func TestValidateDaemonSet(t *testing.T) {
},
},
Spec: extensions.DaemonSetSpec{
Template: &invalidPodTemplate.Template,
Template: invalidPodTemplate.Template,
},
},
"invalid_annotation": {
@@ -678,7 +678,7 @@ func TestValidateDaemonSet(t *testing.T) {
},
Spec: extensions.DaemonSetSpec{
Selector: &extensions.LabelSelector{MatchLabels: validSelector},
Template: &validPodTemplate.Template,
Template: validPodTemplate.Template,
},
},
"invalid restart policy 1": {
@@ -688,7 +688,7 @@ func TestValidateDaemonSet(t *testing.T) {
},
Spec: extensions.DaemonSetSpec{
Selector: &extensions.LabelSelector{MatchLabels: validSelector},
Template: &api.PodTemplateSpec{
Template: api.PodTemplateSpec{
Spec: api.PodSpec{
RestartPolicy: api.RestartPolicyOnFailure,
DNSPolicy: api.DNSClusterFirst,
@@ -707,7 +707,7 @@ func TestValidateDaemonSet(t *testing.T) {
},
Spec: extensions.DaemonSetSpec{
Selector: &extensions.LabelSelector{MatchLabels: validSelector},
Template: &api.PodTemplateSpec{
Template: api.PodTemplateSpec{
Spec: api.PodSpec{
RestartPolicy: api.RestartPolicyNever,
DNSPolicy: api.DNSClusterFirst,