Merge pull request #44763 from ncdc/fix-replication-controller-log-ptr-check

Automatic merge from submit-queue More RC/RS controller logging updates We were comparing the address of the old and new RC.spec.replicas and we have to compare the values. This only affects logging. Update RS controller to match RC controller to log when spec.replicas changes, not status.replicas. @kargakis @janetkuo @sttts @liggitt

Merge pull request #44763 from ncdc/fix-replication-controller-log-ptr-check
25ec2607 · Kubernetes Submit Queue · GitHub · c4bc7c11 · 4a47c476 · 25ec2607
Commit 25ec2607 authored Apr 21, 2017 by Kubernetes Submit Queue Committed by GitHub Apr 21, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

replica_set.go pkg/controller/replicaset/replica_set.go +2 -2

replication_controller.go pkg/controller/replication/replication_controller.go +1 -1

No files found.
--- a/pkg/controller/replicaset/replica_set.go
+++ b/pkg/controller/replicaset/replica_set.go
@@ -219,8 +219,8 @@ func (rsc *ReplicaSetController) updateRS(old, cur interface{}) {
 	// this function), but in general extra resyncs shouldn't be
 	// that bad as ReplicaSets that haven't met expectations yet won't
 	// sync, and all the listing is done using local stores.
-	if oldRS.Status.Replicas != curRS.Status.Replicas {
-		glog.V(4).Infof("Observed updated replica count for ReplicaSet: %v, %d->%d", curRS.Name, oldRS.Status.Replicas, curRS.Status.Replicas)
+	if *(oldRS.Spec.Replicas) != *(curRS.Spec.Replicas) {
+		glog.V(4).Infof("Replica set %v updated. Desired pod count change: %d->%d", curRS.Name, *(oldRS.Spec.Replicas), *(curRS.Spec.Replicas))
 	}
 	rsc.enqueueReplicaSet(cur)
 }

--- a/pkg/controller/replication/replication_controller.go
+++ b/pkg/controller/replication/replication_controller.go
@@ -214,7 +214,7 @@ func (rm *ReplicationManager) updateRC(old, cur interface{}) {
 	// this function), but in general extra resyncs shouldn't be
 	// that bad as rcs that haven't met expectations yet won't
 	// sync, and all the listing is done using local stores.
-	if oldRC.Spec.Replicas != curRC.Spec.Replicas {
+	if *(oldRC.Spec.Replicas) != *(curRC.Spec.Replicas) {
 		glog.V(4).Infof("Replication controller %v updated. Desired pod count change: %d->%d", curRC.Name, *(oldRC.Spec.Replicas), *(curRC.Spec.Replicas))
 	}
 	rm.enqueueController(cur)