Add drain logic for upgrade-controller SUC plans #28
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
atanasdinov
reviewed
Jul 30, 2024
| @@ -48,6 +48,15 @@ type UpgradePlanSpec struct { | |||
| // ReleaseVersion specifies the target version for platform upgrade. | |||
| // The version format is X.Y.Z, for example "3.0.2". | |||
| ReleaseVersion string `json:"releaseVersion"` | |||
| // +optional | |||
| Drain *Drain `json:"drain"` | |||
There was a problem hiding this comment.
Can we put a comment describing this in order for the CRD to also include it?
api/v1alpha1/upgradeplan_types.go
Outdated
|
|
||
| type Drain struct { | ||
| // +optional | ||
| ControlPlanes *bool `json:"controlPlanes"` |
There was a problem hiding this comment.
It's a nitpick but I believe using a singular form here controlPlane is the better wording. There are multiple control plane nodes in a cluster, but not multiple control planes.
atanasdinov
approved these changes
Jul 30, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As discussed previously the upgrade-controller should:
By default the upgrade-controller will execute drain with the following flags:
--delete-emptydir-data- continue drain even if there are pods utilisingemptyDirstorage--timeout 15m0s- the amount of time for which to wait for the drain operation to finish. Ensures that the drain operation will not block the upgrade flow--ignore-daemonsets- ignores DaemonSet-managed pods--force- continue even if there are pods that do not have a controller (single pods)Due to the nature of how we do upgrades, node drain will happen twice - once during OS upgrades and once during K8s upgrades.
Tested scenarios: