public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #251 from zalando-incubator/feature/refactor-compare-containers 

Move container comparison logic to a separate function
This commit is contained in:
Dmitry Dolgov 2018-02-23 14:32:55 +01:00 committed by GitHub
parent c4aab502b3 ef50b147c5
commit 7b05758893
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 47 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
pkg/cluster/cluster.go
View File

@ -309,33 +309,7 @@ func (c *Cluster) compareStatefulSetWith(statefulSet *v1beta1.StatefulSet) *comp
needsRollUpdate = true
reasons = append(reasons, "new statefulset's container specification doesn't match the current one")
} else {
for index, container1 := range c.Statefulset.Spec.Template.Spec.Containers {
container2 := statefulSet.Spec.Template.Spec.Containers[index]
if container1.Name != container2.Name {
needsRollUpdate = true
reasons = append(reasons, fmt.Sprintf("new statefulset's container %d name doesn't match the current one", index))
}
if container1.Image != container2.Image {
needsRollUpdate = true
reasons = append(reasons, fmt.Sprintf("new statefulset's container %d image doesn't match the current one", index))
}
if !reflect.DeepEqual(container1.Ports, container2.Ports) {
needsRollUpdate = true
reasons = append(reasons, fmt.Sprintf("new statefulset's container %d ports don't match the current one", index))
}
if !compareResources(&container1.Resources, &container2.Resources) {
needsRollUpdate = true
reasons = append(reasons, fmt.Sprintf("new statefulset's container %d resources don't match the current ones", index))
}
if !reflect.DeepEqual(container1.Env, container2.Env) {
needsRollUpdate = true
reasons = append(reasons, fmt.Sprintf("new statefulset's container %d environment doesn't match the current one", index))
}
if !reflect.DeepEqual(container1.EnvFrom, container2.EnvFrom) {
needsRollUpdate = true
reasons = append(reasons, fmt.Sprintf("new statefulset's container %d environment sources don't match the current one", index))
}
}
needsRollUpdate, reasons = c.compareContainers(c.Statefulset, statefulSet)
}
if len(c.Statefulset.Spec.Template.Spec.Containers) == 0 {
c.logger.Warningf("statefulset %q has no container", util.NameFromMeta(c.Statefulset.ObjectMeta))
@ -403,6 +377,52 @@ func (c *Cluster) compareStatefulSetWith(statefulSet *v1beta1.StatefulSet) *comp
return &compareStatefulsetResult{match: match, reasons: reasons, rollingUpdate: needsRollUpdate, replace: needsReplace}
}
type ContainerCondition func(a, b v1.Container) bool
type ContainerCheck struct {
condition ContainerCondition
reason string
}
func NewCheck(msg string, cond ContainerCondition) ContainerCheck {
return ContainerCheck{reason: msg, condition: cond}
}
// compareContainers: compare containers from two stateful sets
// and return:
// * whether or not roll update is needed
// * a list of reasons in a human readable format
func (c *Cluster) compareContainers(setA, setB *v1beta1.StatefulSet) (bool, []string) {
reasons := make([]string, 0)
needsRollUpdate := false
checks := []ContainerCheck{
NewCheck("new statefulset's container %d name doesn't match the current one",
func(a, b v1.Container) bool { return a.Name != b.Name }),
NewCheck("new statefulset's container %d image doesn't match the current one",
func(a, b v1.Container) bool { return a.Image != b.Image }),
NewCheck("new statefulset's container %d ports don't match the current one",
func(a, b v1.Container) bool { return !reflect.DeepEqual(a.Ports, b.Ports) }),
NewCheck("new statefulset's container %d resources don't match the current ones",
func(a, b v1.Container) bool { return !compareResources(&a.Resources, &b.Resources) }),
NewCheck("new statefulset's container %d environment doesn't match the current one",
func(a, b v1.Container) bool { return !reflect.DeepEqual(a.Env, b.Env) }),
NewCheck("new statefulset's container %d environment sources don't match the current one",
func(a, b v1.Container) bool { return !reflect.DeepEqual(a.EnvFrom, b.EnvFrom) }),
}
for index, containerA := range setA.Spec.Template.Spec.Containers {
containerB := setB.Spec.Template.Spec.Containers[index]
for _, check := range checks {
if check.condition(containerA, containerB) {
needsRollUpdate = true
reasons = append(reasons, fmt.Sprintf(check.reason, index))
}
}
}
return needsRollUpdate, reasons
}
func compareResources(a *v1.ResourceRequirements, b *v1.ResourceRequirements) (equal bool) {
equal = true
if a != nil {