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

Don't break on chef 15 #1

Merged
merged 4 commits into from
Nov 3, 2022
Merged

Don't break on chef 15 #1

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a2bf003
add gp3 support
Jun 9, 2022
67cddf7
adjust ssh sleep delays
Jun 9, 2022
aabf2c9
Use latest Aws API
betesh-at-data-axle Oct 27, 2022
a309e42
Remove deprecated attributes
betesh-at-data-axle Oct 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 16 additions & 18 deletions lib/chef/knife/ec2_server_create.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,9 @@ class Ec2ServerCreate < Chef::Knife::Bootstrap

option :ebs_volume_type,
long: "--ebs-volume-type TYPE",
description: "Possible values are standard (magnetic) | io1 | gp2 | sc1 | st1. Default is gp2",
default: "gp2"
description: "Possible values are standard (magnetic) | io1 | gp2 | gp3 | sc1 | st1. Default is gp3",
proc: Proc.new { |key| Chef::Config[:knife][:ebs_volume_type] = key },
default: "gp3"

option :ebs_provisioned_iops,
long: "--provisioned-iops IOPS",
Expand Down Expand Up @@ -276,7 +277,7 @@ def plugin_create_instance!

if config[:spot_price]
server_def = spot_instances_attributes
spot_request = ec2_connection.request_spot_instances(server_def)
spot_request = ec2_connection.request_spot_instances(server_def).spot_instance_requests.first
msg_pair("Spot Request ID", spot_request.spot_instance_request_id)
msg_pair("Spot Request Type", spot_request.type)
msg_pair("Spot Price", spot_request.spot_price)
Expand Down Expand Up @@ -305,7 +306,7 @@ def plugin_create_instance!
@server = fetch_ec2_instance(spot_response.instance_id)
else
begin
response_obj = create_ec2_instance(server_attributes)
response_obj = create_ec2_instance(server_attributes.merge(max_count: 1, min_count: 1))
instance_id = response_obj.instances[0].instance_id
print "\n#{ui.color("Waiting for EC2 to create the instance\n", :magenta)}"

Expand Down Expand Up @@ -384,14 +385,14 @@ def plugin_create_instance!
if winrm?
print "\n#{ui.color("Waiting for winrm access to become available", :magenta)}"
print(".") until tcp_test_winrm(connection_host, connection_port) do
sleep 10
sleep 5
puts("done")
end
else
print "\n#{ui.color("Waiting for sshd access to become available", :magenta)}"
# If FreeSSHd, winsshd etc are available
print(".") until tcp_test_ssh(connection_host, connection_port) do
sleep @initial_sleep_delay ||= (vpc_mode? ? 40 : 10)
sleep @initial_sleep_delay ||= (vpc_mode? ? 10 : 5)
puts("done")
end
end
Expand Down Expand Up @@ -626,8 +627,8 @@ def plugin_validate_options!
exit 1
end

if config[:ebs_volume_type] && ! %w{gp2 io1 standard st1 sc1}.include?(config[:ebs_volume_type])
ui.error("--ebs-volume-type must be 'standard' or 'io1' or 'gp2' or 'st1' or 'sc1'")
if config[:ebs_volume_type] && ! %w{gp2 gp3 io1 standard st1 sc1}.include?(config[:ebs_volume_type])
ui.error("--ebs-volume-type must be 'standard' or 'io1' or 'gp2' or 'gp3' or 'st1' or 'sc1'")
msg opt_parser
exit 1
end
Expand Down Expand Up @@ -682,8 +683,9 @@ def plugin_validate_options!
# validation for ebs_size and ebs_volume_type and ebs_encrypted
if !config[:ebs_size]
errors << "--ebs-encrypted option requires valid --ebs-size to be specified."
elsif (config[:ebs_volume_type] == "gp2") && ! config[:ebs_size].to_i.between?(1, 16384)
errors << "--ebs-size should be in between 1-16384 for 'gp2' ebs volume type."

matthinea marked this conversation as resolved.
Show resolved Hide resolved
elsif (config[:ebs_volume_type] =~ /^gp/) && ! config[:ebs_size].to_i.between?(1, 16384)
errors << "--ebs-size should be in between 1-16384 for 'gp*' ebs volume type."
elsif (config[:ebs_volume_type] == "io1") && ! config[:ebs_size].to_i.between?(4, 16384)
errors << "--ebs-size should be in between 4-16384 for 'io1' ebs volume type."
elsif (config[:ebs_volume_type] == "standard") && ! config[:ebs_size].to_i.between?(1, 1024)
Expand Down Expand Up @@ -852,8 +854,6 @@ def server_attributes
image_id: config[:image],
instance_type: config[:flavor],
key_name: config[:ssh_key_name],
max_count: 1,
min_count: 1,
placement: {
availability_zone: config[:availability_zone],
},
Expand Down Expand Up @@ -971,8 +971,6 @@ def server_attributes
## cannot pass disable_api_termination option to the API when using spot instances ##
attributes[:disable_api_termination] = config[:disable_api_termination] if config[:spot_price].nil?

attributes[:instance_initiated_shutdown_behavior] = config[:instance_initiated_shutdown_behavior]

if config[:cpu_credits]
attributes[:credit_specification] =
{
Expand Down Expand Up @@ -1054,9 +1052,9 @@ def wait_for_tunnelled_sshd(ssh_gateway, hostname)
print(".") until tunnel_test_ssh(ssh_gateway, hostname) do
if initial
initial = false
sleep (vpc_mode? ? 40 : 10)
sleep (vpc_mode? ? 10 : 5)
else
sleep 10
sleep 5
end
puts("done")
end
Expand Down Expand Up @@ -1108,9 +1106,9 @@ def wait_for_direct_sshd(hostname, ssh_port)
print(".") until tcp_test_ssh(hostname, ssh_port) do
if initial
initial = false
sleep (vpc_mode? ? 40 : 10)
sleep (vpc_mode? ? 10 : 5)
else
sleep 10
sleep 5
end
puts("done")
end
Expand Down