Skip to content

Commit 70a0d76

Browse files
clebsclebs
committed
Fix import aliases
Signed-off-by: Borja Clemente <[email protected]>
1 parent 61f6fc9 commit 70a0d76

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+391
-390
lines changed

‎bootstrap/eks/controllers/eksconfig_controller.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ import (
4747
bsutil "sigs.k8s.io/cluster-api/bootstrap/util"
4848
"sigs.k8s.io/cluster-api/feature"
4949
"sigs.k8s.io/cluster-api/util"
50-
"sigs.k8s.io/cluster-api/util/deprecated/v1beta1/conditions"
50+
v1beta1conditions "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/conditions"
5151
patch "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/patch"
5252
"sigs.k8s.io/cluster-api/util/predicates"
5353
)
@@ -125,11 +125,11 @@ func (r *EKSConfigReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
125125

126126
// set up defer block for updating config
127127
defer func() {
128-
conditions.SetSummary(config,
129-
conditions.WithConditions(
128+
v1beta1conditions.SetSummary(config,
129+
v1beta1conditions.WithConditions(
130130
eksbootstrapv1.DataSecretAvailableCondition,
131131
),
132-
conditions.WithStepCounter(),
132+
v1beta1conditions.WithStepCounter(),
133133
)
134134

135135
patchOpts := []patch.Option{}
@@ -209,7 +209,7 @@ func (r *EKSConfigReconciler) joinWorker(ctx context.Context, cluster *clusterv1
209209

210210
if !meta.IsStatusConditionTrue(cluster.GetConditions(), string(clusterv1beta1.InfrastructureReadyCondition)) {
211211
log.Info("Cluster infrastructure is not ready")
212-
conditions.MarkFalse(config,
212+
v1beta1conditions.MarkFalse(config,
213213
eksbootstrapv1.DataSecretAvailableCondition,
214214
eksbootstrapv1.WaitingForClusterInfrastructureReason,
215215
clusterv1beta1.ConditionSeverityInfo, "")
@@ -218,7 +218,7 @@ func (r *EKSConfigReconciler) joinWorker(ctx context.Context, cluster *clusterv1
218218

219219
if !meta.IsStatusConditionTrue(cluster.GetConditions(), string(clusterv1beta1.ControlPlaneInitializedCondition)) {
220220
log.Info("Control Plane has not yet been initialized")
221-
conditions.MarkFalse(config, eksbootstrapv1.DataSecretAvailableCondition, eksbootstrapv1.WaitingForControlPlaneInitializationReason, clusterv1beta1.ConditionSeverityInfo, "")
221+
v1beta1conditions.MarkFalse(config, eksbootstrapv1.DataSecretAvailableCondition, eksbootstrapv1.WaitingForControlPlaneInitializationReason, clusterv1beta1.ConditionSeverityInfo, "")
222222
return nil
223223
}
224224

@@ -231,7 +231,7 @@ func (r *EKSConfigReconciler) joinWorker(ctx context.Context, cluster *clusterv1
231231
files, err := r.resolveFiles(ctx, config)
232232
if err != nil {
233233
log.Info("Failed to resolve files for user data")
234-
conditions.MarkFalse(config, eksbootstrapv1.DataSecretAvailableCondition, eksbootstrapv1.DataSecretGenerationFailedReason, clusterv1beta1.ConditionSeverityWarning, "%s", err.Error())
234+
v1beta1conditions.MarkFalse(config, eksbootstrapv1.DataSecretAvailableCondition, eksbootstrapv1.DataSecretGenerationFailedReason, clusterv1beta1.ConditionSeverityWarning, "%s", err.Error())
235235
return err
236236
}
237237

@@ -276,14 +276,14 @@ func (r *EKSConfigReconciler) joinWorker(ctx context.Context, cluster *clusterv1
276276
userDataScript, err := userdata.NewNode(nodeInput)
277277
if err != nil {
278278
log.Error(err, "Failed to create a worker join configuration")
279-
conditions.MarkFalse(config, eksbootstrapv1.DataSecretAvailableCondition, eksbootstrapv1.DataSecretGenerationFailedReason, clusterv1beta1.ConditionSeverityWarning, "")
279+
v1beta1conditions.MarkFalse(config, eksbootstrapv1.DataSecretAvailableCondition, eksbootstrapv1.DataSecretGenerationFailedReason, clusterv1beta1.ConditionSeverityWarning, "")
280280
return err
281281
}
282282

283283
// store userdata as secret
284284
if err := r.storeBootstrapData(ctx, cluster, config, userDataScript); err != nil {
285285
log.Error(err, "Failed to store bootstrap data")
286-
conditions.MarkFalse(config, eksbootstrapv1.DataSecretAvailableCondition, eksbootstrapv1.DataSecretGenerationFailedReason, clusterv1beta1.ConditionSeverityWarning, "")
286+
v1beta1conditions.MarkFalse(config, eksbootstrapv1.DataSecretAvailableCondition, eksbootstrapv1.DataSecretGenerationFailedReason, clusterv1beta1.ConditionSeverityWarning, "")
287287
return err
288288
}
289289

@@ -358,7 +358,7 @@ func (r *EKSConfigReconciler) storeBootstrapData(ctx context.Context, cluster *c
358358

359359
config.Status.DataSecretName = ptr.To[string](secret.Name)
360360
config.Status.Ready = true
361-
conditions.MarkTrue(config, eksbootstrapv1.DataSecretAvailableCondition)
361+
v1beta1conditions.MarkTrue(config, eksbootstrapv1.DataSecretAvailableCondition)
362362
return nil
363363
}
364364

‎controllers/awscluster_controller.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ import (
5555
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
5656
"sigs.k8s.io/cluster-api/util"
5757
capiannotations "sigs.k8s.io/cluster-api/util/annotations"
58-
"sigs.k8s.io/cluster-api/util/deprecated/v1beta1/conditions"
58+
v1beta1conditions "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/conditions"
5959
"sigs.k8s.io/cluster-api/util/predicates"
6060
)
6161

@@ -294,17 +294,17 @@ func (r *AWSClusterReconciler) reconcileLoadBalancer(ctx context.Context, cluste
294294

295295
if err := elbService.ReconcileLoadbalancers(ctx); err != nil {
296296
clusterScope.Error(err, "failed to reconcile load balancer")
297-
conditions.MarkFalse(awsCluster, infrav1beta1.LoadBalancerReadyCondition, infrav1beta1.LoadBalancerFailedReason, infrautilconditions.ErrorConditionAfterInit(clusterScope.ClusterObj()), "%s", err.Error())
297+
v1beta1conditions.MarkFalse(awsCluster, infrav1beta1.LoadBalancerReadyCondition, infrav1beta1.LoadBalancerFailedReason, infrautilconditions.ErrorConditionAfterInit(clusterScope.ClusterObj()), "%s", err.Error())
298298
return nil, err
299299
}
300300

301301
if awsCluster.Status.Network.APIServerELB.DNSName == "" {
302-
conditions.MarkFalse(awsCluster, infrav1beta1.LoadBalancerReadyCondition, infrav1beta1.WaitForDNSNameReason, clusterv1beta1.ConditionSeverityInfo, "")
302+
v1beta1conditions.MarkFalse(awsCluster, infrav1beta1.LoadBalancerReadyCondition, infrav1beta1.WaitForDNSNameReason, clusterv1beta1.ConditionSeverityInfo, "")
303303
clusterScope.Info("Waiting on API server ELB DNS name")
304304
return &retryAfterDuration, nil
305305
}
306306

307-
conditions.MarkTrue(awsCluster, infrav1beta1.LoadBalancerReadyCondition)
307+
v1beta1conditions.MarkTrue(awsCluster, infrav1beta1.LoadBalancerReadyCondition)
308308

309309
awsCluster.Spec.ControlPlaneEndpoint = clusterv1.APIEndpoint{
310310
Host: awsCluster.Status.Network.APIServerELB.DNSName,
@@ -339,12 +339,12 @@ func (r *AWSClusterReconciler) reconcileNormal(ctx context.Context, clusterScope
339339

340340
if err := sgService.ReconcileSecurityGroups(); err != nil {
341341
clusterScope.Error(err, "failed to reconcile security groups")
342-
conditions.MarkFalse(awsCluster, infrav1beta1.ClusterSecurityGroupsReadyCondition, infrav1beta1.ClusterSecurityGroupReconciliationFailedReason, infrautilconditions.ErrorConditionAfterInit(clusterScope.ClusterObj()), "%s", err.Error())
342+
v1beta1conditions.MarkFalse(awsCluster, infrav1beta1.ClusterSecurityGroupsReadyCondition, infrav1beta1.ClusterSecurityGroupReconciliationFailedReason, infrautilconditions.ErrorConditionAfterInit(clusterScope.ClusterObj()), "%s", err.Error())
343343
return reconcile.Result{}, err
344344
}
345345

346346
if err := ec2Service.ReconcileBastion(); err != nil {
347-
conditions.MarkFalse(awsCluster, infrav1beta1.BastionHostReadyCondition, infrav1beta1.BastionHostFailedReason, infrautilconditions.ErrorConditionAfterInit(clusterScope.ClusterObj()), "%s", err.Error())
347+
v1beta1conditions.MarkFalse(awsCluster, infrav1beta1.BastionHostReadyCondition, infrav1beta1.BastionHostFailedReason, infrautilconditions.ErrorConditionAfterInit(clusterScope.ClusterObj()), "%s", err.Error())
348348
clusterScope.Error(err, "failed to reconcile bastion host")
349349
return reconcile.Result{}, err
350350
}
@@ -364,10 +364,10 @@ func (r *AWSClusterReconciler) reconcileNormal(ctx context.Context, clusterScope
364364
}
365365

366366
if err := s3Service.ReconcileBucket(ctx); err != nil {
367-
conditions.MarkFalse(awsCluster, infrav1beta1.S3BucketReadyCondition, infrav1.S3BucketFailedReason, clusterv1beta1.ConditionSeverityError, "%s", err.Error())
367+
v1beta1conditions.MarkFalse(awsCluster, infrav1beta1.S3BucketReadyCondition, infrav1.S3BucketFailedReason, clusterv1beta1.ConditionSeverityError, "%s", err.Error())
368368
return reconcile.Result{}, errors.Wrapf(err, "failed to reconcile S3 Bucket for AWSCluster %s/%s", awsCluster.Namespace, awsCluster.Name)
369369
}
370-
conditions.MarkTrue(awsCluster, infrav1beta1.S3BucketReadyCondition)
370+
v1beta1conditions.MarkTrue(awsCluster, infrav1beta1.S3BucketReadyCondition)
371371

372372
for _, subnet := range clusterScope.Subnets().FilterPrivate() {
373373
found := false
@@ -460,21 +460,21 @@ func (r *AWSClusterReconciler) checkForExternalControlPlaneLoadBalancer(clusterS
460460
switch {
461461
case len(awsCluster.Spec.ControlPlaneEndpoint.Host) == 0 && awsCluster.Spec.ControlPlaneEndpoint.Port == 0:
462462
clusterScope.Info("AWSCluster control plane endpoint is still non-populated")
463-
conditions.MarkFalse(awsCluster, infrav1beta1.LoadBalancerReadyCondition, infrav1beta1.WaitForExternalControlPlaneEndpointReason, clusterv1beta1.ConditionSeverityInfo, "")
463+
v1beta1conditions.MarkFalse(awsCluster, infrav1beta1.LoadBalancerReadyCondition, infrav1beta1.WaitForExternalControlPlaneEndpointReason, clusterv1beta1.ConditionSeverityInfo, "")
464464

465465
return &requeueAfterPeriod
466466
case len(awsCluster.Spec.ControlPlaneEndpoint.Host) == 0:
467467
clusterScope.Info("AWSCluster control plane endpoint host is still non-populated")
468-
conditions.MarkFalse(awsCluster, infrav1beta1.LoadBalancerReadyCondition, infrav1beta1.WaitForExternalControlPlaneEndpointReason, clusterv1beta1.ConditionSeverityInfo, "")
468+
v1beta1conditions.MarkFalse(awsCluster, infrav1beta1.LoadBalancerReadyCondition, infrav1beta1.WaitForExternalControlPlaneEndpointReason, clusterv1beta1.ConditionSeverityInfo, "")
469469

470470
return &requeueAfterPeriod
471471
case awsCluster.Spec.ControlPlaneEndpoint.Port == 0:
472472
clusterScope.Info("AWSCluster control plane endpoint port is still non-populated")
473-
conditions.MarkFalse(awsCluster, infrav1beta1.LoadBalancerReadyCondition, infrav1beta1.WaitForExternalControlPlaneEndpointReason, clusterv1beta1.ConditionSeverityInfo, "")
473+
v1beta1conditions.MarkFalse(awsCluster, infrav1beta1.LoadBalancerReadyCondition, infrav1beta1.WaitForExternalControlPlaneEndpointReason, clusterv1beta1.ConditionSeverityInfo, "")
474474

475475
return &requeueAfterPeriod
476476
default:
477-
conditions.MarkTrue(awsCluster, infrav1beta1.LoadBalancerReadyCondition)
477+
v1beta1conditions.MarkTrue(awsCluster, infrav1beta1.LoadBalancerReadyCondition)
478478

479479
return nil
480480
}

0 commit comments

Comments
 (0)