Skip to content

Commit

Permalink
Enh/stable worker hash (gardener#4237)
Browse files Browse the repository at this point in the history
* Exclude cri.name `docker` from worker hash calculation

Worker pools with `CRI==nil` use `docker` as their container runtime. Changing to an explicit configuration of `docker` should not trigger a node rollout. Therefore, we need to keep the Worker hash stable by excluding the `cri.name` property from hash calculation in this case.

Co-authored-by: Max Becker <max.becker@sap.com>

* Merge two if-blocks into single 'and' condition

Co-authored-by: Max Becker <max.becker@sap.com>
  • Loading branch information
2 people authored and Kristiyan Gostev committed Jul 5, 2022
1 parent 728fc20 commit 872d703
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 1 deletion.
3 changes: 2 additions & 1 deletion extensions/pkg/controller/worker/machines.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (

extensionscontroller "github.com/gardener/gardener/extensions/pkg/controller"
"github.com/gardener/gardener/extensions/pkg/util"
gardencorev1beta1 "github.com/gardener/gardener/pkg/apis/core/v1beta1"
extensionsv1alpha1 "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1"
"github.com/gardener/gardener/pkg/utils"

Expand Down Expand Up @@ -145,7 +146,7 @@ func WorkerPoolHash(pool extensionsv1alpha1.WorkerPool, cluster *extensionscontr

for _, w := range cluster.Shoot.Spec.Provider.Workers {
if pool.Name == w.Name {
if w.CRI != nil {
if w.CRI != nil && w.CRI.Name != gardencorev1beta1.CRINameDocker {
data = append(data, string(w.CRI.Name))
}
}
Expand Down
14 changes: 14 additions & 0 deletions extensions/pkg/controller/worker/machines_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,20 @@ var _ = Describe("Machines", func() {
},
})
})

It("when changing CRI configuration from `nil` to `docker`", func() {
v, err = WorkerPoolHash(*p, &extensionscontroller.Cluster{
Shoot: &gardencorev1beta1.Shoot{
Spec: gardencorev1beta1.ShootSpec{
Kubernetes: gardencorev1beta1.Kubernetes{
Version: "1.2.4",
},
Provider: gardencorev1beta1.Provider{Workers: []gardencorev1beta1.Worker{
{Name: "test-worker", CRI: &gardencorev1beta1.CRI{Name: gardencorev1beta1.CRINameDocker}}}},
},
},
})
})
})

Context("hash value should change", func() {
Expand Down

0 comments on commit 872d703

Please sign in to comment.