Skip to content

Commit b3f3c1a

Browse files
mjlshenmjlshen
authored
Merge branch 'kubernetes-sigs:main' into aws-sdk-go-v2
2 parents b6905f4 + f3ba287 commit b3f3c1a

File tree

88 files changed

+2787
-961
lines changed

Some content is hidden

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

88 files changed

+2787
-961
lines changed

‎.devcontainer/capa-devbox/devcontainer.json

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"name": "CAPA Devcontainer+Devbox",
3+
"image": "mcr.microsoft.com/devcontainers/go",
4+
"features": {
5+
"ghcr.io/dlouwers/devcontainer-features/devbox:1": {},
6+
"ghcr.io/devcontainers/features/docker-in-docker:2.12.0": {},
7+
"ghcr.io/devcontainers-contrib/features/kind:1.0.14": {},
8+
"ghcr.io/rio/features/k9s:1.1.5": {},
9+
"ghcr.io/audacioustux/devcontainers/tilt:1.0.1": {},
10+
"ghcr.io/devcontainers/features/kubectl-helm-minikube:1.2.0": {
11+
"version": "latest",
12+
"helm": "latest",
13+
"minikube": "none"
14+
}
15+
},
16+
"postCreateCommand": "devbox install",
17+
"customizations": {
18+
"vscode": {
19+
"settings": {},
20+
"extensions": [
21+
"jetpack-io.devbox",
22+
"golang.go",
23+
"ms-kubernetes-tools.vscode-kubernetes-tools",
24+
"ms-azuretools.vscode-dockerr"
25+
]
26+
}
27+
}
28+
}

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,14 @@ Fixes #
2828
**Special notes for your reviewer**:
2929

3030
**Checklist**:
31-
<!-- Put an "X" character inside the brackets of each completed task. Some may be optional depending on the PR in which case these can be deleted -->
31+
<!-- Put an "X" character inside the brackets of each completed task. Some may be optional depending on the PR in which case these can be deleted
32+
33+
Please add an icon to the title of this PR, the icon will be either ⚠️ (:warning:, major or breaking changes), ✨ (:sparkles:, feature additions), 🐛 (:bug:, patch and bugfixes), 📖 (:book:, documentation or proposals), or 🌱 (:seedling:, minor or other)
34+
-->
3235

3336
- [ ] squashed commits
3437
- [ ] includes documentation
35-
- [ ] includes [emojis](https://github.com/kubernetes-sigs/kubebuilder-release-tools?tab=readme-ov-file#kubebuilder-project-versioning)
38+
- [ ] includes emoji in title
3639
- [ ] adds unit tests
3740
- [ ] adds or updates e2e tests
3841

‎.github/workflows/pr-golangci-lint.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
with:
2727
go-version: ${{ steps.vars.outputs.go_version }}
2828
- name: golangci-lint
29-
uses: golangci/golangci-lint-action@971e284b6050e8a5849b72094c50ab08da042db8 # tag=v6.1.1
29+
uses: golangci/golangci-lint-action@ec5d18412c0aeab7936cb16880d708ba2a64e1ae # tag=v6.2.0
3030
with:
3131
version: v1.62.2
3232
args: --out-format=colored-line-number

‎.github/workflows/pr-verify.yml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,15 @@ on:
44
pull_request_target:
55
types: [opened, edited, synchronize, reopened]
66

7-
permissions:
8-
checks: write
9-
107
jobs:
118
verify:
129
runs-on: ubuntu-latest
1310
name: verify PR contents
1411
steps:
15-
- name: Verifier action
16-
id: verifier
17-
uses: kubernetes-sigs/kubebuilder-release-tools@012269a88fa4c034a0acf1ba84c26b195c0dbab4 # tag=v0.4.3
18-
with:
19-
github_token: ${{ secrets.GITHUB_TOKEN }}
12+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # tag=v4.2.2
13+
14+
- name: Check if PR title is valid
15+
env:
16+
PR_TITLE: ${{ github.event.pull_request.title }}
17+
run: |
18+
./hack/verify-pr-title.sh "${PR_TITLE}"

‎api/v1beta1/awscluster_conversion.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ func (src *AWSCluster) ConvertTo(dstRaw conversion.Hub) error {
6060
dst.Status.Bastion.PrivateDNSName = restored.Status.Bastion.PrivateDNSName
6161
dst.Status.Bastion.PublicIPOnLaunch = restored.Status.Bastion.PublicIPOnLaunch
6262
dst.Status.Bastion.CapacityReservationID = restored.Status.Bastion.CapacityReservationID
63+
dst.Status.Bastion.MarketType = restored.Status.Bastion.MarketType
6364
}
6465
dst.Spec.Partition = restored.Spec.Partition
6566

‎api/v1beta1/awsmachine_conversion.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ func (src *AWSMachine) ConvertTo(dstRaw conversion.Hub) error {
4242
dst.Spec.PrivateDNSName = restored.Spec.PrivateDNSName
4343
dst.Spec.SecurityGroupOverrides = restored.Spec.SecurityGroupOverrides
4444
dst.Spec.CapacityReservationID = restored.Spec.CapacityReservationID
45+
dst.Spec.MarketType = restored.Spec.MarketType
4546
if restored.Spec.ElasticIPPool != nil {
4647
if dst.Spec.ElasticIPPool == nil {
4748
dst.Spec.ElasticIPPool = &infrav1.ElasticIPPool{}
@@ -104,6 +105,7 @@ func (r *AWSMachineTemplate) ConvertTo(dstRaw conversion.Hub) error {
104105
dst.Spec.Template.Spec.PrivateDNSName = restored.Spec.Template.Spec.PrivateDNSName
105106
dst.Spec.Template.Spec.SecurityGroupOverrides = restored.Spec.Template.Spec.SecurityGroupOverrides
106107
dst.Spec.Template.Spec.CapacityReservationID = restored.Spec.Template.Spec.CapacityReservationID
108+
dst.Spec.Template.Spec.MarketType = restored.Spec.Template.Spec.MarketType
107109
if restored.Spec.Template.Spec.ElasticIPPool != nil {
108110
if dst.Spec.Template.Spec.ElasticIPPool == nil {
109111
dst.Spec.Template.Spec.ElasticIPPool = &infrav1.ElasticIPPool{}

‎api/v1beta1/zz_generated.conversion.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/v1beta2/awsmachine_types.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,15 @@ type AWSMachineSpec struct {
197197
// CapacityReservationID specifies the target Capacity Reservation into which the instance should be launched.
198198
// +optional
199199
CapacityReservationID *string `json:"capacityReservationId,omitempty"`
200+
201+
// MarketType specifies the type of market for the EC2 instance. Valid values include:
202+
// "OnDemand" (default): The instance runs as a standard OnDemand instance.
203+
// "Spot": The instance runs as a Spot instance. When SpotMarketOptions is provided, the marketType defaults to "Spot".
204+
// "CapacityBlock": The instance utilizes pre-purchased compute capacity (capacity blocks) with AWS Capacity Reservations.
205+
// If this value is selected, CapacityReservationID must be specified to identify the target reservation.
206+
// If marketType is not specified and spotMarketOptions is provided, the marketType defaults to "Spot".
207+
// +optional
208+
MarketType MarketType `json:"marketType,omitempty"`
200209
}
201210

202211
// CloudInit defines options related to the bootstrapping systems where

‎api/v1beta2/awsmachine_webhook.go

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ func (r *AWSMachine) ValidateCreate() (admission.Warnings, error) {
6666
allErrs = append(allErrs, r.validateAdditionalSecurityGroups()...)
6767
allErrs = append(allErrs, r.Spec.AdditionalTags.Validate()...)
6868
allErrs = append(allErrs, r.validateNetworkElasticIPPool()...)
69+
allErrs = append(allErrs, r.validateInstanceMarketType()...)
6970

7071
return nil, aggregateObjErrors(r.GroupVersionKind().GroupKind(), r.Name, allErrs)
7172
}
@@ -361,6 +362,20 @@ func (r *AWSMachine) validateNetworkElasticIPPool() field.ErrorList {
361362
return allErrs
362363
}
363364

365+
func (r *AWSMachine) validateInstanceMarketType() field.ErrorList {
366+
var allErrs field.ErrorList
367+
if r.Spec.MarketType == MarketTypeCapacityBlock && r.Spec.SpotMarketOptions != nil {
368+
allErrs = append(allErrs, field.Forbidden(field.NewPath("spec", "marketType"), "marketType set to CapacityBlock and spotMarketOptions cannot be used together"))
369+
}
370+
if r.Spec.MarketType == MarketTypeOnDemand && r.Spec.SpotMarketOptions != nil {
371+
allErrs = append(allErrs, field.Forbidden(field.NewPath("spec", "marketType"), "setting marketType to OnDemand and spotMarketOptions cannot be used together"))
372+
}
373+
if r.Spec.MarketType == MarketTypeCapacityBlock && r.Spec.CapacityReservationID == nil {
374+
allErrs = append(allErrs, field.Forbidden(field.NewPath("spec", "capacityReservationID"), "is required when CapacityBlock is provided"))
375+
}
376+
return allErrs
377+
}
378+
364379
func (r *AWSMachine) validateNonRootVolumes() field.ErrorList {
365380
var allErrs field.ErrorList
366381

‎api/v1beta2/awsmachine_webhook_test.go

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,49 @@ func TestAWSMachineCreate(t *testing.T) {
217217
},
218218
wantErr: false,
219219
},
220+
{
221+
name: "invalid case, MarketType set to MarketTypeCapacityBlock and spotMarketOptions are specified",
222+
machine: &AWSMachine{
223+
Spec: AWSMachineSpec{
224+
MarketType: MarketTypeCapacityBlock,
225+
SpotMarketOptions: &SpotMarketOptions{},
226+
InstanceType: "test",
227+
},
228+
},
229+
wantErr: true,
230+
},
231+
{
232+
name: "invalid case, MarketType set to MarketTypeOnDemand and spotMarketOptions are specified",
233+
machine: &AWSMachine{
234+
Spec: AWSMachineSpec{
235+
MarketType: MarketTypeOnDemand,
236+
SpotMarketOptions: &SpotMarketOptions{},
237+
InstanceType: "test",
238+
},
239+
},
240+
wantErr: true,
241+
},
242+
{
243+
name: "valid MarketType set to MarketTypeCapacityBlock is specified and CapacityReservationId is not provided",
244+
machine: &AWSMachine{
245+
Spec: AWSMachineSpec{
246+
MarketType: MarketTypeCapacityBlock,
247+
InstanceType: "test",
248+
},
249+
},
250+
wantErr: true,
251+
},
252+
{
253+
name: "valid MarketType set to MarketTypeCapacityBlock and CapacityReservationId are specified",
254+
machine: &AWSMachine{
255+
Spec: AWSMachineSpec{
256+
MarketType: MarketTypeCapacityBlock,
257+
CapacityReservationID: aws.String("cr-12345678901234567"),
258+
InstanceType: "test",
259+
},
260+
},
261+
wantErr: false,
262+
},
220263
{
221264
name: "empty instance type not allowed",
222265
machine: &AWSMachine{

‎api/v1beta2/types.go

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,8 +261,32 @@ type Instance struct {
261261
// CapacityReservationID specifies the target Capacity Reservation into which the instance should be launched.
262262
// +optional
263263
CapacityReservationID *string `json:"capacityReservationId,omitempty"`
264+
265+
// MarketType specifies the type of market for the EC2 instance. Valid values include:
266+
// "OnDemand" (default): The instance runs as a standard OnDemand instance.
267+
// "Spot": The instance runs as a Spot instance. When SpotMarketOptions is provided, the marketType defaults to "Spot".
268+
// "CapacityBlock": The instance utilizes pre-purchased compute capacity (capacity blocks) with AWS Capacity Reservations.
269+
// If this value is selected, CapacityReservationID must be specified to identify the target reservation.
270+
// If marketType is not specified and spotMarketOptions is provided, the marketType defaults to "Spot".
271+
// +optional
272+
MarketType MarketType `json:"marketType,omitempty"`
264273
}
265274

275+
// MarketType describes the market type of an Instance
276+
// +kubebuilder:validation:Enum:=OnDemand;Spot;CapacityBlock
277+
type MarketType string
278+
279+
const (
280+
// MarketTypeOnDemand is a MarketType enum value
281+
MarketTypeOnDemand MarketType = "OnDemand"
282+
283+
// MarketTypeSpot is a MarketType enum value
284+
MarketTypeSpot MarketType = "Spot"
285+
286+
// MarketTypeCapacityBlock is a MarketType enum value
287+
MarketTypeCapacityBlock MarketType = "CapacityBlock"
288+
)
289+
266290
// InstanceMetadataState describes the state of InstanceMetadataOptions.HttpEndpoint and InstanceMetadataOptions.InstanceMetadataTags
267291
type InstanceMetadataState string
268292

‎config/crd/bases/OWNERS

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,6 @@ filters:
44
"^.*rosa.*\\.yaml$":
55
approvers:
66
- muraee
7-
- stevekuznetsov
7+
- serngawy
8+
reviewers:
9+
- serngawy

‎config/crd/bases/controlplane.cluster.x-k8s.io_awsmanagedcontrolplanes.yaml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1210,6 +1210,19 @@ spec:
12101210
instanceState:
12111211
description: The current state of the instance.
12121212
type: string
1213+
marketType:
1214+
description: |-
1215+
MarketType specifies the type of market for the EC2 instance. Valid values include:
1216+
"OnDemand" (default): The instance runs as a standard OnDemand instance.
1217+
"Spot": The instance runs as a Spot instance. When SpotMarketOptions is provided, the marketType defaults to "Spot".
1218+
"CapacityBlock": The instance utilizes pre-purchased compute capacity (capacity blocks) with AWS Capacity Reservations.
1219+
If this value is selected, CapacityReservationID must be specified to identify the target reservation.
1220+
If marketType is not specified and spotMarketOptions is provided, the marketType defaults to "Spot".
1221+
enum:
1222+
- OnDemand
1223+
- Spot
1224+
- CapacityBlock
1225+
type: string
12131226
networkInterfaces:
12141227
description: Specifies ENIs attached to instance
12151228
items:
@@ -3250,6 +3263,19 @@ spec:
32503263
instanceState:
32513264
description: The current state of the instance.
32523265
type: string
3266+
marketType:
3267+
description: |-
3268+
MarketType specifies the type of market for the EC2 instance. Valid values include:
3269+
"OnDemand" (default): The instance runs as a standard OnDemand instance.
3270+
"Spot": The instance runs as a Spot instance. When SpotMarketOptions is provided, the marketType defaults to "Spot".
3271+
"CapacityBlock": The instance utilizes pre-purchased compute capacity (capacity blocks) with AWS Capacity Reservations.
3272+
If this value is selected, CapacityReservationID must be specified to identify the target reservation.
3273+
If marketType is not specified and spotMarketOptions is provided, the marketType defaults to "Spot".
3274+
enum:
3275+
- OnDemand
3276+
- Spot
3277+
- CapacityBlock
3278+
type: string
32533279
networkInterfaces:
32543280
description: Specifies ENIs attached to instance
32553281
items:

‎config/crd/bases/controlplane.cluster.x-k8s.io_rosacontrolplanes.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,14 @@ spec:
8282
rule: self == oldSelf
8383
- message: billingAccount must be a valid AWS account ID
8484
rule: self.matches('^[0-9]{12}$')
85+
channelGroup:
86+
default: stable
87+
description: OpenShift version channel group, default is stable.
88+
enum:
89+
- stable
90+
- candidate
91+
- nightly
92+
type: string
8593
clusterRegistryConfig:
8694
description: ClusterRegistryConfig represents registry config used
8795
with the cluster.
@@ -210,6 +218,12 @@ spec:
210218
description: The instance type to use, for example `r5.xlarge`.
211219
Instance type ref; https://aws.amazon.com/ec2/instance-types/
212220
type: string
221+
volumeSize:
222+
description: VolumeSize set the disk volume size for the default
223+
workers machine pool in Gib. The default is 300 GiB.
224+
maximum: 16384
225+
minimum: 75
226+
type: integer
213227
type: object
214228
domainPrefix:
215229
description: |-
@@ -794,6 +808,7 @@ spec:
794808
type: string
795809
required:
796810
- availabilityZones
811+
- channelGroup
797812
- installerRoleARN
798813
- oidcID
799814
- region

‎config/crd/bases/infrastructure.cluster.x-k8s.io_awsclusters.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2177,6 +2177,19 @@ spec:
21772177
instanceState:
21782178
description: The current state of the instance.
21792179
type: string
2180+
marketType:
2181+
description: |-
2182+
MarketType specifies the type of market for the EC2 instance. Valid values include:
2183+
"OnDemand" (default): The instance runs as a standard OnDemand instance.
2184+
"Spot": The instance runs as a Spot instance. When SpotMarketOptions is provided, the marketType defaults to "Spot".
2185+
"CapacityBlock": The instance utilizes pre-purchased compute capacity (capacity blocks) with AWS Capacity Reservations.
2186+
If this value is selected, CapacityReservationID must be specified to identify the target reservation.
2187+
If marketType is not specified and spotMarketOptions is provided, the marketType defaults to "Spot".
2188+
enum:
2189+
- OnDemand
2190+
- Spot
2191+
- CapacityBlock
2192+
type: string
21802193
networkInterfaces:
21812194
description: Specifies ENIs attached to instance
21822195
items:

‎config/crd/bases/infrastructure.cluster.x-k8s.io_awsmachinepools.yaml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -629,6 +629,10 @@ spec:
629629
description: ID of resource
630630
type: string
631631
type: object
632+
capacityReservationId:
633+
description: CapacityReservationID specifies the target Capacity
634+
Reservation into which the instance should be launched.
635+
type: string
632636
iamInstanceProfile:
633637
description: |-
634638
The name or the Amazon Resource Name (ARN) of the instance profile associated
@@ -724,6 +728,19 @@ spec:
724728
description: 'InstanceType is the type of instance to create.
725729
Example: m4.xlarge'
726730
type: string
731+
marketType:
732+
description: |-
733+
MarketType specifies the type of market for the EC2 instance. Valid values include:
734+
"OnDemand" (default): The instance runs as a standard OnDemand instance.
735+
"Spot": The instance runs as a Spot instance. When SpotMarketOptions is provided, the marketType defaults to "Spot".
736+
"CapacityBlock": The instance utilizes pre-purchased compute capacity (capacity blocks) with AWS Capacity Reservations.
737+
If this value is selected, CapacityReservationID must be specified to identify the target reservation.
738+
If marketType is not specified and spotMarketOptions is provided, the marketType defaults to "Spot".
739+
enum:
740+
- OnDemand
741+
- Spot
742+
- CapacityBlock
743+
type: string
727744
name:
728745
description: The name of the launch template.
729746
type: string

0 commit comments

Comments
 (0)