Merge pull request #66115 from jasonrichardsmith/add-serviceAccount-fieldselector

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. added serviceAccountName to field selectors What this PR does / why we need it: Which issue this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close that issue when PR gets merged): fixes #66114 Special notes for your reviewer: ```release-note NONE ```

Merge pull request #66115 from jasonrichardsmith/add-serviceAccount-fieldselector
c5d15cb0 · Kubernetes Submit Queue · GitHub · 6a12a280 · 4ba7fd5f · c5d15cb0
Unverified Commit c5d15cb0 authored Aug 15, 2018 by Kubernetes Submit Queue Committed by GitHub Aug 15, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 17 additions and 1 deletion

conversion.go pkg/apis/core/v1/conversion.go +1 -0

strategy.go pkg/registry/core/pod/strategy.go +2 -1

strategy_test.go pkg/registry/core/pod/strategy_test.go +14 -0

No files found.
--- a/pkg/apis/core/v1/conversion.go
+++ b/pkg/apis/core/v1/conversion.go
@@ -63,6 +63,7 @@ func addConversionFuncs(scheme *runtime.Scheme) error {
 				"spec.nodeName",
 				"spec.restartPolicy",
 				"spec.schedulerName",
+				"spec.serviceAccountName",
 				"status.phase",
 				"status.podIP",
 				"status.nominatedNodeName":

--- a/pkg/registry/core/pod/strategy.go
+++ b/pkg/registry/core/pod/strategy.go
@@ -237,10 +237,11 @@ func PodToSelectableFields(pod *api.Pod) fields.Set {
 	// amount of allocations needed to create the fields.Set. If you add any
 	// field here or the number of object-meta related fields changes, this should
 	// be adjusted.
-	podSpecificFieldsSet := make(fields.Set, 8)
+	podSpecificFieldsSet := make(fields.Set, 9)
 	podSpecificFieldsSet["spec.nodeName"] = pod.Spec.NodeName
 	podSpecificFieldsSet["spec.restartPolicy"] = string(pod.Spec.RestartPolicy)
 	podSpecificFieldsSet["spec.schedulerName"] = string(pod.Spec.SchedulerName)
+	podSpecificFieldsSet["spec.serviceAccountName"] = string(pod.Spec.ServiceAccountName)
 	podSpecificFieldsSet["status.phase"] = string(pod.Status.Phase)
 	podSpecificFieldsSet["status.podIP"] = string(pod.Status.PodIP)
 	podSpecificFieldsSet["status.nominatedNodeName"] = string(pod.Status.NominatedNodeName)

--- a/pkg/registry/core/pod/strategy_test.go
+++ b/pkg/registry/core/pod/strategy_test.go
@@ -88,6 +88,20 @@ func TestMatchPod(t *testing.T) {
 		},
 		{
 			in: &api.Pod{
+				Spec: api.PodSpec{ServiceAccountName: "serviceAccount1"},
+			},
+			fieldSelector: fields.ParseSelectorOrDie("spec.serviceAccountName=serviceAccount1"),
+			expectMatch:   true,
+		},
+		{
+			in: &api.Pod{
+				Spec: api.PodSpec{SchedulerName: "serviceAccount1"},
+			},
+			fieldSelector: fields.ParseSelectorOrDie("spec.serviceAccountName=serviceAccount2"),
+			expectMatch:   false,
+		},
+		{
+			in: &api.Pod{
 				Status: api.PodStatus{Phase: api.PodRunning},
 			},
 			fieldSelector: fields.ParseSelectorOrDie("status.phase=Running"),