knife-google 5.0.2 → 5.0.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/chef/knife/cloud/google_service.rb +14 -13
- data/lib/chef/knife/google_server_create.rb +2 -2
- data/lib/knife-google/version.rb +1 -1
- metadata +6 -6
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: f5d7f6fe6c7b73d74cd886d74afce562b1b5decd20217158ce5cfe2d07c01159
|
|
4
|
+
data.tar.gz: 7f16a26912877044dace963a17514d23ee53ea34fa8bdf56d4fca31b6deaf445
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 4171868bccefed161f8bca3603f09f1413a17f7df0241513f9584452f25474f1e84a49b6d885e8da0b390cf6de1b5ddfd39a40dfd485b436498b8ca3126ed17f
|
|
7
|
+
data.tar.gz: 0f8fe814751df5b97a93525ef028b557912ea00638ec91c3631cd15af5699e853085db13ae3218620e0dbf5e473395604c556e32a300d2706c1bae162bdb0c23
|
|
@@ -22,7 +22,7 @@ require "chef/knife/cloud/service"
|
|
|
22
22
|
require "chef/knife/cloud/helpers"
|
|
23
23
|
require_relative "google_service_helpers"
|
|
24
24
|
require "google/apis/compute_v1"
|
|
25
|
-
require "ipaddr"
|
|
25
|
+
require "ipaddr" unless defined?(IPAddr)
|
|
26
26
|
require_relative "../../../knife-google/version"
|
|
27
27
|
|
|
28
28
|
class Chef::Knife::Cloud
|
|
@@ -56,22 +56,17 @@ class Chef::Knife::Cloud
|
|
|
56
56
|
IMAGE_ALIAS_MAP = {
|
|
57
57
|
"centos-6" => { project: "centos-cloud", prefix: "centos-6" },
|
|
58
58
|
"centos-7" => { project: "centos-cloud", prefix: "centos-7" },
|
|
59
|
+
"centos-8" => { project: "centos-cloud", prefix: "centos-8" },
|
|
59
60
|
"container-vm" => { project: "google-containers", prefix: "container-vm" },
|
|
60
61
|
"coreos" => { project: "coreos-cloud", prefix: "coreos-stable" },
|
|
61
|
-
"debian-
|
|
62
|
-
"debian-
|
|
63
|
-
"debian-8" => { project: "debian-cloud", prefix: "debian-8-jessie" },
|
|
62
|
+
"debian-9" => { project: "debian-cloud", prefix: "debian-9" },
|
|
63
|
+
"debian-10" => { project: "debian-cloud", prefix: "debian-10" },
|
|
64
64
|
"opensuse-13" => { project: "opensuse-cloud", prefix: "opensuse-13" },
|
|
65
65
|
"rhel-6" => { project: "rhel-cloud", prefix: "rhel-6" },
|
|
66
66
|
"rhel-7" => { project: "rhel-cloud", prefix: "rhel-7" },
|
|
67
|
-
"
|
|
67
|
+
"rhel-8" => { project: "rhel-cloud", prefix: "rhel-8" },
|
|
68
68
|
"sles-12" => { project: "suse-cloud", prefix: "sles-12" },
|
|
69
|
-
"
|
|
70
|
-
"ubuntu-1204-lts" => { project: "ubuntu-os-cloud", prefix: "ubuntu-1204-precise" },
|
|
71
|
-
"ubuntu-14-04" => { project: "ubuntu-os-cloud", prefix: "ubuntu-1404-trusty" },
|
|
72
|
-
"ubuntu-1404-lts" => { project: "ubuntu-os-cloud", prefix: "ubuntu-1404-trusty" },
|
|
73
|
-
"ubuntu-15-04" => { project: "ubuntu-os-cloud", prefix: "ubuntu-1504-vivid" },
|
|
74
|
-
"ubuntu-15-10" => { project: "ubuntu-os-cloud", prefix: "ubuntu-1510-wily" },
|
|
69
|
+
"sles-15" => { project: "suse-cloud", prefix: "sles-15" },
|
|
75
70
|
"ubuntu-16-04" => { project: "ubuntu-os-cloud", prefix: "ubuntu-1604-xenial" },
|
|
76
71
|
"ubuntu-1604-lts" => { project: "ubuntu-os-cloud", prefix: "ubuntu-1604-xenial" },
|
|
77
72
|
"ubuntu-1804-lts" => { project: "ubuntu-os-cloud", prefix: "ubuntu-1804-bionic" },
|
|
@@ -80,6 +75,13 @@ class Chef::Knife::Cloud
|
|
|
80
75
|
"ubuntu-minimal-1804-lts" => { project: "ubuntu-os-cloud", prefix: "ubuntu-minimal-1804-bionic" },
|
|
81
76
|
"windows-2008-r2" => { project: "windows-cloud", prefix: "windows-server-2008-r2" },
|
|
82
77
|
"windows-2012-r2" => { project: "windows-cloud", prefix: "windows-server-2012-r2" },
|
|
78
|
+
"windows-2012-r2-core" => { project: "windows-cloud", prefix: "windows-server-2012-r2-dc-core" },
|
|
79
|
+
"windows-2016-core" => { project: "windows-cloud", prefix: "windows-server-2016-dc-core" },
|
|
80
|
+
"windows-2016" => { project: "windows-cloud", prefix: "windows-server-2016-dc" },
|
|
81
|
+
"windows-2019-core-for-containers" => { project: "windows-cloud", prefix: "windows-server-2019-dc-core-for-containers" },
|
|
82
|
+
"windows-2019-core" => { project: "windows-cloud", prefix: "windows-server-2019-dc-core" },
|
|
83
|
+
"windows-2019-for-containers" => { project: "windows-cloud", prefix: "windows-server-2019-dc-for-containers" },
|
|
84
|
+
"windows-2019" => { project: "windows-cloud", prefix: "windows-server-2019-dc" },
|
|
83
85
|
}.freeze
|
|
84
86
|
|
|
85
87
|
PUBLIC_PROJECTS = %w{
|
|
@@ -410,8 +412,7 @@ class Chef::Knife::Cloud
|
|
|
410
412
|
|
|
411
413
|
latest_image = connection.list_images(image_project).items
|
|
412
414
|
.select { |image| image.name.start_with?(image_prefix) }
|
|
413
|
-
.
|
|
414
|
-
.last
|
|
415
|
+
.max_by(&:name)
|
|
415
416
|
|
|
416
417
|
return if latest_image.nil?
|
|
417
418
|
|
|
@@ -199,7 +199,7 @@ class Chef::Knife::Cloud
|
|
|
199
199
|
|
|
200
200
|
def set_default_config
|
|
201
201
|
# dumb hack for knife-cloud, which expects the user to pass in the WinRM password to use when bootstrapping.
|
|
202
|
-
# We won't know the password until the instance is created and we
|
|
202
|
+
# We won't know the password until the instance is created and we forcibly reset it.
|
|
203
203
|
config[:connection_password] = "will_change_this_later"
|
|
204
204
|
end
|
|
205
205
|
|
|
@@ -225,7 +225,7 @@ class Chef::Knife::Cloud
|
|
|
225
225
|
def before_bootstrap
|
|
226
226
|
super
|
|
227
227
|
|
|
228
|
-
config[:chef_node_name] = config[:chef_node_name]
|
|
228
|
+
config[:chef_node_name] = config[:chef_node_name] || instance_name
|
|
229
229
|
config[:bootstrap_ip_address] = ip_address_for_bootstrap
|
|
230
230
|
|
|
231
231
|
if config[:image_os_type] == "windows"
|
data/lib/knife-google/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: knife-google
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 5.0.
|
|
4
|
+
version: 5.0.11
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Chiraq Jog
|
|
@@ -13,7 +13,7 @@ authors:
|
|
|
13
13
|
autorequire:
|
|
14
14
|
bindir: bin
|
|
15
15
|
cert_chain: []
|
|
16
|
-
date:
|
|
16
|
+
date: 2021-05-24 00:00:00.000000000 Z
|
|
17
17
|
dependencies:
|
|
18
18
|
- !ruby/object:Gem::Dependency
|
|
19
19
|
name: chef
|
|
@@ -52,7 +52,7 @@ dependencies:
|
|
|
52
52
|
version: 0.23.9
|
|
53
53
|
- - "<"
|
|
54
54
|
- !ruby/object:Gem::Version
|
|
55
|
-
version: 0.
|
|
55
|
+
version: 0.53.0
|
|
56
56
|
type: :runtime
|
|
57
57
|
prerelease: false
|
|
58
58
|
version_requirements: !ruby/object:Gem::Requirement
|
|
@@ -62,7 +62,7 @@ dependencies:
|
|
|
62
62
|
version: 0.23.9
|
|
63
63
|
- - "<"
|
|
64
64
|
- !ruby/object:Gem::Version
|
|
65
|
-
version: 0.
|
|
65
|
+
version: 0.53.0
|
|
66
66
|
- !ruby/object:Gem::Dependency
|
|
67
67
|
name: gcewinpass
|
|
68
68
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -114,14 +114,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
|
114
114
|
requirements:
|
|
115
115
|
- - ">="
|
|
116
116
|
- !ruby/object:Gem::Version
|
|
117
|
-
version: '2.
|
|
117
|
+
version: '2.7'
|
|
118
118
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
|
119
119
|
requirements:
|
|
120
120
|
- - ">="
|
|
121
121
|
- !ruby/object:Gem::Version
|
|
122
122
|
version: '0'
|
|
123
123
|
requirements: []
|
|
124
|
-
rubygems_version: 3.
|
|
124
|
+
rubygems_version: 3.1.4
|
|
125
125
|
signing_key:
|
|
126
126
|
specification_version: 4
|
|
127
127
|
summary: Google Compute Engine Support for Chef's Knife Command
|