Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backwards compatibility when using the original update annoation with an OnDelete update strategy #284

Merged
merged 2 commits into from
Mar 16, 2021
+35 −4
Merged

Backwards compatibility when using the original update annoation with an OnDelete update strategy #284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7645df9
Add support for original update annotation with OnDelete strategy
nbroyles Mar 16, 2021
30899e0
Clarify pod update comment
nbroyles Mar 16, 2021
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
14 changes: 10 additions & 4 deletions pkg/controller/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -583,11 +583,11 @@ func (c *M3DBController) handleClusterUpdate(cluster *myspec.M3DBCluster) error
}

// Using an OnDelete strategy, we have to update nodes if:
// - a statefulset update just happened
// - a statefulset update has happened OR
// - we're already in the middle of a rollout
// * because nodes are rolled out in chunks this can happen in many iterations
// Therefore, always check to see if pods need to be updated and return from this loop
// if the statefulset or pods were updated. If a rollout is finished or there has not
// * because nodes are rolled out in chunks, this can happen over many iterations
// Therefore, check to see if pods need to be updated and return from this loop
// if pods were updated. If a rollout is finished or there has not
// been a change, this call is a no-op.
if onDeleteUpdateStrategy {
nodesUpdated, err := c.updateStatefulSetPods(cluster, actual)
Expand Down Expand Up @@ -1316,6 +1316,12 @@ func copyAnnotations(expected, actual *appsv1.StatefulSet) {
// the cluster spec.
for k, v := range actual.Annotations {
if k == annotations.Update {
// NB(nate): add this check for backwards compatibility. Existing components
// may be using the old update annotation. We want to ensure rollouts still work as
// expected.
if expected.Spec.UpdateStrategy.Type == appsv1.OnDeleteStatefulSetStrategyType {
expected.Annotations[annotations.ParallelUpdateInProgress] = "1"
}
continue
}

Expand Down
25 changes: 25 additions & 0 deletions pkg/controller/controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1011,6 +1011,31 @@ func TestHandleUpdateClusterOnDeleteStrategy(t *testing.T) {
},
updateVal: 1,
},
{
name: "update with the old update annotation",
sets: []*metav1.ObjectMeta{
newMeta("cluster1-rep0", nil, map[string]string{
annotations.Update: annotations.EnabledVal,
}),
newMeta("cluster1-rep1", nil, map[string]string{
annotations.Update: annotations.EnabledVal,
}),
newMeta("cluster1-rep2", nil, map[string]string{
annotations.Update: annotations.EnabledVal,
}),
},
pods: generatePods(clusterName, replicas, 2, currentRevision),
expUpdateStatefulSets: []string{"cluster1-rep0", "cluster1-rep1", "cluster1-rep2"},
expPodUpdateGroups: [][]string{
{"cluster1-rep0-0"},
{"cluster1-rep0-1"},
{"cluster1-rep1-0"},
{"cluster1-rep1-1"},
{"cluster1-rep2-0"},
{"cluster1-rep2-1"},
},
updateVal: 1,
},
{
name: "no update annotation, do nothing",
sets: generateSets(clusterName, replicas, "3", false),
Expand Down