Skip to content

Commit e6be7ad

Browse files
clebsclebs
committed
Consolidate infrav1beta1 imports into infrav1
Signed-off-by: Borja Clemente <[email protected]>
1 parent 60d7f75 commit e6be7ad

30 files changed

+245
-292
lines changed

‎api/v1beta1/conditions_consts.go‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -69,14 +69,6 @@ const (
6969
EgressOnlyInternetGatewayFailedReason = "EgressOnlyInternetGatewayFailed"
7070
)
7171

72-
const (
73-
// CarrierGatewayReadyCondition reports on the successful reconciliation of carrier gateways.
74-
// Only applicable to managed clusters.
75-
CarrierGatewayReadyCondition clusterv1beta1.ConditionType = "CarrierGatewayReady"
76-
// CarrierGatewayFailedReason used when errors occur during carrier gateway reconciliation.
77-
CarrierGatewayFailedReason = "CarrierGatewayFailed"
78-
)
79-
8072
const (
8173
// NatGatewaysReadyCondition reports successful reconciliation of NAT gateways.
8274
// Only applicable to managed clusters.
@@ -95,14 +87,6 @@ const (
9587
RouteTableReconciliationFailedReason = "RouteTableReconciliationFailed"
9688
)
9789

98-
const (
99-
// VpcEndpointsReadyCondition reports successful reconciliation of vpc endpoints.
100-
// Only applicable to managed clusters.
101-
VpcEndpointsReadyCondition clusterv1beta1.ConditionType = "VpcEndpointsReadyCondition"
102-
// VpcEndpointsReconciliationFailedReason used when any errors occur during reconciliation of vpc endpoints.
103-
VpcEndpointsReconciliationFailedReason = "VpcEndpointsReconciliationFailed"
104-
)
105-
10690
const (
10791
// SecondaryCidrsReadyCondition reports successful reconciliation of secondary CIDR blocks.
10892
// Only applicable to managed clusters.
@@ -133,9 +117,6 @@ const (
133117
LoadBalancerReadyCondition clusterv1beta1.ConditionType = "LoadBalancerReady"
134118
// WaitForDNSNameReason used while waiting for a DNS name for the API server to be populated.
135119
WaitForDNSNameReason = "WaitForDNSName"
136-
// WaitForExternalControlPlaneEndpointReason is available when the AWS Cluster is waiting for an externally managed
137-
// Load Balancer, such as an external Control Plane provider.
138-
WaitForExternalControlPlaneEndpointReason = "WaitForExternalControlPlaneEndpoint"
139120
// WaitForDNSNameResolveReason used while waiting for DNS name to resolve.
140121
WaitForDNSNameResolveReason = "WaitForDNSNameResolve"
141122
// LoadBalancerFailedReason used when an error occurs during load balancer reconciliation.

‎controllers/awscluster_controller.go‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ import (
3636
"sigs.k8s.io/controller-runtime/pkg/reconcile"
3737
"sigs.k8s.io/controller-runtime/pkg/source"
3838

39-
infrav1beta1 "sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta1"
4039
infrav1 "sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
4140
"sigs.k8s.io/cluster-api-provider-aws/v2/feature"
4241
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/scope"
@@ -294,17 +293,17 @@ func (r *AWSClusterReconciler) reconcileLoadBalancer(ctx context.Context, cluste
294293

295294
if err := elbService.ReconcileLoadbalancers(ctx); err != nil {
296295
clusterScope.Error(err, "failed to reconcile load balancer")
297-
v1beta1conditions.MarkFalse(awsCluster, infrav1beta1.LoadBalancerReadyCondition, infrav1beta1.LoadBalancerFailedReason, infrautilconditions.ErrorConditionAfterInit(clusterScope.ClusterObj()), "%s", err.Error())
296+
v1beta1conditions.MarkFalse(awsCluster, infrav1.LoadBalancerReadyCondition, infrav1.LoadBalancerFailedReason, infrautilconditions.ErrorConditionAfterInit(clusterScope.ClusterObj()), "%s", err.Error())
298297
return nil, err
299298
}
300299

301300
if awsCluster.Status.Network.APIServerELB.DNSName == "" {
302-
v1beta1conditions.MarkFalse(awsCluster, infrav1beta1.LoadBalancerReadyCondition, infrav1beta1.WaitForDNSNameReason, clusterv1beta1.ConditionSeverityInfo, "")
301+
v1beta1conditions.MarkFalse(awsCluster, infrav1.LoadBalancerReadyCondition, infrav1.WaitForDNSNameReason, clusterv1beta1.ConditionSeverityInfo, "")
303302
clusterScope.Info("Waiting on API server ELB DNS name")
304303
return &retryAfterDuration, nil
305304
}
306305

307-
v1beta1conditions.MarkTrue(awsCluster, infrav1beta1.LoadBalancerReadyCondition)
306+
v1beta1conditions.MarkTrue(awsCluster, infrav1.LoadBalancerReadyCondition)
308307

309308
awsCluster.Spec.ControlPlaneEndpoint = clusterv1beta1.APIEndpoint{
310309
Host: awsCluster.Status.Network.APIServerELB.DNSName,
@@ -339,12 +338,12 @@ func (r *AWSClusterReconciler) reconcileNormal(ctx context.Context, clusterScope
339338

340339
if err := sgService.ReconcileSecurityGroups(); err != nil {
341340
clusterScope.Error(err, "failed to reconcile security groups")
342-
v1beta1conditions.MarkFalse(awsCluster, infrav1beta1.ClusterSecurityGroupsReadyCondition, infrav1beta1.ClusterSecurityGroupReconciliationFailedReason, infrautilconditions.ErrorConditionAfterInit(clusterScope.ClusterObj()), "%s", err.Error())
341+
v1beta1conditions.MarkFalse(awsCluster, infrav1.ClusterSecurityGroupsReadyCondition, infrav1.ClusterSecurityGroupReconciliationFailedReason, infrautilconditions.ErrorConditionAfterInit(clusterScope.ClusterObj()), "%s", err.Error())
343342
return reconcile.Result{}, err
344343
}
345344

346345
if err := ec2Service.ReconcileBastion(); err != nil {
347-
v1beta1conditions.MarkFalse(awsCluster, infrav1beta1.BastionHostReadyCondition, infrav1beta1.BastionHostFailedReason, infrautilconditions.ErrorConditionAfterInit(clusterScope.ClusterObj()), "%s", err.Error())
346+
v1beta1conditions.MarkFalse(awsCluster, infrav1.BastionHostReadyCondition, infrav1.BastionHostFailedReason, infrautilconditions.ErrorConditionAfterInit(clusterScope.ClusterObj()), "%s", err.Error())
348347
clusterScope.Error(err, "failed to reconcile bastion host")
349348
return reconcile.Result{}, err
350349
}
@@ -364,10 +363,10 @@ func (r *AWSClusterReconciler) reconcileNormal(ctx context.Context, clusterScope
364363
}
365364

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

372371
for _, subnet := range clusterScope.Subnets().FilterPrivate() {
373372
found := false
@@ -460,21 +459,21 @@ func (r *AWSClusterReconciler) checkForExternalControlPlaneLoadBalancer(clusterS
460459
switch {
461460
case len(awsCluster.Spec.ControlPlaneEndpoint.Host) == 0 && awsCluster.Spec.ControlPlaneEndpoint.Port == 0:
462461
clusterScope.Info("AWSCluster control plane endpoint is still non-populated")
463-
v1beta1conditions.MarkFalse(awsCluster, infrav1beta1.LoadBalancerReadyCondition, infrav1beta1.WaitForExternalControlPlaneEndpointReason, clusterv1beta1.ConditionSeverityInfo, "")
462+
v1beta1conditions.MarkFalse(awsCluster, infrav1.LoadBalancerReadyCondition, infrav1.WaitForExternalControlPlaneEndpointReason, clusterv1beta1.ConditionSeverityInfo, "")
464463

465464
return &requeueAfterPeriod
466465
case len(awsCluster.Spec.ControlPlaneEndpoint.Host) == 0:
467466
clusterScope.Info("AWSCluster control plane endpoint host is still non-populated")
468-
v1beta1conditions.MarkFalse(awsCluster, infrav1beta1.LoadBalancerReadyCondition, infrav1beta1.WaitForExternalControlPlaneEndpointReason, clusterv1beta1.ConditionSeverityInfo, "")
467+
v1beta1conditions.MarkFalse(awsCluster, infrav1.LoadBalancerReadyCondition, infrav1.WaitForExternalControlPlaneEndpointReason, clusterv1beta1.ConditionSeverityInfo, "")
469468

470469
return &requeueAfterPeriod
471470
case awsCluster.Spec.ControlPlaneEndpoint.Port == 0:
472471
clusterScope.Info("AWSCluster control plane endpoint port is still non-populated")
473-
v1beta1conditions.MarkFalse(awsCluster, infrav1beta1.LoadBalancerReadyCondition, infrav1beta1.WaitForExternalControlPlaneEndpointReason, clusterv1beta1.ConditionSeverityInfo, "")
472+
v1beta1conditions.MarkFalse(awsCluster, infrav1.LoadBalancerReadyCondition, infrav1.WaitForExternalControlPlaneEndpointReason, clusterv1beta1.ConditionSeverityInfo, "")
474473

475474
return &requeueAfterPeriod
476475
default:
477-
v1beta1conditions.MarkTrue(awsCluster, infrav1beta1.LoadBalancerReadyCondition)
476+
v1beta1conditions.MarkTrue(awsCluster, infrav1.LoadBalancerReadyCondition)
478477

479478
return nil
480479
}

‎controllers/awscluster_controller_unit_test.go‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ import (
3434
"sigs.k8s.io/controller-runtime/pkg/client"
3535
"sigs.k8s.io/controller-runtime/pkg/client/fake"
3636

37-
infrav1beta1 "sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta1"
3837
infrav1 "sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
3938
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/scope"
4039
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/services"
@@ -246,7 +245,7 @@ func TestAWSClusterReconcileOperations(t *testing.T) {
246245
})
247246
_, err = reconciler.reconcileNormal(context.TODO(), cs)
248247
g.Expect(err).To(BeNil())
249-
expectAWSClusterConditions(g, cs.AWSCluster, []conditionAssertion{{infrav1beta1.LoadBalancerReadyCondition, corev1.ConditionTrue, "", ""}})
248+
expectAWSClusterConditions(g, cs.AWSCluster, []conditionAssertion{{infrav1.LoadBalancerReadyCondition, corev1.ConditionTrue, "", ""}})
250249
g.Expect(awsCluster.GetFinalizers()).To(ContainElement(infrav1.ClusterFinalizer))
251250
})
252251

@@ -322,7 +321,7 @@ func TestAWSClusterReconcileOperations(t *testing.T) {
322321
g.Expect(err).To(BeNil())
323322
_, err = reconciler.reconcileNormal(context.TODO(), cs)
324323
g.Expect(err).ToNot(BeNil())
325-
expectAWSClusterConditions(g, cs.AWSCluster, []conditionAssertion{{infrav1beta1.ClusterSecurityGroupsReadyCondition, corev1.ConditionFalse, clusterv1beta1.ConditionSeverityWarning, infrav1beta1.ClusterSecurityGroupReconciliationFailedReason}})
324+
expectAWSClusterConditions(g, cs.AWSCluster, []conditionAssertion{{infrav1.ClusterSecurityGroupsReadyCondition, corev1.ConditionFalse, clusterv1beta1.ConditionSeverityWarning, infrav1.ClusterSecurityGroupReconciliationFailedReason}})
326325
})
327326
t.Run("Should fail AWSCluster create with BastionHostReadyCondition status false", func(t *testing.T) {
328327
g := NewWithT(t)
@@ -345,7 +344,7 @@ func TestAWSClusterReconcileOperations(t *testing.T) {
345344
g.Expect(err).To(BeNil())
346345
_, err = reconciler.reconcileNormal(context.TODO(), cs)
347346
g.Expect(err).ToNot(BeNil())
348-
expectAWSClusterConditions(g, cs.AWSCluster, []conditionAssertion{{infrav1beta1.BastionHostReadyCondition, corev1.ConditionFalse, clusterv1beta1.ConditionSeverityWarning, infrav1beta1.BastionHostFailedReason}})
347+
expectAWSClusterConditions(g, cs.AWSCluster, []conditionAssertion{{infrav1.BastionHostReadyCondition, corev1.ConditionFalse, clusterv1beta1.ConditionSeverityWarning, infrav1.BastionHostFailedReason}})
349348
})
350349
t.Run("Should fail AWSCluster create with failure in LoadBalancer reconciliation", func(t *testing.T) {
351350
g := NewWithT(t)
@@ -369,7 +368,7 @@ func TestAWSClusterReconcileOperations(t *testing.T) {
369368
g.Expect(err).To(BeNil())
370369
_, err = reconciler.reconcileNormal(context.TODO(), cs)
371370
g.Expect(err).ToNot(BeNil())
372-
expectAWSClusterConditions(g, cs.AWSCluster, []conditionAssertion{{infrav1beta1.LoadBalancerReadyCondition, corev1.ConditionFalse, clusterv1beta1.ConditionSeverityWarning, infrav1beta1.LoadBalancerFailedReason}})
371+
expectAWSClusterConditions(g, cs.AWSCluster, []conditionAssertion{{infrav1.LoadBalancerReadyCondition, corev1.ConditionFalse, clusterv1beta1.ConditionSeverityWarning, infrav1.LoadBalancerFailedReason}})
373372
})
374373
t.Run("Should fail AWSCluster create with LoadBalancer reconcile failure with WaitForDNSName condition as false", func(t *testing.T) {
375374
g := NewWithT(t)
@@ -393,7 +392,7 @@ func TestAWSClusterReconcileOperations(t *testing.T) {
393392
g.Expect(err).To(BeNil())
394393
_, err = reconciler.reconcileNormal(context.TODO(), cs)
395394
g.Expect(err).To(BeNil())
396-
expectAWSClusterConditions(g, cs.AWSCluster, []conditionAssertion{{infrav1beta1.LoadBalancerReadyCondition, corev1.ConditionFalse, clusterv1beta1.ConditionSeverityInfo, infrav1beta1.WaitForDNSNameReason}})
395+
expectAWSClusterConditions(g, cs.AWSCluster, []conditionAssertion{{infrav1.LoadBalancerReadyCondition, corev1.ConditionFalse, clusterv1beta1.ConditionSeverityInfo, infrav1.WaitForDNSNameReason}})
397396
})
398397
})
399398
})

0 commit comments

Comments
 (0)