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

Add size and type support for aws volumes #1079

Merged
merged 2 commits into from
Jan 17, 2019
Merged

Add size and type support for aws volumes #1079

merged 2 commits into from
Jan 17, 2019

Conversation

enxebre
Copy link
Member

@enxebre enxebre commented Jan 16, 2019

Since we added support on the aws actuator API openshift/cluster-api-provider-aws#132 we want to allow this to be configurable for the users through the upper level installer API config

@openshift-ci-robot openshift-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jan 16, 2019
@enxebre
Copy link
Member Author

enxebre commented Jan 16, 2019

cc @smarterclayton @derekwaynecarr @wking

@enxebre
Copy link
Member Author

enxebre commented Jan 16, 2019

@wking addressed comments, let me know if there's anything else you want me to change, thanks!

@wking
Copy link
Member

wking commented Jan 16, 2019

Can you set:

mpool.EC2RootVolume = awstypes.EC2RootVolume{
  Type: "gp2",
  Size: 120,
}

over here? Won't matter much until #792, but it will consolidate this change and set the stage for me rebasing on top of this.

@enxebre
Copy link
Member Author

enxebre commented Jan 16, 2019

/test e2e-aws

@spangenberg
Copy link
Contributor

/retest

@enxebre
Copy link
Member Author

enxebre commented Jan 16, 2019

/test e2e-aws

1 similar comment
@enxebre
Copy link
Member Author

enxebre commented Jan 16, 2019

/test e2e-aws

abhinavdahiya
abhinavdahiya reviewed Jan 16, 2019
View reviewed changes
pkg/asset/machines/aws/machines.go Outdated
BlockDevices: []awsprovider.BlockDeviceMappingSpec{
{
EBS: &awsprovider.EBSBlockDeviceSpec{
VolumeType: &volumeType,
Copy link
Contributor

Choose a reason for hiding this comment

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

you can use k8s.io/utils/pointer

Copy link
Member Author

Choose a reason for hiding this comment

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

sweet, thanks!

abhinavdahiya
abhinavdahiya reviewed Jan 16, 2019
View reviewed changes
pkg/asset/machines/worker.go Outdated
@@ -94,6 +94,11 @@ func (w *Worker) Generate(dependencies asset.Parents) error {
switch ic.Platform.Name() {
case awstypes.Name:
mpool := defaultAWSMachinePoolPlatform()
// worker pool default volume settings
mpool.EC2RootVolume = awstypes.EC2RootVolume{
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: can we move this to defaultAWSMachinePoolPlatform and only override the Size in master.

Copy link
Member Author

Choose a reason for hiding this comment

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

done, thanks!

@enxebre enxebre force-pushed the volumes branch 2 times, most recently from 9ba64ee to 10eb32d Compare January 16, 2019 17:43
@wking wking mentioned this pull request Jan 16, 2019
Merged
@abhinavdahiya abhinavdahiya changed the title Volumes Add size and type support for aws volumes Jan 16, 2019
@abhinavdahiya
Copy link
Contributor

/approve

/hold

/cc @crawford @derekwaynecarr for approval

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 16, 2019
@openshift-ci-robot
Copy link
Contributor

@abhinavdahiya: GitHub didn't allow me to request PR reviews from the following users: for, approval.

Note that only openshift members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to this:

/approve

/hold

/cc @crawford @derekwaynecarr for approval

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.

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 16, 2019
@abhinavdahiya
Copy link
Contributor

/approve

/hold

/cc @crawford @derekwaynecarr for approval

we have approval for this.

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 16, 2019
@wking
Copy link
Member

wking commented Jan 17, 2019

Needs rebasing around #1069.

@enxebre
Add size and type support for aws volumes
cbad1a4 
Since we added support on the aws actuator API openshift/cluster-api-provider-aws#132 we want to allow this to be configurable for the users through the upper level installer API config
@enxebre
Copy link
Member Author

enxebre commented Jan 17, 2019

rebased, thanks

@wking
Copy link
Member

wking commented Jan 17, 2019

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 17, 2019
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: abhinavdahiya, enxebre, wking

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:
  • OWNERS [abhinavdahiya,wking]

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

@openshift-merge-robot openshift-merge-robot merged commit a004583 into openshift:master Jan 17, 2019
@dgoodwin
Copy link
Contributor

Card filed to support in Hive API: https://jira.coreos.com/browse/CO-190

wking added a commit to wking/openshift-installer that referenced this pull request Jan 25, 2019
@wking
data/data/aws/variables-aws: Drop aws_master_ec2_type and similar def…
ab9fb3f 
…aults

Since 9a9cd6d (origin/pr/1076) pkg/tfvars: Respect install-config AWS
machine pools, 2019-01-15, openshift#1076) and cbad1a4 (Add size and type
support for aws volumes, 2019-01-16, openshift#1079), we should always be
providing these in the Terraform variables generated by the asset
graph.
@wking wking mentioned this pull request Jan 25, 2019
Merged
wking added a commit to wking/openshift-installer that referenced this pull request Jan 25, 2019
@wking
data/data/aws/variables-aws: Drop aws_master_ec2_type and similar def…
580a34b 
…aults

Since 9a9cd6d (pkg/tfvars: Respect install-config AWS machine pools,
2019-01-15, openshift#1076) and cbad1a4 (Add size and type support for aws
volumes, 2019-01-16, openshift#1079), we should always be providing these in
the Terraform variables generated by the asset graph.
wking added a commit to wking/openshift-installer that referenced this pull request Jan 25, 2019
@wking
data/data/aws/variables-aws: Drop aws_master_ec2_type and similar def…
4dfa11f 
…aults

Since 9a9cd6d (pkg/tfvars: Respect install-config AWS machine pools,
2019-01-15, openshift#1076) and cbad1a4 (Add size and type support for aws
volumes, 2019-01-16, openshift#1079), we should always be providing these in
the Terraform variables generated by the asset graph.
@wking wking mentioned this pull request Feb 1, 2019
Merged
wking added a commit to wking/openshift-installer that referenced this pull request Feb 7, 2019
@wking
data/data/aws/variables-aws: Drop aws_master_ec2_type and similar def…
90e56bf 
…aults

Since 9a9cd6d (pkg/tfvars: Respect install-config AWS machine pools,
2019-01-15, openshift#1076) and cbad1a4 (Add size and type support for aws
volumes, 2019-01-16, openshift#1079), we should always be providing these in
the Terraform variables generated by the asset graph.

There's still a default for the bootstrap machine, but we plan on
removing that from Terraform shortly.
wking added a commit to wking/openshift-installer that referenced this pull request Feb 7, 2019
@wking
data/aws/variables-aws: Drop aws_master_ec2_type and similar defaults
55a88f3 
Since 9a9cd6d (pkg/tfvars: Respect install-config AWS machine pools,
2019-01-15, openshift#1076) and cbad1a4 (Add size and type support for aws
volumes, 2019-01-16, openshift#1079), we should always be providing these in
the Terraform variables generated by the asset graph.

There's still a default for the bootstrap machine, but we plan on
removing that from Terraform shortly.

Dropping omitempty for the master IOPS allows the zero value (if IOPS
is nil or zero in the machine config) to generate a non-empty
Terraform value, avoiding:

  Error: Required variable not set: aws_master_root_volume_iops"

I've left omitempty on the other AWS properties, because in most cases
their zero values will not produce a functional cluster and we want to
fail fast.  In the user-tags case, we have a sane (empty set) default,
so omitting the nil map is fine.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wking wking wking left review comments

@abhinavdahiya abhinavdahiya abhinavdahiya left review comments

@smarterclayton smarterclayton Awaiting requested review from smarterclayton

@tomassedovic tomassedovic Awaiting requested review from tomassedovic

@crawford crawford Awaiting requested review from crawford

@derekwaynecarr derekwaynecarr Awaiting requested review from derekwaynecarr

Assignees

@wking wking

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@enxebre @wking @spangenberg @abhinavdahiya @openshift-ci-robot @dgoodwin @openshift-merge-robot