Skip to content

Commit 33d0ce7

Browse files
clebsclebs
committed
Consolidate conditions imports and fix linting
Signed-off-by: Borja Clemente <[email protected]>
1 parent ebef99d commit 33d0ce7

File tree

93 files changed

+403
-389
lines changed

Some content is hidden

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

93 files changed

+403
-389
lines changed

‎api/v1beta1/awscluster_types.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package v1beta1
1919
import (
2020
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2121

22-
clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
22+
clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1" //nolint:staticcheck
2323
)
2424

2525
const (

‎api/v1beta1/awsmachine_types.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package v1beta1
1919
import (
2020
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2121

22-
clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
22+
clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1" //nolint:staticcheck
2323
)
2424

2525
const (

‎api/v1beta1/conditions_consts.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ limitations under the License.
1616

1717
package v1beta1
1818

19-
import clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
19+
import clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1" //nolint:staticcheck
2020

2121
const (
2222
// PrincipalCredentialRetrievedCondition reports on whether Principal credentials could be retrieved successfully.

‎api/v1beta2/awscluster_types.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package v1beta2
1919
import (
2020
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2121

22-
clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
22+
clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1" //nolint:staticcheck
2323
)
2424

2525
const (

‎api/v1beta2/awscluster_webhook_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import (
3333

3434
"sigs.k8s.io/cluster-api-provider-aws/v2/feature"
3535
"sigs.k8s.io/cluster-api-provider-aws/v2/util/defaulting"
36-
clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
36+
clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1" //nolint:staticcheck
3737
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
3838
)
3939

‎api/v1beta2/awsmachine_types.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package v1beta2
1919
import (
2020
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2121

22-
clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
22+
clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1" //nolint:staticcheck
2323
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
2424
)
2525

‎api/v1beta2/awsmachinetemplate_webhook.go‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ func (r *AWSMachineTemplate) validateIgnitionAndCloudInit() field.ErrorList {
172172

173173
return allErrs
174174
}
175+
<<<<<<< HEAD
175176
func (r *AWSMachineTemplate) validateHostAllocation() field.ErrorList {
176177
var allErrs field.ErrorList
177178

@@ -187,6 +188,8 @@ func (r *AWSMachineTemplate) validateHostAllocation() field.ErrorList {
187188

188189
return allErrs
189190
}
191+
=======
192+
>>>>>>> c3fc709ee (Consolidate conditions imports and fix linting)
190193

191194
func (r *AWSMachineTemplate) validateSSHKeyName() field.ErrorList {
192195
return validateSSHKeyName(r.Spec.Template.Spec.SSHKeyName)
@@ -244,7 +247,7 @@ func (r *AWSMachineTemplateWebhook) ValidateUpdate(ctx context.Context, oldRaw r
244247

245248
var allErrs field.ErrorList
246249

247-
if !topology.ShouldSkipImmutabilityChecks(req, newAWSMachineTemplate) && !cmp.Equal(newAWSMachineTemplate.Spec, oldAWSMachineTemplate.Spec) {
250+
if !topology.IsDryRunRequest(req, newAWSMachineTemplate) && !cmp.Equal(newAWSMachineTemplate.Spec, oldAWSMachineTemplate.Spec) {
248251
if oldAWSMachineTemplate.Spec.Template.Spec.InstanceMetadataOptions == nil {
249252
oldAWSMachineTemplate.Spec.Template.Spec.InstanceMetadataOptions = newAWSMachineTemplate.Spec.Template.Spec.InstanceMetadataOptions
250253
}

‎api/v1beta2/awsmanagedcluster_types.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package v1beta2
1919
import (
2020
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2121

22-
clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
22+
clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1" //nolint:staticcheck
2323
)
2424

2525
// AWSManagedClusterSpec defines the desired state of AWSManagedCluster

‎api/v1beta2/conditions_consts.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ limitations under the License.
1616

1717
package v1beta2
1818

19-
import clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
19+
import clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1" //nolint:staticcheck
2020

2121
const (
2222
// PrincipalCredentialRetrievedCondition reports on whether Principal credentials could be retrieved successfully.

‎bootstrap/eks/api/v1beta1/eksconfig_types.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package v1beta1
1919
import (
2020
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2121

22-
clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
22+
clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1" //nolint:staticcheck
2323
)
2424

2525
// EKSConfigSpec defines the desired state of Amazon EKS Bootstrap Configuration.

0 commit comments

Comments
 (0)