github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
pull/6/head
Andy Goldstein 2017-04-21 07:42:50 -04:00
parent cd37aaafb3
commit 4a47c47650
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/controller/replicaset/replica_set.go
View File

@ -219,8 +219,8 @@ func (rsc *ReplicaSetController) updateRS(old, cur interface{}) {
// this function), but in general extra resyncs shouldn't be // this function), but in general extra resyncs shouldn't be
// that bad as ReplicaSets that haven't met expectations yet won't // that bad as ReplicaSets that haven't met expectations yet won't
// sync, and all the listing is done using local stores. // sync, and all the listing is done using local stores.
if oldRS.Status.Replicas != curRS.Status.Replicas { if *(oldRS.Spec.Replicas) != *(curRS.Spec.Replicas) {
glog.V(4).Infof("Observed updated replica count for ReplicaSet: %v, %d->%d", curRS.Name, oldRS.Status.Replicas, curRS.Status.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) rsc.enqueueReplicaSet(cur)
} }

2
pkg/controller/replication/replication_controller.go
View File

@ -214,7 +214,7 @@ func (rm *ReplicationManager) updateRC(old, cur interface{}) {
// this function), but in general extra resyncs shouldn't be // this function), but in general extra resyncs shouldn't be
// that bad as rcs that haven't met expectations yet won't // that bad as rcs that haven't met expectations yet won't
// sync, and all the listing is done using local stores. // 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)) 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) rm.enqueueController(cur)