Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions pkg/operator/staticpod/controller/revision/revision_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package revision

import (
"fmt"
"strings"
"time"

"github.com/golang/glog"
Expand Down Expand Up @@ -134,6 +135,7 @@ func nameFor(name string, revision int32) string {

// isLatestRevisionCurrent returns whether the latest revision is up to date and an optional reason
func (c RevisionController) isLatestRevisionCurrent(revision int32) (bool, string) {
configChanges := []string{}
for _, cm := range c.configMaps {
requiredData := map[string]string{}
existingData := map[string]string{}
Expand All @@ -153,9 +155,14 @@ func (c RevisionController) isLatestRevisionCurrent(revision int32) (bool, strin
existingData = existing.Data
}
if !equality.Semantic.DeepEqual(existingData, requiredData) {
return false, fmt.Sprintf("configmap/%s has changed", cm.Name)
if glog.V(4) {
glog.Infof("configmap %q changes for revision %d: %s", cm.Name, revision, resourceapply.JSONPatch(existing, required))
}
configChanges = append(configChanges, fmt.Sprintf("configmap/%s has changed", cm.Name))
}
}

secretChanges := []string{}
for _, s := range c.secrets {
requiredData := map[string][]byte{}
existingData := map[string][]byte{}
Expand All @@ -175,10 +182,17 @@ func (c RevisionController) isLatestRevisionCurrent(revision int32) (bool, strin
existingData = existing.Data
}
if !equality.Semantic.DeepEqual(existingData, requiredData) {
return false, fmt.Sprintf("secret/%s has changed", s.Name)
if glog.V(4) {
glog.Infof("secret %q changes for revision %d: %s", s.Name, revision, resourceapply.JSONPatch(existing, required))
}
secretChanges = append(secretChanges, fmt.Sprintf("secret/%s has changed", s.Name))
}
}

if len(secretChanges) > 0 || len(configChanges) > 0 {
return false, strings.Join(append(secretChanges, configChanges...), ",")
}

return true, ""
}

Expand Down