update statefulset pod's image in updateStatefulSet

pkg/controller/statefulset/stateful_pod_control.go

@@ -108,6 +108,12 @@ func (spc *realStatefulPodControl) UpdateStatefulPod(set *apps.StatefulSet, pod
 				return err
 			}
 		}
+		// if the Pod does not conform to the StatefulSet's image, update the Pod's image
+		if !imageMatches(set, pod) {
+			updateImage(set, pod)
+			consistent = false
+		}
+
 		// if the Pod is not dirty, do nothing
 		if consistent {
 			return nil

pkg/controller/statefulset/stateful_set_control.go

@@ -452,7 +452,7 @@ func (ssc *defaultStatefulSetControl) updateStatefulSet(
 			return &status, nil
 		}
 		// Enforce the StatefulSet invariants
-		if identityMatches(set, replicas[i]) && storageMatches(set, replicas[i]) {
+		if identityMatches(set, replicas[i]) && storageMatches(set, replicas[i]) && imageMatches(set, replicas[i]) {
 			continue
 		}
 		// Make a deep copy so we don't mutate the shared cache

pkg/controller/statefulset/stateful_set_utils.go

@@ -132,6 +132,20 @@ func storageMatches(set *apps.StatefulSet, pod *v1.Pod) bool {
 	return true
 }
 
+// imageMatches returns true if pod's image is the same with StatefulSet's image
+func imageMatches(set *apps.StatefulSet, pod *v1.Pod) bool {
+	for _, cs := range set.Spec.Template.Spec.Containers {
+		for _, cp := range pod.Spec.Containers {
+			if cs.Name == cp.Name {
+				if cs.Image != cp.Image {
+					return false
+				}
+			}
+		}
+	}
+	return true
+}
+
 // getPersistentVolumeClaims gets a map of PersistentVolumeClaims to their template names, as defined in set. The
 // returned PersistentVolumeClaims are each constructed with a the name specific to the Pod. This name is determined
 // by getPersistentVolumeClaimName.
@@ -199,6 +213,19 @@ func updateIdentity(set *apps.StatefulSet, pod *v1.Pod) {
 	pod.Labels[apps.StatefulSetPodNameLabel] = pod.Name
 }
 
+// updateImage updates pod's image to conform to set's image
+func updateImage(set *apps.StatefulSet, pod *v1.Pod) {
+	for si, sc := range set.Spec.Template.Spec.Containers {
+		for pi, pc := range pod.Spec.Containers {
+			if sc.Name == pc.Name {
+				if sc.Image != pc.Image {
+					pod.Spec.Containers[pi].Image = set.Spec.Template.Spec.Containers[si].Image
+				}
+			}
+		}
+	}
+}
+
 // isRunningAndReady returns true if pod is in the PodRunning Phase, if it has a condition of PodReady.
 func isRunningAndReady(pod *v1.Pod) bool {
 	return pod.Status.Phase == v1.PodRunning && podutil.IsPodReady(pod)