Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Spotinst: Feature/add multi arch in VNG and resource tag specification #16099

Merged
merged 5 commits into from
Nov 23, 2023
Merged

Spotinst: Feature/add multi arch in VNG and resource tag specification #16099

merged 5 commits into from
Nov 23, 2023

Conversation

yehielnetapp
Copy link
Contributor

@yehielnetapp yehielnetapp commented Nov 12, 2023 •
edited
Loading

Feature add
0) update spotinst SDK in vendor github.com/spotinst/[email protected]
1)It will be possible to set multi AMI per Virtual Node Group, one for each architecture (x86, arm)
2)add tag to track storage costs on their end on the VNG level.
this is logical PR of : #15839 after changes
in: #15839 (comment)

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Nov 12, 2023
@k8s-ci-robot
Copy link
Contributor

Hi @yehielnetapp. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Nov 12, 2023
@k8s-ci-robot k8s-ci-robot requested a review from zetaab November 12, 2023 13:34
@k8s-ci-robot k8s-ci-robot added area/provider/aws Issues or PRs related to aws provider area/provider/spotinst Issues or PRs related to spotinst provider labels Nov 12, 2023
@yehielnetapp yehielnetapp mentioned this pull request Nov 13, 2023
Closed
@yehielnetapp
Copy link
Contributor Author

Hi @justinsb i have modified #15839 ,to this version ,can we move it forward
with ok-to-test etc. @zetaab,@hakman

@upodroid
Copy link
Member

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Nov 21, 2023
@hakman
Copy link
Member

hakman commented Nov 21, 2023

Thanks @yehielnetapp.
/lgtm
/assign @justinsb

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 21, 2023
justinsb
justinsb approved these changes Nov 23, 2023
View reviewed changes
pkg/model/awsmodel/spotinst.go
@@ -524,7 +537,7 @@ func (b *SpotInstanceGroupModelBuilder) buildOcean(c *fi.CloudupModelBuilderCont

klog.V(4).Infof("Adding task: Ocean/%s", fi.ValueOf(ocean.Name))
c.AddTask(ocean)

klog.V(4).Infof("Finish task: Ocean/%s", fi.ValueOf(ocean.Name))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It doesn't matter, but (I think) AddTask should be almost instant (and only fails if there's a naming conflict, IIRC) - it just inserts an entry into a map.

upup/pkg/fi/cloudup/spotinsttasks/launch_spec.go
// convert spec from api that reply for multi arch data only in spec.images
if spec.Images != nil && len(spec.Images) > 1 {
spec.SetImageId(fi.PtrTo(fi.ValueOf(spec.Images[0].ImageId)))
actual.OtherArchitectureImages = append(actual.OtherArchitectureImages, fi.ValueOf(spec.Images[1].ImageId))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: Do you want to loop over these other images, so we support more than just 2 in future?

upup/pkg/fi/cloudup/spotinsttasks/launch_spec.go
@@ -1139,3 +1174,26 @@ func (o *LaunchSpec) convertBlockDeviceMapping(in *awstasks.BlockDeviceMapping)

return out
}
func buildImages(cloud awsup.AWSCloud, ImageID *string, OtherArchitectureImages []string) ([]*aws.Images, error) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: s/ImageID/imageID and s/OtherArchitectureImages/otherArchitectureImages

@justinsb
Copy link
Member

Thanks @yehielnetapp - a few nits, but nothing blocking

/approve
/lgtm

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 23, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: justinsb

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot merged commit 7c17b16 into kubernetes:master Nov 23, 2023
@k8s-ci-robot k8s-ci-robot added this to the v1.29 milestone Nov 23, 2023
@yehielnetapp yehielnetapp deleted the feat/add_multi_arch_base127_rebase branch November 26, 2023 07:17
@BrewTestBot BrewTestBot mentioned this pull request May 16, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@justinsb justinsb justinsb approved these changes

@johngmyers johngmyers Awaiting requested review from johngmyers

@zetaab zetaab Awaiting requested review from zetaab

Assignees

@justinsb justinsb

@hakman hakman

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/documentation area/provider/aws Issues or PRs related to aws provider area/provider/spotinst Issues or PRs related to spotinst provider cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
v1.29
Development

Successfully merging this pull request may close these issues.
5 participants
@yehielnetapp @k8s-ci-robot @upodroid @hakman @justinsb