Skip to content

Commit 17e338f

Browse files
committed
fix: nolint:kubeapilinter
1 parent b926621 commit 17e338f

File tree

3 files changed

+31
-23
lines changed

3 files changed

+31
-23
lines changed

controlplane/eks/api/v1beta2/awsmanagedcontrolplane_webhook_test.go

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -168,18 +168,20 @@ func TestDefaultingWebhook(t *testing.T) {
168168

169169
func TestWebhookCreate(t *testing.T) {
170170
tests := []struct { //nolint:maligned
171-
name string
172-
eksClusterName string
173-
expectError bool //nolint:kubeapilinter // nobools: Existing API field, not changing to preserve backwards compatibility.
171+
name string
172+
eksClusterName string
173+
//nolint:kubeapilinter // nobools: Existing API field, not changing to preserve backwards compatibility.
174+
expectError bool
174175
expectErrorToContain string // if non-empty, the error message must contain this substring
175176
eksVersion string
176-
hasAddons bool //nolint:kubeapilinter // nobools: Existing API field, not changing to preserve backwards compatibility.
177-
vpcCNI VpcCni
178-
additionalTags infrav1.Tags
179-
secondaryCidr *string
180-
secondaryCidrBlocks []infrav1.VpcCidrBlock
181-
kubeProxy KubeProxy
182-
accessConfig *AccessConfig
177+
//nolint:kubeapilinter // nobools: Existing API field, not changing to preserve backwards compatibility.
178+
hasAddons bool
179+
vpcCNI VpcCni
180+
additionalTags infrav1.Tags
181+
secondaryCidr *string
182+
secondaryCidrBlocks []infrav1.VpcCidrBlock
183+
kubeProxy KubeProxy
184+
accessConfig *AccessConfig
183185
}{
184186
{
185187
name: "ekscluster specified",

exp/api/v1beta2/awsmachinepool_types.go

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -118,13 +118,17 @@ type SuspendProcessesTypes struct {
118118

119119
// Processes defines the processes which can be enabled or disabled individually.
120120
type Processes struct {
121-
Launch *bool `json:"launch,omitempty"` //nolint:kubeapilinter // nobools: Existing API field, not changing to preserve backwards compatibility.
122-
Terminate *bool `json:"terminate,omitempty"` //nolint:kubeapilinter // nobools: Existing API field, not changing to preserve backwards compatibility.
123-
AddToLoadBalancer *bool `json:"addToLoadBalancer,omitempty"` //nolint:kubeapilinter // nobools: Existing API field, not changing to preserve backwards compatibility.
124-
AlarmNotification *bool `json:"alarmNotification,omitempty"` //nolint:kubeapilinter // nobools: Existing API field, not changing to preserve backwards compatibility.
125-
AZRebalance *bool `json:"azRebalance,omitempty"` //nolint:kubeapilinter // nobools: Existing API field, not changing to preserve backwards compatibility.
126-
HealthCheck *bool `json:"healthCheck,omitempty"` //nolint:kubeapilinter // nobools: Existing API field, not changing to preserve backwards compatibility.
127-
InstanceRefresh *bool `json:"instanceRefresh,omitempty"` //nolint:kubeapilinter // nobools: Existing API field, not changing to preserve backwards compatibility.
121+
//nolint:kubeapilinter // nobools: Existing API field, not changing to preserve backwards compatibility.
122+
Launch *bool `json:"launch,omitempty"`
123+
//nolint:kubeapilinter // nobools: Existing API field, not changing to preserve backwards compatibility.
124+
Terminate *bool `json:"terminate,omitempty"`
125+
//nolint:kubeapilinter // nobools: Existing API field, not changing to preserve backwards compatibility.
126+
AddToLoadBalancer *bool `json:"addToLoadBalancer,omitempty"`
127+
//nolint:kubeapilinter // nobools: Existing API field, not changing to preserve backwards compatibility.
128+
AlarmNotification *bool `json:"alarmNotification,omitempty"`
129+
AZRebalance *bool `json:"azRebalance,omitempty"` //nolint:kubeapilinter // nobools: Existing API field, not changing to preserve backwards compatibility.
130+
HealthCheck *bool `json:"healthCheck,omitempty"` //nolint:kubeapilinter // nobools: Existing API field, not changing to preserve backwards compatibility.
131+
InstanceRefresh *bool `json:"instanceRefresh,omitempty"` //nolint:kubeapilinter // nobools: Existing API field, not changing to preserve backwards compatibility.
128132
ReplaceUnhealthy *bool `json:"replaceUnhealthy,omitempty"` //nolint:kubeapilinter // nobools: Existing API field, not changing to preserve backwards compatibility.
129133
ScheduledActions *bool `json:"scheduledActions,omitempty"` //nolint:kubeapilinter // nobools: Existing API field, not changing to preserve backwards compatibility.
130134
}

pkg/cloud/endpoints/partition.go

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,13 @@ type Partition struct {
3636
//
3737
//nolint:revive
3838
type PartitionConfig struct {
39-
Name string `json:"name"`
40-
DnsSuffix string `json:"dnsSuffix"`
41-
DualStackDnsSuffix string `json:"dualStackDnsSuffix"`
42-
SupportsFIPS bool `json:"supportsFIPS"` //nolint:kubeapilinter // nobools: Existing API field, not changing to preserve backwards compatibility.
43-
SupportsDualStack bool `json:"supportsDualStack"` //nolint:kubeapilinter // nobools: Existing API field, not changing to preserve backwards compatibility.
39+
Name string `json:"name"`
40+
DnsSuffix string `json:"dnsSuffix"`
41+
DualStackDnsSuffix string `json:"dualStackDnsSuffix"`
42+
//nolint:kubeapilinter // nobools: Existing API field, not changing to preserve backwards compatibility.
43+
SupportsFIPS bool `json:"supportsFIPS"`
44+
//nolint:kubeapilinter // nobools: Existing API field, not changing to preserve backwards compatibility.
45+
SupportsDualStack bool `json:"supportsDualStack"`
4446
ImplicitGlobalRegion string `json:"implicitGlobalRegion"`
4547
}
4648

@@ -51,7 +53,7 @@ type RegionOverrides struct {
5153
Name *string `json:"name"`
5254
DnsSuffix *string `json:"dnsSuffix"`
5355
DualStackDnsSuffix *string `json:"dualStackDnsSuffix"`
54-
SupportsFIPS *bool `json:"supportsFIPS"` //nolint:kubeapilinter // nobools: Existing API field, not changing to preserve backwards compatibility.
56+
SupportsFIPS *bool `json:"supportsFIPS"` //nolint:kubeapilinter // nobools: Existing API field, not changing to preserve backwards compatibility.
5557
SupportsDualStack *bool `json:"supportsDualStack"` //nolint:kubeapilinter // nobools: Existing API field, not changing to preserve backwards compatibility.
5658
}
5759

0 commit comments

Comments
 (0)