Skip to content

Commit b767bf4

Browse files
jimmidysonjimmidyson
committed
fixup! fix: Regenerate API types and addons
1 parent b510d90 commit b767bf4

File tree

7 files changed

+37
-12
lines changed

7 files changed

+37
-12
lines changed

‎api/v1alpha1/crds/caren.nutanix.com_eksclusterconfigs.yaml‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ spec:
5959
description: |-
6060
Name of the referent.
6161
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
62+
maxLength: 253
6263
minLength: 1
6364
type: string
6465
required:
@@ -124,6 +125,7 @@ spec:
124125
type: string
125126
name:
126127
description: Name is the name of resource being referenced.
128+
maxLength: 253
127129
minLength: 1
128130
type: string
129131
required:
@@ -149,6 +151,7 @@ spec:
149151
storageClassConfig:
150152
description: Name of the default storage class config
151153
the specified default provider.
154+
maxLength: 242
152155
minLength: 1
153156
type: string
154157
required:
@@ -171,6 +174,7 @@ spec:
171174
description: |-
172175
Name of the referent.
173176
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
177+
maxLength: 253
174178
minLength: 1
175179
type: string
176180
required:
@@ -183,7 +187,6 @@ spec:
183187
additionalProperties:
184188
properties:
185189
allowExpansion:
186-
default: false
187190
description: If the storage class should allow
188191
volume expanding
189192
type: boolean
@@ -293,6 +296,7 @@ spec:
293296
- end
294297
- start
295298
type: object
299+
maxItems: 10
296300
minItems: 1
297301
type: array
298302
required:
@@ -322,24 +326,27 @@ spec:
322326
properties:
323327
id:
324328
description: Existing Subnet ID to use for the cluster.
325-
minLength: 1
329+
format: ^subnet-[0-9a-f]{8}(?:[0-9a-f]{9})?$
326330
type: string
327331
required:
328332
- id
329333
type: object
334+
maxItems: 10
330335
type: array
331336
vpc:
332337
properties:
333338
id:
334339
description: Existing VPC ID to use for the cluster.
335-
minLength: 1
340+
format: ^vpc-[0-9a-f]{8}(?:[0-9a-f]{9})?$
336341
type: string
337342
required:
338343
- id
339344
type: object
340345
type: object
341346
region:
342347
description: AWS region to create cluster in.
348+
maxLength: 16
349+
minLength: 4
343350
type: string
344351
type: object
345352
type: object

‎api/v1alpha1/crds/caren.nutanix.com_eksworkernodeconfigs.yaml‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,11 @@ spec:
5151
properties:
5252
id:
5353
description: ID is the id of the security group
54+
format: ^sg-[0-9a-f]{8}(?:[0-9a-f]{9})?$
55+
minLength: 1
5456
type: string
5557
type: object
58+
maxItems: 32
5659
type: array
5760
ami:
5861
description: |-
@@ -62,34 +65,47 @@ spec:
6265
id:
6366
description: AMI ID is the reference to the AMI from which
6467
to create the machine instance.
68+
format: ^ami-[0-9a-f]{8}(?:[0-9a-f]{9})?$
69+
minLength: 1
6570
type: string
6671
lookup:
6772
description: Lookup is the lookup arguments for the AMI.
6873
properties:
6974
baseOS:
7075
description: The name of the base os for image lookup
76+
maxLength: 32
77+
minLength: 1
7178
type: string
7279
format:
7380
description: |-
7481
AMI naming format. Supports substitutions for {{.BaseOS}} and {{.K8sVersion}} with the
7582
base OS and kubernetes version.
7683
example: capa-ami-{{.BaseOS}}-?{{.K8sVersion}}-*
84+
maxLength: 128
85+
minLength: 1
7786
type: string
7887
org:
7988
description: The AWS Organization ID to use for image
8089
lookup.
90+
format: ^o-[0-9a-z]{10,32}$
91+
maxLength: 34
92+
minLength: 12
8193
type: string
8294
type: object
8395
type: object
8496
iamInstanceProfile:
8597
default: nodes.cluster-api-provider-aws.sigs.k8s.io
8698
description: The IAM instance profile to use for the cluster Machines.
99+
maxLength: 128
100+
minLength: 1
87101
type: string
88102
instanceType:
89103
default: m5.2xlarge
90104
description: The AWS instance type to use for the cluster Machines.
105+
maxLength: 32
106+
minLength: 1
91107
type: string
92-
placementGroupName:
108+
placementGroup:
93109
description: PlacementGroup specifies the placement group in which
94110
to launch the instance.
95111
properties:
@@ -122,9 +138,12 @@ spec:
122138
type: string
123139
key:
124140
description: The taint key to be applied to a node.
141+
maxLength: 253
125142
type: string
126143
value:
127144
description: The taint value corresponding to the taint key.
145+
maxLength: 63
146+
minLength: 1
128147
type: string
129148
required:
130149
- effect

‎api/v1alpha1/crds/caren.nutanix.com_genericclusterconfigs.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ spec:
7070
description: |-
7171
Name of the referent.
7272
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
73+
maxLength: 253
7374
minLength: 1
7475
type: string
7576
required:
@@ -135,6 +136,7 @@ spec:
135136
type: string
136137
name:
137138
description: Name is the name of resource being referenced.
139+
maxLength: 253
138140
minLength: 1
139141
type: string
140142
required:
@@ -192,6 +194,7 @@ spec:
192194
- end
193195
- start
194196
type: object
197+
maxItems: 10
195198
minItems: 1
196199
type: array
197200
required:

‎charts/cluster-api-runtime-extensions-nutanix/templates/csi/aws-ebs/manifests/aws-ebs-csi-configmap.yaml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -538,11 +538,6 @@ data:
538538
- auto
539539
- hybrid
540540
weight: 1
541-
requiredDuringSchedulingIgnoredDuringExecution:
542-
nodeSelectorTerms:
543-
- matchExpressions:
544-
- key: node-role.kubernetes.io/control-plane
545-
operator: Exists
546541
podAntiAffinity:
547542
preferredDuringSchedulingIgnoredDuringExecution:
548543
- podAffinityTerm:

‎go.mod‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ require (
6666
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
6767
github.com/aws/aws-sdk-go-v2 v1.38.3 // indirect
6868
github.com/aws/aws-sdk-go-v2/service/ec2 v1.249.0 // indirect
69+
github.com/aws/aws-sdk-go-v2/service/eks v1.73.1 // indirect
6970
github.com/aws/smithy-go v1.23.0 // indirect
7071
github.com/beorn7/perks v1.0.1 // indirect
7172
github.com/cenkalti/backoff/v4 v4.3.0 // indirect

‎go.sum‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ github.com/aws/aws-sdk-go-v2 v1.38.3 h1:B6cV4oxnMs45fql4yRH+/Po/YU+597zgWqvDpYMt
3737
github.com/aws/aws-sdk-go-v2 v1.38.3/go.mod h1:sDioUELIUO9Znk23YVmIk86/9DOpkbyyVb1i/gUNFXY=
3838
github.com/aws/aws-sdk-go-v2/service/ec2 v1.249.0 h1:1wn3h1PKTKQ9tg7bzfm4x1iqKYsLY2qfmV4SsDmakkI=
3939
github.com/aws/aws-sdk-go-v2/service/ec2 v1.249.0/go.mod h1:SmMqzfS4HVsOD58lwLZ79oxF58f8zVe5YdK3o+/o1Ck=
40+
github.com/aws/aws-sdk-go-v2/service/eks v1.73.1 h1:Txq5jxY/ao+2Vx/kX9+65WTqkzCnxSlXnwIj+Cr/fng=
41+
github.com/aws/aws-sdk-go-v2/service/eks v1.73.1/go.mod h1:+hYFg3laewH0YCfJRv+o5R3bradDKmFIm/uaiaD1U7U=
4042
github.com/aws/smithy-go v1.23.0 h1:8n6I3gXzWJB2DxBDnfxgBaSX6oe0d/t10qGz7OKqMCE=
4143
github.com/aws/smithy-go v1.23.0/go.mod h1:t1ufH5HMublsJYulve2RKmHDC15xu1f26kHCp/HgceI=
4244
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=

‎pkg/handlers/generic/mutation/kubernetesimagerepository/variables_test.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@ var testDefs = []capitest.VariableTestDef{{
1919
Name: "set",
2020
Vals: v1alpha1.GenericClusterConfigSpec{
2121
GenericClusterConfigResource: v1alpha1.GenericClusterConfigResource{
22-
KubernetesImageRepository: ptr.To(
23-
"my-registry.io/my-org/my-repo",
24-
),
22+
KubernetesImageRepository: "my-registry.io/my-org/my-repo",
2523
},
2624
},
2725
}}

0 commit comments

Comments
 (0)