Skip to content

Commit cc93437

Browse files
clebsclebs
committed
Revert infrav1 conditions to v1beta1 and consolidate imports
Signed-off-by: Borja Clemente <[email protected]>
1 parent a3db62e commit cc93437

File tree

2 files changed

+46
-47
lines changed

2 files changed

+46
-47
lines changed

‎api/v1beta2/conditions_consts.go‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@ limitations under the License.
1616

1717
package v1beta2
1818

19-
import clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
19+
import clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
2020

2121
const (
2222
// PrincipalCredentialRetrievedCondition reports on whether Principal credentials could be retrieved successfully.
2323
// A possible scenario, where retrieval is unsuccessful, is when SourcePrincipal is not authorized for assume role.
24-
PrincipalCredentialRetrievedCondition clusterv1.ConditionType = "PrincipalCredentialRetrieved"
24+
PrincipalCredentialRetrievedCondition clusterv1beta1.ConditionType = "PrincipalCredentialRetrieved"
2525
// PrincipalCredentialRetrievalFailedReason used when errors occur during identity credential retrieval.
2626
PrincipalCredentialRetrievalFailedReason = "PrincipalCredentialRetrievalFailed"
2727
// CredentialProviderBuildFailedReason used when errors occur during building providers before trying credential retrieval.
2828
//nolint:gosec
2929
CredentialProviderBuildFailedReason = "CredentialProviderBuildFailed"
3030
// PrincipalUsageAllowedCondition reports on whether Principal and all the nested source identities are allowed to be used in the AWSCluster namespace.
31-
PrincipalUsageAllowedCondition clusterv1.ConditionType = "PrincipalUsageAllowed"
31+
PrincipalUsageAllowedCondition clusterv1beta1.ConditionType = "PrincipalUsageAllowed"
3232
// PrincipalUsageUnauthorizedReason used when AWSCluster namespace is not in the identity's allowed namespaces list.
3333
PrincipalUsageUnauthorizedReason = "PrincipalUsageUnauthorized"
3434
// SourcePrincipalUsageUnauthorizedReason used when AWSCluster is not in the intersection of source identity allowed namespaces
@@ -38,7 +38,7 @@ const (
3838

3939
const (
4040
// VpcReadyCondition reports on the successful reconciliation of a VPC.
41-
VpcReadyCondition clusterv1.ConditionType = "VpcReady"
41+
VpcReadyCondition clusterv1beta1.ConditionType = "VpcReady"
4242
// VpcCreationStartedReason used when attempting to create a VPC for a managed cluster.
4343
// Will not be applied to unmanaged clusters.
4444
VpcCreationStartedReason = "VpcCreationStarted"
@@ -48,39 +48,39 @@ const (
4848

4949
const (
5050
// SubnetsReadyCondition reports on the successful reconciliation of subnets.
51-
SubnetsReadyCondition clusterv1.ConditionType = "SubnetsReady"
51+
SubnetsReadyCondition clusterv1beta1.ConditionType = "SubnetsReady"
5252
// SubnetsReconciliationFailedReason used to report failures while reconciling subnets.
5353
SubnetsReconciliationFailedReason = "SubnetsReconciliationFailed"
5454
)
5555

5656
const (
5757
// InternetGatewayReadyCondition reports on the successful reconciliation of internet gateways.
5858
// Only applicable to managed clusters.
59-
InternetGatewayReadyCondition clusterv1.ConditionType = "InternetGatewayReady"
59+
InternetGatewayReadyCondition clusterv1beta1.ConditionType = "InternetGatewayReady"
6060
// InternetGatewayFailedReason used when errors occur during internet gateway reconciliation.
6161
InternetGatewayFailedReason = "InternetGatewayFailed"
6262
)
6363

6464
const (
6565
// EgressOnlyInternetGatewayReadyCondition reports on the successful reconciliation of egress only internet gateways.
6666
// Only applicable to managed clusters.
67-
EgressOnlyInternetGatewayReadyCondition clusterv1.ConditionType = "EgressOnlyInternetGatewayReady"
67+
EgressOnlyInternetGatewayReadyCondition clusterv1beta1.ConditionType = "EgressOnlyInternetGatewayReady"
6868
// EgressOnlyInternetGatewayFailedReason used when errors occur during egress only internet gateway reconciliation.
6969
EgressOnlyInternetGatewayFailedReason = "EgressOnlyInternetGatewayFailed"
7070
)
7171

7272
const (
7373
// CarrierGatewayReadyCondition reports on the successful reconciliation of carrier gateways.
7474
// Only applicable to managed clusters.
75-
CarrierGatewayReadyCondition clusterv1.ConditionType = "CarrierGatewayReady"
75+
CarrierGatewayReadyCondition clusterv1beta1.ConditionType = "CarrierGatewayReady"
7676
// CarrierGatewayFailedReason used when errors occur during carrier gateway reconciliation.
7777
CarrierGatewayFailedReason = "CarrierGatewayFailed"
7878
)
7979

8080
const (
8181
// NatGatewaysReadyCondition reports successful reconciliation of NAT gateways.
8282
// Only applicable to managed clusters.
83-
NatGatewaysReadyCondition clusterv1.ConditionType = "NatGatewaysReady"
83+
NatGatewaysReadyCondition clusterv1beta1.ConditionType = "NatGatewaysReady"
8484
// NatGatewaysCreationStartedReason set once when creating new NAT gateways.
8585
NatGatewaysCreationStartedReason = "NatGatewaysCreationStarted"
8686
// NatGatewaysReconciliationFailedReason used when any errors occur during reconciliation of NAT gateways.
@@ -90,38 +90,38 @@ const (
9090
const (
9191
// RouteTablesReadyCondition reports successful reconciliation of route tables.
9292
// Only applicable to managed clusters.
93-
RouteTablesReadyCondition clusterv1.ConditionType = "RouteTablesReady"
93+
RouteTablesReadyCondition clusterv1beta1.ConditionType = "RouteTablesReady"
9494
// RouteTableReconciliationFailedReason used when any errors occur during reconciliation of route tables.
9595
RouteTableReconciliationFailedReason = "RouteTableReconciliationFailed"
9696
)
9797

9898
const (
9999
// VpcEndpointsReadyCondition reports successful reconciliation of vpc endpoints.
100100
// Only applicable to managed clusters.
101-
VpcEndpointsReadyCondition clusterv1.ConditionType = "VpcEndpointsReadyCondition"
101+
VpcEndpointsReadyCondition clusterv1beta1.ConditionType = "VpcEndpointsReadyCondition"
102102
// VpcEndpointsReconciliationFailedReason used when any errors occur during reconciliation of vpc endpoints.
103103
VpcEndpointsReconciliationFailedReason = "VpcEndpointsReconciliationFailed"
104104
)
105105

106106
const (
107107
// SecondaryCidrsReadyCondition reports successful reconciliation of secondary CIDR blocks.
108108
// Only applicable to managed clusters.
109-
SecondaryCidrsReadyCondition clusterv1.ConditionType = "SecondaryCidrsReady"
109+
SecondaryCidrsReadyCondition clusterv1beta1.ConditionType = "SecondaryCidrsReady"
110110
// SecondaryCidrReconciliationFailedReason used when any errors occur during reconciliation of secondary CIDR blocks.
111111
SecondaryCidrReconciliationFailedReason = "SecondaryCidrReconciliationFailed"
112112
)
113113

114114
const (
115115
// ClusterSecurityGroupsReadyCondition reports successful reconciliation of security groups.
116-
ClusterSecurityGroupsReadyCondition clusterv1.ConditionType = "ClusterSecurityGroupsReady"
116+
ClusterSecurityGroupsReadyCondition clusterv1beta1.ConditionType = "ClusterSecurityGroupsReady"
117117
// ClusterSecurityGroupReconciliationFailedReason used when any errors occur during reconciliation of security groups.
118118
ClusterSecurityGroupReconciliationFailedReason = "SecurityGroupReconciliationFailed"
119119
)
120120

121121
const (
122122
// BastionHostReadyCondition reports whether a bastion host is ready. Depending on the configuration, a cluster
123123
// may not require a bastion host and this condition will be skipped.
124-
BastionHostReadyCondition clusterv1.ConditionType = "BastionHostReady"
124+
BastionHostReadyCondition clusterv1beta1.ConditionType = "BastionHostReady"
125125
// BastionCreationStartedReason used when creating a new bastion host.
126126
BastionCreationStartedReason = "BastionCreationStarted"
127127
// BastionHostFailedReason used when an error occurs during the creation of a bastion host.
@@ -130,7 +130,7 @@ const (
130130

131131
const (
132132
// LoadBalancerReadyCondition reports on whether a control plane load balancer was successfully reconciled.
133-
LoadBalancerReadyCondition clusterv1.ConditionType = "LoadBalancerReady"
133+
LoadBalancerReadyCondition clusterv1beta1.ConditionType = "LoadBalancerReady"
134134
// WaitForDNSNameReason used while waiting for a DNS name for the API server to be populated.
135135
WaitForDNSNameReason = "WaitForDNSName"
136136
// WaitForExternalControlPlaneEndpointReason is available when the AWS Cluster is waiting for an externally managed
@@ -144,7 +144,7 @@ const (
144144

145145
const (
146146
// InstanceReadyCondition reports on current status of the EC2 instance. Ready indicates the instance is in a Running state.
147-
InstanceReadyCondition clusterv1.ConditionType = "InstanceReady"
147+
InstanceReadyCondition clusterv1beta1.ConditionType = "InstanceReady"
148148

149149
// InstanceNotFoundReason used when the instance couldn't be retrieved.
150150
InstanceNotFoundReason = "InstanceNotFound"
@@ -166,7 +166,7 @@ const (
166166

167167
const (
168168
// SecurityGroupsReadyCondition indicates the security groups are up to date on the AWSMachine.
169-
SecurityGroupsReadyCondition clusterv1.ConditionType = "SecurityGroupsReady"
169+
SecurityGroupsReadyCondition clusterv1beta1.ConditionType = "SecurityGroupsReady"
170170

171171
// SecurityGroupsFailedReason used when the security groups could not be synced.
172172
SecurityGroupsFailedReason = "SecurityGroupsSyncFailed"
@@ -177,7 +177,7 @@ const (
177177
// When set to false, severity can be an Error if the subnet is not found or unavailable in the instance's AZ.
178178
// Note this is only applicable to control plane machines.
179179
// Only applicable to control plane machines.
180-
ELBAttachedCondition clusterv1.ConditionType = "ELBAttached"
180+
ELBAttachedCondition clusterv1beta1.ConditionType = "ELBAttached"
181181

182182
// ELBAttachFailedReason used when a control plane node fails to attach to the ELB.
183183
ELBAttachFailedReason = "ELBAttachFailed"
@@ -187,7 +187,7 @@ const (
187187

188188
const (
189189
// S3BucketReadyCondition indicates an S3 bucket has been created successfully.
190-
S3BucketReadyCondition clusterv1.ConditionType = "S3BucketCreated"
190+
S3BucketReadyCondition clusterv1beta1.ConditionType = "S3BucketCreated"
191191

192192
// S3BucketFailedReason is used when any errors occur during reconciliation of an S3 bucket.
193193
S3BucketFailedReason = "S3BucketCreationFailed"

‎controllers/awscluster_controller_test.go‎

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ import (
3535
"k8s.io/client-go/util/retry"
3636
"sigs.k8s.io/controller-runtime/pkg/client"
3737

38-
infrav1beta1 "sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta1"
3938
infrav1 "sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
4039
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/scope"
4140
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/services"
@@ -157,7 +156,7 @@ func TestAWSClusterReconcilerIntegrationTests(t *testing.T) {
157156
g.Expect(cluster.Spec.ControlPlaneEndpoint.Host).To(BeEmpty())
158157
g.Expect(cluster.Spec.ControlPlaneEndpoint.Port).To(BeZero())
159158
expectAWSClusterConditions(g, cs.AWSCluster, []conditionAssertion{
160-
{conditionType: infrav1beta1.LoadBalancerReadyCondition, status: corev1.ConditionFalse, severity: clusterv1beta1.ConditionSeverityInfo, reason: infrav1beta1.WaitForExternalControlPlaneEndpointReason},
159+
{conditionType: infrav1.LoadBalancerReadyCondition, status: corev1.ConditionFalse, severity: clusterv1beta1.ConditionSeverityInfo, reason: infrav1.WaitForExternalControlPlaneEndpointReason},
161160
})
162161
// Mimicking an external operator patching the cluster with an already provisioned Load Balancer:
163162
// this could be done by a human who provisioned a LB, or by a Control Plane provider.
@@ -177,11 +176,11 @@ func TestAWSClusterReconcilerIntegrationTests(t *testing.T) {
177176
g.Expect(err).To(BeNil())
178177
g.Expect(cs.VPC().ID).To(Equal("vpc-exists"))
179178
expectAWSClusterConditions(g, cs.AWSCluster, []conditionAssertion{
180-
{conditionType: infrav1beta1.ClusterSecurityGroupsReadyCondition, status: corev1.ConditionTrue, severity: "", reason: ""},
181-
{conditionType: infrav1beta1.BastionHostReadyCondition, status: corev1.ConditionTrue, severity: "", reason: ""},
182-
{conditionType: infrav1beta1.VpcReadyCondition, status: corev1.ConditionTrue, severity: "", reason: ""},
183-
{conditionType: infrav1beta1.SubnetsReadyCondition, status: corev1.ConditionTrue, severity: "", reason: ""},
184-
{conditionType: infrav1beta1.LoadBalancerReadyCondition, status: corev1.ConditionTrue, severity: "", reason: ""},
179+
{conditionType: infrav1.ClusterSecurityGroupsReadyCondition, status: corev1.ConditionTrue, severity: "", reason: ""},
180+
{conditionType: infrav1.BastionHostReadyCondition, status: corev1.ConditionTrue, severity: "", reason: ""},
181+
{conditionType: infrav1.VpcReadyCondition, status: corev1.ConditionTrue, severity: "", reason: ""},
182+
{conditionType: infrav1.SubnetsReadyCondition, status: corev1.ConditionTrue, severity: "", reason: ""},
183+
{conditionType: infrav1.LoadBalancerReadyCondition, status: corev1.ConditionTrue, severity: "", reason: ""},
185184
})
186185
})
187186
t.Run("Should successfully reconcile AWSCluster creation with unmanaged VPC", func(t *testing.T) {
@@ -276,10 +275,10 @@ func TestAWSClusterReconcilerIntegrationTests(t *testing.T) {
276275
g.Expect(err).To(BeNil())
277276
g.Expect(cs.VPC().ID).To(Equal("vpc-exists"))
278277
expectAWSClusterConditions(g, cs.AWSCluster, []conditionAssertion{
279-
{conditionType: infrav1beta1.ClusterSecurityGroupsReadyCondition, status: corev1.ConditionTrue, severity: "", reason: ""},
280-
{conditionType: infrav1beta1.BastionHostReadyCondition, status: corev1.ConditionTrue, severity: "", reason: ""},
281-
{conditionType: infrav1beta1.VpcReadyCondition, status: corev1.ConditionTrue, severity: "", reason: ""},
282-
{conditionType: infrav1beta1.SubnetsReadyCondition, status: corev1.ConditionTrue, severity: "", reason: ""},
278+
{conditionType: infrav1.ClusterSecurityGroupsReadyCondition, status: corev1.ConditionTrue, severity: "", reason: ""},
279+
{conditionType: infrav1.BastionHostReadyCondition, status: corev1.ConditionTrue, severity: "", reason: ""},
280+
{conditionType: infrav1.VpcReadyCondition, status: corev1.ConditionTrue, severity: "", reason: ""},
281+
{conditionType: infrav1.SubnetsReadyCondition, status: corev1.ConditionTrue, severity: "", reason: ""},
283282
})
284283
})
285284
t.Run("Should successfully reconcile AWSCluster creation with unmanaged VPC and a network type load balancer", func(t *testing.T) {
@@ -383,10 +382,10 @@ func TestAWSClusterReconcilerIntegrationTests(t *testing.T) {
383382
g.Expect(err).To(BeNil())
384383
g.Expect(cs.VPC().ID).To(Equal("vpc-exists"))
385384
expectAWSClusterConditions(g, cs.AWSCluster, []conditionAssertion{
386-
{conditionType: infrav1beta1.ClusterSecurityGroupsReadyCondition, status: corev1.ConditionTrue, severity: "", reason: ""},
387-
{conditionType: infrav1beta1.BastionHostReadyCondition, status: corev1.ConditionTrue, severity: "", reason: ""},
388-
{conditionType: infrav1beta1.VpcReadyCondition, status: corev1.ConditionTrue, severity: "", reason: ""},
389-
{conditionType: infrav1beta1.SubnetsReadyCondition, status: corev1.ConditionTrue, severity: "", reason: ""},
385+
{conditionType: infrav1.ClusterSecurityGroupsReadyCondition, status: corev1.ConditionTrue, severity: "", reason: ""},
386+
{conditionType: infrav1.BastionHostReadyCondition, status: corev1.ConditionTrue, severity: "", reason: ""},
387+
{conditionType: infrav1.VpcReadyCondition, status: corev1.ConditionTrue, severity: "", reason: ""},
388+
{conditionType: infrav1.SubnetsReadyCondition, status: corev1.ConditionTrue, severity: "", reason: ""},
390389
})
391390
})
392391
t.Run("Should successfully reconcile AWSCluster creation with managed VPC", func(t *testing.T) {
@@ -476,10 +475,10 @@ func TestAWSClusterReconcilerIntegrationTests(t *testing.T) {
476475
g.Expect(err).To(BeNil())
477476
g.Expect(cs.VPC().ID).To(Equal("vpc-new"))
478477
expectAWSClusterConditions(g, cs.AWSCluster, []conditionAssertion{
479-
{conditionType: infrav1beta1.ClusterSecurityGroupsReadyCondition, status: corev1.ConditionTrue, severity: "", reason: ""},
480-
{conditionType: infrav1beta1.BastionHostReadyCondition, status: corev1.ConditionTrue, severity: "", reason: ""},
481-
{conditionType: infrav1beta1.VpcReadyCondition, status: corev1.ConditionTrue, severity: "", reason: ""},
482-
{conditionType: infrav1beta1.SubnetsReadyCondition, status: corev1.ConditionTrue, severity: "", reason: ""},
478+
{conditionType: infrav1.ClusterSecurityGroupsReadyCondition, status: corev1.ConditionTrue, severity: "", reason: ""},
479+
{conditionType: infrav1.BastionHostReadyCondition, status: corev1.ConditionTrue, severity: "", reason: ""},
480+
{conditionType: infrav1.VpcReadyCondition, status: corev1.ConditionTrue, severity: "", reason: ""},
481+
{conditionType: infrav1.SubnetsReadyCondition, status: corev1.ConditionTrue, severity: "", reason: ""},
483482
})
484483

485484
// Information should get written back into the `ClusterScope` object. Keeping it up to date means that
@@ -652,15 +651,15 @@ func TestAWSClusterReconcilerIntegrationTests(t *testing.T) {
652651
_, err = reconciler.reconcileDelete(ctx, cs)
653652
g.Expect(err).To(BeNil())
654653
expectAWSClusterConditions(g, cs.AWSCluster, []conditionAssertion{
655-
{infrav1beta1.LoadBalancerReadyCondition, corev1.ConditionFalse, clusterv1beta1.ConditionSeverityInfo, clusterv1beta1.DeletedReason},
656-
{infrav1beta1.BastionHostReadyCondition, corev1.ConditionFalse, clusterv1beta1.ConditionSeverityInfo, clusterv1beta1.DeletedReason},
657-
{infrav1beta1.SecondaryCidrsReadyCondition, corev1.ConditionFalse, clusterv1beta1.ConditionSeverityInfo, clusterv1beta1.DeletingReason},
658-
{infrav1beta1.RouteTablesReadyCondition, corev1.ConditionFalse, clusterv1beta1.ConditionSeverityInfo, clusterv1beta1.DeletedReason},
659-
{infrav1beta1.VpcEndpointsReadyCondition, corev1.ConditionFalse, clusterv1beta1.ConditionSeverityInfo, clusterv1beta1.DeletedReason},
660-
{infrav1beta1.NatGatewaysReadyCondition, corev1.ConditionFalse, clusterv1beta1.ConditionSeverityInfo, clusterv1beta1.DeletedReason},
661-
{infrav1beta1.InternetGatewayReadyCondition, corev1.ConditionFalse, clusterv1beta1.ConditionSeverityInfo, clusterv1beta1.DeletedReason},
662-
{infrav1beta1.SubnetsReadyCondition, corev1.ConditionFalse, clusterv1beta1.ConditionSeverityInfo, clusterv1beta1.DeletedReason},
663-
{infrav1beta1.VpcReadyCondition, corev1.ConditionFalse, clusterv1beta1.ConditionSeverityInfo, clusterv1beta1.DeletedReason},
654+
{infrav1.LoadBalancerReadyCondition, corev1.ConditionFalse, clusterv1beta1.ConditionSeverityInfo, clusterv1beta1.DeletedReason},
655+
{infrav1.BastionHostReadyCondition, corev1.ConditionFalse, clusterv1beta1.ConditionSeverityInfo, clusterv1beta1.DeletedReason},
656+
{infrav1.SecondaryCidrsReadyCondition, corev1.ConditionFalse, clusterv1beta1.ConditionSeverityInfo, clusterv1beta1.DeletingReason},
657+
{infrav1.RouteTablesReadyCondition, corev1.ConditionFalse, clusterv1beta1.ConditionSeverityInfo, clusterv1beta1.DeletedReason},
658+
{infrav1.VpcEndpointsReadyCondition, corev1.ConditionFalse, clusterv1beta1.ConditionSeverityInfo, clusterv1beta1.DeletedReason},
659+
{infrav1.NatGatewaysReadyCondition, corev1.ConditionFalse, clusterv1beta1.ConditionSeverityInfo, clusterv1beta1.DeletedReason},
660+
{infrav1.InternetGatewayReadyCondition, corev1.ConditionFalse, clusterv1beta1.ConditionSeverityInfo, clusterv1beta1.DeletedReason},
661+
{infrav1.SubnetsReadyCondition, corev1.ConditionFalse, clusterv1beta1.ConditionSeverityInfo, clusterv1beta1.DeletedReason},
662+
{infrav1.VpcReadyCondition, corev1.ConditionFalse, clusterv1beta1.ConditionSeverityInfo, clusterv1beta1.DeletedReason},
664663
})
665664
})
666665
}

0 commit comments

Comments
 (0)