scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19824 from pmorie/env-source-variant

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-01-31 20:12:08 -08:00
parent dff7490c57 a45cbcd8a2
commit 54808fb7ab
1 changed files with 56 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
pkg/api/validation/validation_test.go
View File

@@ -823,6 +823,17 @@ func TestValidateEnv(t *testing.T) {
}, },
}, },
}, },
{
Name: "ENV_VAR_1",
ValueFrom: &api.EnvVarSource{
ConfigMapKeyRef: &api.ConfigMapKeySelector{
LocalObjectReference: api.LocalObjectReference{
Name: "some-config-map",
},
Key: "some-key",
},
},
},
} }
if errs := validateEnv(successCase, field.NewPath("field")); len(errs) != 0 { if errs := validateEnv(successCase, field.NewPath("field")); len(errs) != 0 {
t.Errorf("expected success: %v", errs) t.Errorf("expected success: %v", errs)
@@ -858,7 +869,7 @@ func TestValidateEnv(t *testing.T) {
expectedError: "[0].valueFrom: Invalid value: \"\": may not be specified when `value` is not empty", expectedError: "[0].valueFrom: Invalid value: \"\": may not be specified when `value` is not empty",
}, },
{ {
name: "FieldRef and SecretKeyRef specified", name: "valueFrom.fieldRef and valueFrom.secretKeyRef specified",
envs: []api.EnvVar{{ envs: []api.EnvVar{{
Name: "abc", Name: "abc",
ValueFrom: &api.EnvVarSource{ ValueFrom: &api.EnvVarSource{
@@ -876,6 +887,50 @@ func TestValidateEnv(t *testing.T) {
}}, }},
expectedError: "[0].valueFrom: Invalid value: \"\": may not have more than one field specified at a time", expectedError: "[0].valueFrom: Invalid value: \"\": may not have more than one field specified at a time",
}, },
{
name: "valueFrom.fieldRef and valueFrom.configMapKeyRef set",
envs: []api.EnvVar{{
Name: "some_var_name",
ValueFrom: &api.EnvVarSource{
FieldRef: &api.ObjectFieldSelector{
APIVersion: testapi.Default.GroupVersion().String(),
FieldPath: "metadata.name",
},
ConfigMapKeyRef: &api.ConfigMapKeySelector{
LocalObjectReference: api.LocalObjectReference{
Name: "some-config-map",
},
Key: "some-key",
},
},
}},
expectedError: `[0].valueFrom: Invalid value: "": may not have more than one field specified at a time`,
},
{
name: "valueFrom.fieldRef and valueFrom.secretKeyRef specified",
envs: []api.EnvVar{{
Name: "abc",
ValueFrom: &api.EnvVarSource{
FieldRef: &api.ObjectFieldSelector{
APIVersion: testapi.Default.GroupVersion().String(),
FieldPath: "metadata.name",
},
SecretKeyRef: &api.SecretKeySelector{
LocalObjectReference: api.LocalObjectReference{
Name: "a-secret",
},
Key: "a-key",
},
ConfigMapKeyRef: &api.ConfigMapKeySelector{
LocalObjectReference: api.LocalObjectReference{
Name: "some-config-map",
},
Key: "some-key",
},
},
}},
expectedError: `[0].valueFrom: Invalid value: "": may not have more than one field specified at a time`,
},
{ {
name: "missing FieldPath on ObjectFieldSelector", name: "missing FieldPath on ObjectFieldSelector",
envs: []api.EnvVar{{ envs: []api.EnvVar{{