Skip to content

Commit 9f6d384

Browse files
authored
Merge pull request #11939 from sbueringer/pr-control-plane-stable
🌱 Consider IsProvisioning to determine if ControlPlane is stable
2 parents 346f861 + d6290c7 commit 9f6d384

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

cmd/clusterctl/client/cluster/assets/topology-test/existing-my-cluster.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,8 @@ spec:
110110
maxSurge: 1
111111
type: RollingUpdate
112112
version: v1.21.2
113+
status:
114+
version: v1.21.2
113115
---
114116
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
115117
kind: DockerMachineTemplate

exp/topology/scope/upgradetracker.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,11 @@ func NewUpgradeTracker(opts ...UpgradeTrackerOption) *UpgradeTracker {
154154

155155
// IsControlPlaneStable returns true is the ControlPlane is stable.
156156
func (t *ControlPlaneUpgradeTracker) IsControlPlaneStable() bool {
157+
// If the current control plane is provisioning it is not considered stable.
158+
if t.IsProvisioning {
159+
return false
160+
}
161+
157162
// If the current control plane is upgrading it is not considered stable.
158163
if t.IsUpgrading {
159164
return false

0 commit comments

Comments
 (0)