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

Merge pull request #12595 from smarterclayton/add_pod_status_ip

Browse Source 
Add status.podIP as a valid downward API target
This commit is contained in:
Brendan Burns
2015-08-14 20:29:50 -07:00
parent 9cc5156b69 01f3785426
commit a9580a0ad0
8 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/api/v1/conversion.go
View File

@@ -44,6 +44,7 @@ func addConversionFuncs() {
case "metadata.name",
"metadata.namespace",
"status.phase",
"status.podIP",
"spec.nodeName":
return label, value, nil
// This is for backwards compatibility with old v1 clients which send spec.host

2
pkg/api/validation/validation.go
View File

@@ -680,7 +680,7 @@ func validateEnvVarValueFrom(ev api.EnvVar) errs.ValidationErrorList {
return allErrs
}
var validFieldPathExpressions = util.NewStringSet("metadata.name", "metadata.namespace")
var validFieldPathExpressions = util.NewStringSet("metadata.name", "metadata.namespace", "status.podIP")
func validateObjectFieldSelector(fs *api.ObjectFieldSelector) errs.ValidationErrorList {
allErrs := errs.ValidationErrorList{}

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

@@ -667,7 +667,7 @@ func TestValidateEnv(t *testing.T) {
},
},
}},
expectedError: "[0].valueFrom.fieldRef.fieldPath: unsupported value 'status.phase', Details: supported values: metadata.name, metadata.namespace",
expectedError: "[0].valueFrom.fieldRef.fieldPath: unsupported value 'status.phase', Details: supported values: metadata.name, metadata.namespace, status.podIP",
},
}
for _, tc := range errorCases {