Update status message to show upgrade type #7518
Merged
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
eks-distro-bot
added
the
size/M
taneyland
reviewed
Feb 8, 2024
rahulbabu95
reviewed
Feb 8, 2024
ahreehong
force-pushed
the
update-status-message
branch
from
b5777a7 to
638bac0
Compare
eks-distro-bot
added
size/S
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## main #7518 +/- ##
==========================================
+ Coverage 73.48% 73.56% +0.07%
==========================================
Files 579 580 +1
Lines 36357 36504 +147
==========================================
+ Hits 26718 26853 +135
- Misses 7875 7888 +13
+ Partials 1764 1763 -1 ☔ View full report in Codecov by Sentry. |
ahreehong
force-pushed
the
update-status-message
branch
from
638bac0 to
da830a5
Compare
eks-distro-bot
added
size/M
ahreehong
force-pushed
the
update-status-message
branch
from
da830a5 to
0c7c00f
Compare
eks-distro-bot
added
size/S
ahreehong
force-pushed
the
update-status-message
branch
from
0c7c00f to
d063115
Compare
eks-distro-bot
added
size/L
pkg/controller/clusters/status.go
Outdated
Comment on lines
84
to
90
| upgradeReason := anywherev1.RollingUpgradeInProgress | ||
| if cluster.Spec.ControlPlaneConfiguration.UpgradeRolloutStrategy != nil { | ||
| if cluster.Spec.ControlPlaneConfiguration.UpgradeRolloutStrategy.Type == anywherev1.InPlaceStrategyType { | ||
| upgradeReason = anywherev1.InPlaceUpgradeInProgress | ||
| } | ||
| } | ||
| conditions.MarkFalse(cluster, anywherev1.ControlPlaneReadyCondition, upgradeReason, clusterv1.ConditionSeverityInfo, "Etcd is not ready") |
There was a problem hiding this comment.
InPlace is not supported for external etcd. I'd remove this
| @@ -218,7 +230,13 @@ func updateWorkersReadyCondition(cluster *anywherev1.Cluster, machineDeployments | |||
| // so reflect that on the conditon with an appropriate message. | |||
| totalOutdated := totalReplicas - totalUpdatedReplicas | |||
| if totalOutdated > 0 { | |||
| conditions.MarkFalse(cluster, anywherev1.WorkersReadyCondition, anywherev1.RollingUpgradeInProgress, clusterv1.ConditionSeverityInfo, "Worker nodes not up-to-date yet, %d rolling (%d up to date)", totalReplicas, totalUpdatedReplicas) | |||
| upgradeReason := anywherev1.RollingUpgradeInProgress | |||
| if cluster.Spec.ControlPlaneConfiguration.UpgradeRolloutStrategy != nil { | |||
There was a problem hiding this comment.
nit: can you add a comment saying we are using cp's upgrade strategy here because we already validate that all the machines have the same upgrade strategy.
Comment on lines
1226
to
1245
| // func TestUpdateClusterStatusForInPlaceUpgrades(t *testing.T) { | ||
| // g := NewWithT(t) | ||
|
|
||
| // tests := []struct { | ||
| // name string | ||
| // machineDeployments []clusterv1.MachineDeployment | ||
| // workerNodeGroupConfigurations []anywherev1.WorkerNodeGroupConfiguration | ||
| // conditions []anywherev1.Condition | ||
| // wantCondition *anywherev1.Condition | ||
| // wantErr string | ||
| // }{ | ||
| // { | ||
| // name: "control plane replicas out of date, inplace upgrade", | ||
| // kcp: test.KubeadmControlPlane(func(kcp *controlplanev1.KubeadmControlPlane) { | ||
| // kcp.Status.ReadyReplicas = 3 | ||
| // kcp.Status.Replicas = 3 | ||
| // kcp.Status.UpdatedReplicas = 1 | ||
|
|
||
| // kcp.Status.Conditions = []clusterv1.Condition{ | ||
| // { |
ahreehong
force-pushed
the
update-status-message
branch
from
d063115 to
05f34d8
Compare
abhinavmpandey08
approved these changes
Feb 12, 2024
|
In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: abhinavmpandey08 The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
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.
Issue #, if available:
Description of changes:
Update cluster status to show
RollingUpgradeInProgresswhen the upgrade type isrollingUpgradeandInPlaceUpgradeInProgresswhen the upgrade type isinPlace.For worker nodes, it will show
RollingUpgradeInProgressif all nodes have upgrade typerollingUpgrade,InPlaceUpgradeInProgresswhen the upgrade type isinPlace, andUpgradeInProgressif there is a combination of both upgrade types.Testing (if applicable):
Documentation added/planned (if applicable):
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.