Skip to content

Commit 68be3e5

Browse files
chrischdichrischdi
authored
🌱 v1beta2: implement VSphereCluster's Ready, FailureDomainsReady, ClusterModulesReady and VCenterAvailable conditions for govmomi (#3396)
* vspherecluster: implement Ready, FailureDomainsReady, ClusterModulesReady and VCenterAvailable v1beta2 conditions for govmomi * fixes * review fixes * fix
1 parent 163261c commit 68be3e5

File tree

8 files changed

+216
-69
lines changed

8 files changed

+216
-69
lines changed

‎.golangci.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -214,10 +214,6 @@ issues:
214214
- linters:
215215
- staticcheck
216216
text: "SA1019: \"sigs.k8s.io/cluster-api-provider-vsphere/apis/(v1alpha3|v1alpha4)\" is deprecated: This package will be removed in one of the next releases."
217-
# Deprecations for Cluster API's predicates.ClusterUnpausedAndInfrastructureReady
218-
- linters:
219-
- staticcheck
220-
text: "SA1019: predicates.ClusterUnpausedAndInfrastructureReady is deprecated: This predicate is deprecated and will be removed in a future version, use ClusterPausedTransitionsOrInfrastructureReady instead."
221217
- linters:
222218
- revive
223219
text: "exported: exported method .*\\.(Reconcile|SetupWithManager|SetupWebhookWithManager) should have comment or be unexported"

‎apis/v1beta1/vspherecluster_types.go‎

Lines changed: 70 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,75 @@ const (
2828
ClusterFinalizer = "vspherecluster.infrastructure.cluster.x-k8s.io"
2929
)
3030

31+
// VSphereCluster's Ready condition and corresponding reasons that will be used in v1Beta2 API version.
32+
const (
33+
// VSphereClusterReadyV1Beta2Condition is true if the VSphereCluster's deletionTimestamp is not set, VSphereCluster's
34+
// FailureDomainsReady, VCenterAvailable and ClusterModulesReady conditions are true.
35+
VSphereClusterReadyV1Beta2Condition = clusterv1.ReadyV1Beta2Condition
36+
37+
// VSphereClusterReadyV1Beta2Reason surfaces when the VSphereCluster readiness criteria is met.
38+
VSphereClusterReadyV1Beta2Reason = clusterv1.ReadyV1Beta2Reason
39+
40+
// VSphereClusterNotReadyV1Beta2Reason surfaces when the VSphereCluster readiness criteria is not met.
41+
VSphereClusterNotReadyV1Beta2Reason = clusterv1.NotReadyV1Beta2Reason
42+
43+
// VSphereClusterReadyUnknownV1Beta2Reason surfaces when at least one VSphereCluster readiness criteria is unknown
44+
// and no VSphereCluster readiness criteria is not met.
45+
VSphereClusterReadyUnknownV1Beta2Reason = clusterv1.ReadyUnknownV1Beta2Reason
46+
)
47+
48+
// VSphereCluster's FailureDomainsReady condition and corresponding reasons that will be used in v1Beta2 API version.
49+
const (
50+
// VSphereClusterFailureDomainsReadyV1Beta2Condition documents the status of failure domains for a VSphereCluster.
51+
VSphereClusterFailureDomainsReadyV1Beta2Condition = "FailureDomainsReady"
52+
53+
// VSphereClusterFailureDomainsReadyV1Beta2Reason surfaces when the failure domains for a VSphereCluster are ready.
54+
VSphereClusterFailureDomainsReadyV1Beta2Reason = clusterv1.ReadyV1Beta2Reason
55+
56+
// VSphereClusterFailureDomainsWaitingForFailureDomainStatusV1Beta2Reason surfaces when not all VSphereFailureDomains for a VSphereCluster are ready.
57+
VSphereClusterFailureDomainsWaitingForFailureDomainStatusV1Beta2Reason = "WaitingForFailureDomainStatus"
58+
59+
// VSphereClusterFailureDomainsNotReadyV1Beta2Reason surfaces when the failure domains for a VSphereCluster are not ready.
60+
VSphereClusterFailureDomainsNotReadyV1Beta2Reason = clusterv1.NotReadyV1Beta2Reason
61+
62+
// VSphereClusterFailureDomainsDeletingV1Beta2Reason surfaces when the failure domains for a VSphereCluster are being deleted.
63+
VSphereClusterFailureDomainsDeletingV1Beta2Reason = clusterv1.DeletingV1Beta2Reason
64+
)
65+
66+
// VSphereCluster's VCenterAvailable condition and corresponding reasons that will be used in v1Beta2 API version.
67+
const (
68+
// VSphereClusterVCenterAvailableV1Beta2Condition documents the status of vCenter for a VSphereCluster.
69+
VSphereClusterVCenterAvailableV1Beta2Condition = "VCenterAvailable"
70+
71+
// VSphereClusterVCenterAvailableV1Beta2Reason surfaces when the vCenter for a VSphereCluster is available.
72+
VSphereClusterVCenterAvailableV1Beta2Reason = clusterv1.AvailableV1Beta2Reason
73+
74+
// VSphereClusterVCenterUnreachableV1Beta2Reason surfaces when the vCenter for a VSphereCluster is unreachable.
75+
VSphereClusterVCenterUnreachableV1Beta2Reason = "VCenterUnreachable"
76+
77+
// VSphereClusterVCenterAvailableDeletingV1Beta2Reason surfaces when the VSphereCluster is being deleted.
78+
VSphereClusterVCenterAvailableDeletingV1Beta2Reason = clusterv1.DeletingV1Beta2Reason
79+
)
80+
81+
// VSphereCluster's ClusterModulesReady condition and corresponding reasons that will be used in v1Beta2 API version.
82+
const (
83+
// VSphereClusterClusterModulesReadyV1Beta2Condition documents the status of vCenter for a VSphereCluster.
84+
VSphereClusterClusterModulesReadyV1Beta2Condition = "ClusterModulesReady"
85+
86+
// VSphereClusterClusterModulesReadyV1Beta2Reason surfaces when the cluster modules for a VSphereCluster are ready.
87+
VSphereClusterClusterModulesReadyV1Beta2Reason = clusterv1.ReadyV1Beta2Reason
88+
89+
// VSphereClusterModulesInvalidVCenterVersionV1Beta2Reason surfaces when the cluster modules for a VSphereCluster can't be reconciled
90+
// due to an invalid vCenter version.
91+
VSphereClusterModulesInvalidVCenterVersionV1Beta2Reason = "InvalidVCenterVersion"
92+
93+
// VSphereClusterClusterModulesNotReadyV1Beta2Reason surfaces when the cluster modules for a VSphereCluster are not ready.
94+
VSphereClusterClusterModulesNotReadyV1Beta2Reason = clusterv1.NotReadyV1Beta2Reason
95+
96+
// VSphereClusterClusterModulesDeletingV1Beta2Reason surfaces when the cluster modules for a VSphereCluster are being deleted.
97+
VSphereClusterClusterModulesDeletingV1Beta2Reason = clusterv1.DeletingV1Beta2Reason
98+
)
99+
31100
// VCenterVersion conveys the API version of the vCenter instance.
32101
type VCenterVersion string
33102

@@ -114,7 +183,7 @@ type VSphereClusterStatus struct {
114183
// See https://github.com/kubernetes-sigs/cluster-api/blob/main/docs/proposals/20240916-improve-status-in-CAPI-resources.md for more context.
115184
type VSphereClusterV1Beta2Status struct {
116185
// conditions represents the observations of a VSphereCluster's current state.
117-
// Known condition types are Paused.
186+
// Known condition types are Ready, FailureDomainsReady, VCenterAvailable, ClusterModulesReady and Paused.
118187
// +optional
119188
// +listType=map
120189
// +listMapKey=type

‎config/default/crd/bases/infrastructure.cluster.x-k8s.io_vsphereclusters.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -863,7 +863,7 @@ spec:
863863
conditions:
864864
description: |-
865865
conditions represents the observations of a VSphereCluster's current state.
866-
Known condition types are Paused.
866+
Known condition types are Ready, FailureDomainsReady, VCenterAvailable, ClusterModulesReady and Paused.
867867
items:
868868
description: Condition contains details for one aspect of the
869869
current state of this API Resource.

‎controllers/clustermodule_reconciler.go‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import (
2828
controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta1"
2929
"sigs.k8s.io/cluster-api/util"
3030
"sigs.k8s.io/cluster-api/util/conditions"
31+
v1beta2conditions "sigs.k8s.io/cluster-api/util/conditions/v1beta2"
3132
ctrl "sigs.k8s.io/controller-runtime"
3233
"sigs.k8s.io/controller-runtime/pkg/client"
3334
"sigs.k8s.io/controller-runtime/pkg/controller"
@@ -69,6 +70,12 @@ func (r Reconciler) Reconcile(ctx context.Context, clusterCtx *capvcontext.Clust
6970
if !clustermodule.IsClusterCompatible(clusterCtx) {
7071
conditions.MarkFalse(clusterCtx.VSphereCluster, infrav1.ClusterModulesAvailableCondition, infrav1.VCenterVersionIncompatibleReason, clusterv1.ConditionSeverityInfo,
7172
"vCenter version %s does not support cluster modules", clusterCtx.VSphereCluster.Status.VCenterVersion)
73+
v1beta2conditions.Set(clusterCtx.VSphereCluster, metav1.Condition{
74+
Type: infrav1.VSphereClusterClusterModulesReadyV1Beta2Condition,
75+
Status: metav1.ConditionFalse,
76+
Reason: infrav1.VSphereClusterModulesInvalidVCenterVersionV1Beta2Reason,
77+
Message: fmt.Sprintf("vCenter version %s does not support cluster modules", clusterCtx.VSphereCluster.Status.VCenterVersion),
78+
})
7279
log.V(5).Info(fmt.Sprintf("vCenter version %s does not support cluster modules to implement anti affinity (vCenter >= 7 required)", clusterCtx.VSphereCluster.Status.VCenterVersion))
7380
return reconcile.Result{}, nil
7481
}
@@ -170,11 +177,23 @@ func (r Reconciler) Reconcile(ctx context.Context, clusterCtx *capvcontext.Clust
170177
}
171178
conditions.MarkFalse(clusterCtx.VSphereCluster, infrav1.ClusterModulesAvailableCondition, infrav1.ClusterModuleSetupFailedReason,
172179
clusterv1.ConditionSeverityWarning, generateClusterModuleErrorMessage(modErrs))
180+
v1beta2conditions.Set(clusterCtx.VSphereCluster, metav1.Condition{
181+
Type: infrav1.VSphereClusterClusterModulesReadyV1Beta2Condition,
182+
Status: metav1.ConditionFalse,
183+
Reason: infrav1.VSphereClusterClusterModulesNotReadyV1Beta2Reason,
184+
Message: generateClusterModuleErrorMessage(modErrs),
185+
})
186+
return reconcile.Result{}, err
173187
case len(modErrs) == 0 && len(clusterModuleSpecs) > 0:
174188
conditions.MarkTrue(clusterCtx.VSphereCluster, infrav1.ClusterModulesAvailableCondition)
175189
default:
176190
conditions.Delete(clusterCtx.VSphereCluster, infrav1.ClusterModulesAvailableCondition)
177191
}
192+
v1beta2conditions.Set(clusterCtx.VSphereCluster, metav1.Condition{
193+
Type: infrav1.VSphereClusterClusterModulesReadyV1Beta2Condition,
194+
Status: metav1.ConditionTrue,
195+
Reason: infrav1.VSphereClusterClusterModulesReadyV1Beta2Reason,
196+
})
178197
return reconcile.Result{}, err
179198
}
180199

@@ -319,7 +338,7 @@ type clusterModError struct {
319338

320339
func generateClusterModuleErrorMessage(errList []clusterModError) string {
321340
sb := strings.Builder{}
322-
sb.WriteString("failed to create cluster modules for: ")
341+
sb.WriteString("Failed to create cluster modules for: ")
323342

324343
for _, e := range errList {
325344
sb.WriteString(fmt.Sprintf("%s %s, ", e.name, e.err.Error()))

‎controllers/vspherecluster_reconciler.go‎

Lines changed: 123 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import (
3434
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
3535
clusterutilv1 "sigs.k8s.io/cluster-api/util"
3636
"sigs.k8s.io/cluster-api/util/conditions"
37+
v1beta2conditions "sigs.k8s.io/cluster-api/util/conditions/v1beta2"
3738
"sigs.k8s.io/cluster-api/util/finalizers"
3839
"sigs.k8s.io/cluster-api/util/patch"
3940
"sigs.k8s.io/cluster-api/util/paused"
@@ -107,7 +108,7 @@ func (r *clusterReconciler) Reconcile(ctx context.Context, req ctrl.Request) (_
107108
// Always issue a patch when exiting this function so changes to the
108109
// resource are patched back to the API server.
109110
defer func() {
110-
if err := clusterContext.Patch(ctx); err != nil {
111+
if err := r.patch(ctx, clusterContext); err != nil {
111112
reterr = kerrors.NewAggregate([]error{reterr, err})
112113
}
113114
}()
@@ -126,9 +127,71 @@ func (r *clusterReconciler) Reconcile(ctx context.Context, req ctrl.Request) (_
126127
return r.reconcileNormal(ctx, clusterContext)
127128
}
128129

130+
// patch updates the VSphereCluster and its status on the API server.
131+
func (r *clusterReconciler) patch(ctx context.Context, clusterCtx *capvcontext.ClusterContext) error {
132+
// always update the readyCondition.
133+
conditions.SetSummary(clusterCtx.VSphereCluster,
134+
conditions.WithConditions(
135+
infrav1.VCenterAvailableCondition,
136+
),
137+
)
138+
139+
if err := v1beta2conditions.SetSummaryCondition(clusterCtx.VSphereCluster, clusterCtx.VSphereCluster, infrav1.VSphereClusterReadyV1Beta2Condition,
140+
v1beta2conditions.ForConditionTypes{
141+
infrav1.VSphereClusterVCenterAvailableV1Beta2Condition,
142+
// FailureDomainsReady and ClusterModuelsReady may not be always set.
143+
infrav1.VSphereClusterFailureDomainsReadyV1Beta2Condition,
144+
infrav1.VSphereClusterClusterModulesReadyV1Beta2Condition,
145+
},
146+
v1beta2conditions.IgnoreTypesIfMissing{
147+
infrav1.VSphereClusterFailureDomainsReadyV1Beta2Condition,
148+
infrav1.VSphereClusterClusterModulesReadyV1Beta2Condition,
149+
},
150+
// Using a custom merge strategy to override reasons applied during merge.
151+
v1beta2conditions.CustomMergeStrategy{
152+
MergeStrategy: v1beta2conditions.DefaultMergeStrategy(
153+
// Use custom reasons.
154+
v1beta2conditions.ComputeReasonFunc(v1beta2conditions.GetDefaultComputeMergeReasonFunc(
155+
infrav1.VSphereClusterNotReadyV1Beta2Reason,
156+
infrav1.VSphereClusterReadyUnknownV1Beta2Reason,
157+
infrav1.VSphereClusterReadyV1Beta2Reason,
158+
)),
159+
),
160+
},
161+
); err != nil {
162+
return pkgerrors.Wrapf(err, "failed to set %s condition", infrav1.VSphereClusterReadyV1Beta2Condition)
163+
}
164+
165+
return clusterCtx.PatchHelper.Patch(ctx, clusterCtx.VSphereCluster,
166+
patch.WithOwnedV1Beta2Conditions{Conditions: []string{
167+
clusterv1.PausedV1Beta2Condition,
168+
infrav1.VSphereClusterReadyV1Beta2Condition,
169+
infrav1.VSphereClusterFailureDomainsReadyV1Beta2Condition,
170+
infrav1.VSphereClusterVCenterAvailableV1Beta2Condition,
171+
infrav1.VSphereClusterClusterModulesReadyV1Beta2Condition,
172+
}},
173+
)
174+
}
175+
129176
func (r *clusterReconciler) reconcileDelete(ctx context.Context, clusterCtx *capvcontext.ClusterContext) (reconcile.Result, error) {
130177
log := ctrl.LoggerFrom(ctx)
131178

179+
v1beta2conditions.Set(clusterCtx.VSphereCluster, metav1.Condition{
180+
Type: infrav1.VSphereClusterVCenterAvailableV1Beta2Condition,
181+
Status: metav1.ConditionFalse,
182+
Reason: infrav1.VSphereClusterVCenterAvailableDeletingV1Beta2Reason,
183+
})
184+
v1beta2conditions.Set(clusterCtx.VSphereCluster, metav1.Condition{
185+
Type: infrav1.VSphereClusterClusterModulesReadyV1Beta2Condition,
186+
Status: metav1.ConditionFalse,
187+
Reason: infrav1.VSphereClusterClusterModulesDeletingV1Beta2Reason,
188+
})
189+
v1beta2conditions.Set(clusterCtx.VSphereCluster, metav1.Condition{
190+
Type: infrav1.VSphereClusterFailureDomainsReadyV1Beta2Condition,
191+
Status: metav1.ConditionFalse,
192+
Reason: infrav1.VSphereClusterFailureDomainsDeletingV1Beta2Reason,
193+
})
194+
132195
var vsphereMachines []client.Object
133196
var err error
134197
if clusterCtx.Cluster != nil {
@@ -191,37 +254,74 @@ func (r *clusterReconciler) reconcileDelete(ctx context.Context, clusterCtx *cap
191254
func (r *clusterReconciler) reconcileNormal(ctx context.Context, clusterCtx *capvcontext.ClusterContext) (reconcile.Result, error) {
192255
log := ctrl.LoggerFrom(ctx)
193256

257+
// Reconcile failure domains.
194258
ok, err := r.reconcileDeploymentZones(ctx, clusterCtx)
195259
if err != nil {
260+
v1beta2conditions.Set(clusterCtx.VSphereCluster, metav1.Condition{
261+
Type: infrav1.VSphereClusterFailureDomainsReadyV1Beta2Condition,
262+
Status: metav1.ConditionFalse,
263+
Reason: infrav1.VSphereClusterFailureDomainsNotReadyV1Beta2Reason,
264+
Message: err.Error(),
265+
})
196266
return reconcile.Result{}, err
197267
}
198268
if !ok {
199-
log.Info("Waiting for failure domains to be reconciled")
200269
return reconcile.Result{RequeueAfter: 10 * time.Second}, nil
201270
}
202271

272+
// Reconcile vCenter availability.
203273
if err := r.reconcileIdentitySecret(ctx, clusterCtx); err != nil {
204274
conditions.MarkFalse(clusterCtx.VSphereCluster, infrav1.VCenterAvailableCondition, infrav1.VCenterUnreachableReason, clusterv1.ConditionSeverityError, err.Error())
275+
v1beta2conditions.Set(clusterCtx.VSphereCluster, metav1.Condition{
276+
Type: infrav1.VSphereClusterVCenterAvailableV1Beta2Condition,
277+
Status: metav1.ConditionFalse,
278+
Reason: infrav1.VSphereClusterVCenterUnreachableV1Beta2Reason,
279+
Message: err.Error(),
280+
})
205281
return reconcile.Result{}, err
206282
}
207283

208284
vcenterSession, err := r.reconcileVCenterConnectivity(ctx, clusterCtx)
209285
if err != nil {
210286
conditions.MarkFalse(clusterCtx.VSphereCluster, infrav1.VCenterAvailableCondition, infrav1.VCenterUnreachableReason, clusterv1.ConditionSeverityError, err.Error())
287+
v1beta2conditions.Set(clusterCtx.VSphereCluster, metav1.Condition{
288+
Type: infrav1.VSphereClusterVCenterAvailableV1Beta2Condition,
289+
Status: metav1.ConditionFalse,
290+
Reason: infrav1.VSphereClusterVCenterUnreachableV1Beta2Reason,
291+
Message: err.Error(),
292+
})
211293
return reconcile.Result{}, pkgerrors.Wrapf(err,
212294
"unexpected error while probing vcenter for %s", clusterCtx)
213295
}
214296
conditions.MarkTrue(clusterCtx.VSphereCluster, infrav1.VCenterAvailableCondition)
297+
v1beta2conditions.Set(clusterCtx.VSphereCluster, metav1.Condition{
298+
Type: infrav1.VSphereClusterVCenterAvailableV1Beta2Condition,
299+
Status: metav1.ConditionTrue,
300+
Reason: infrav1.VSphereClusterVCenterAvailableV1Beta2Reason,
301+
})
215302

303+
// Reconcile cluster modules.
216304
err = r.reconcileVCenterVersion(clusterCtx, vcenterSession)
217305
if err != nil || clusterCtx.VSphereCluster.Status.VCenterVersion == "" {
218-
conditions.MarkFalse(clusterCtx.VSphereCluster, infrav1.ClusterModulesAvailableCondition, infrav1.MissingVCenterVersionReason, clusterv1.ConditionSeverityWarning, "vCenter version not set")
306+
conditions.MarkFalse(clusterCtx.VSphereCluster, infrav1.ClusterModulesAvailableCondition, infrav1.MissingVCenterVersionReason, clusterv1.ConditionSeverityWarning, err.Error())
307+
v1beta2conditions.Set(clusterCtx.VSphereCluster, metav1.Condition{
308+
Type: infrav1.VSphereClusterClusterModulesReadyV1Beta2Condition,
309+
Status: metav1.ConditionFalse,
310+
Reason: infrav1.VSphereClusterModulesInvalidVCenterVersionV1Beta2Reason,
311+
Message: err.Error(),
312+
})
219313
log.Error(err, "could not reconcile vCenter version")
220314
}
221315

222316
affinityReconcileResult, err := r.reconcileClusterModules(ctx, clusterCtx)
223317
if err != nil {
224318
conditions.MarkFalse(clusterCtx.VSphereCluster, infrav1.ClusterModulesAvailableCondition, infrav1.ClusterModuleSetupFailedReason, clusterv1.ConditionSeverityWarning, err.Error())
319+
v1beta2conditions.Set(clusterCtx.VSphereCluster, metav1.Condition{
320+
Type: infrav1.VSphereClusterClusterModulesReadyV1Beta2Condition,
321+
Status: metav1.ConditionFalse,
322+
Reason: infrav1.VSphereClusterClusterModulesNotReadyV1Beta2Reason,
323+
Message: err.Error(),
324+
})
225325
return affinityReconcileResult, err
226326
}
227327

@@ -295,13 +395,14 @@ func (r *clusterReconciler) reconcileVCenterConnectivity(ctx context.Context, cl
295395
func (r *clusterReconciler) reconcileVCenterVersion(clusterCtx *capvcontext.ClusterContext, s *session.Session) error {
296396
version, err := s.GetVersion()
297397
if err != nil {
298-
return err
398+
return pkgerrors.Wrapf(err, "invalid vCenter version")
299399
}
300400
clusterCtx.VSphereCluster.Status.VCenterVersion = version
301401
return nil
302402
}
303403

304404
func (r *clusterReconciler) reconcileDeploymentZones(ctx context.Context, clusterCtx *capvcontext.ClusterContext) (bool, error) {
405+
log := ctrl.LoggerFrom(ctx)
305406
// If there is no failure domain selector, skip reconciliation
306407
if clusterCtx.VSphereCluster.Spec.FailureDomainSelector == nil {
307408
return true, nil
@@ -346,15 +447,33 @@ func (r *clusterReconciler) reconcileDeploymentZones(ctx context.Context, cluste
346447

347448
clusterCtx.VSphereCluster.Status.FailureDomains = failureDomains
348449
if readyNotReported > 0 {
450+
log.Info("Waiting for failure domains to be reconciled")
349451
conditions.MarkFalse(clusterCtx.VSphereCluster, infrav1.FailureDomainsAvailableCondition, infrav1.WaitingForFailureDomainStatusReason, clusterv1.ConditionSeverityInfo, "waiting for failure domains to report ready status")
452+
v1beta2conditions.Set(clusterCtx.VSphereCluster, metav1.Condition{
453+
Type: infrav1.VSphereClusterFailureDomainsReadyV1Beta2Condition,
454+
Status: metav1.ConditionFalse,
455+
Reason: infrav1.VSphereClusterFailureDomainsNotReadyV1Beta2Reason,
456+
Message: "Waiting for failure domains to report ready status",
457+
})
350458
return false, nil
351459
}
352460

353461
if len(failureDomains) > 0 {
354462
if notReady > 0 {
355463
conditions.MarkFalse(clusterCtx.VSphereCluster, infrav1.FailureDomainsAvailableCondition, infrav1.FailureDomainsSkippedReason, clusterv1.ConditionSeverityInfo, "one or more failure domains are not ready")
464+
v1beta2conditions.Set(clusterCtx.VSphereCluster, metav1.Condition{
465+
Type: infrav1.VSphereClusterFailureDomainsReadyV1Beta2Condition,
466+
Status: metav1.ConditionFalse,
467+
Reason: infrav1.VSphereClusterFailureDomainsNotReadyV1Beta2Reason,
468+
Message: "One or more failure domains are not ready",
469+
})
356470
} else {
357471
conditions.MarkTrue(clusterCtx.VSphereCluster, infrav1.FailureDomainsAvailableCondition)
472+
v1beta2conditions.Set(clusterCtx.VSphereCluster, metav1.Condition{
473+
Type: infrav1.VSphereClusterFailureDomainsReadyV1Beta2Condition,
474+
Status: metav1.ConditionTrue,
475+
Reason: infrav1.VSphereClusterFailureDomainsReadyV1Beta2Reason,
476+
})
358477
}
359478
} else {
360479
// Remove the condition if failure domains do not exist

0 commit comments

Comments
 (0)