Merge pull request #43 from puppetlabs/DIO-3162-deploy

(DIO-3162) Add support for disk_type in gce
puppetlabs · Jun 21, 2022 · e077739 · e077739
2 parents d16f9b5 + edd183d
commit e077739
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 36 deletions.
diff --git a/docker/prod-all-providers/Gemfile b/docker/prod-all-providers/Gemfile
@@ -2,4 +2,4 @@ source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
 gem 'vmpooler',                    '~> 2.3'
 gem 'vmpooler-provider-vsphere',   '~> 1.5'
-gem 'vmpooler-provider-gce',       '~> 0.2'
+gem 'vmpooler-provider-gce',       '~> 0.3'
diff --git a/docker/prod-all-providers/Gemfile.lock b/docker/prod-all-providers/Gemfile.lock
@@ -25,16 +25,16 @@ GEM
     faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
     faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.3)
-      multipart-post (>= 1.2, < 3)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
     faraday-net_http (1.0.1)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     faraday-retry (1.0.3)
-    google-apis-compute_v1 (0.32.0)
-      google-apis-core (>= 0.4, < 2.a)
-    google-apis-core (0.4.2)
+    google-apis-compute_v1 (0.39.0)
+      google-apis-core (>= 0.6, < 2.a)
+    google-apis-core (0.6.0)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -43,8 +43,8 @@ GEM
       retriable (>= 2.0, < 4.a)
       rexml
       webrick
-    google-apis-dns_v1 (0.19.0)
-      google-apis-core (>= 0.4, < 2.a)
+    google-apis-dns_v1 (0.21.0)
+      google-apis-core (>= 0.5, < 2.a)
     google-cloud-core (1.6.0)
       google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)
@@ -56,27 +56,27 @@ GEM
     google-cloud-env (1.6.0)
       faraday (>= 0.17.3, < 3.0)
     google-cloud-errors (1.2.0)
-    googleauth (1.1.2)
+    googleauth (1.1.3)
       faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
     httpclient (2.8.3)
-    json (2.6.1-java)
-    jwt (2.3.0)
+    json (2.6.2-java)
+    jwt (2.4.1)
     memoist (0.16.2)
     mini_mime (1.1.2)
     multi_json (1.15.0)
-    multipart-post (2.1.1)
+    multipart-post (2.2.3)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
-    net-ldap (0.17.0)
+    net-ldap (0.17.1)
     nio4r (2.5.8-java)
     nokogiri (1.12.5-java)
       racc (~> 1.4)
-    opentelemetry-api (1.0.1)
+    opentelemetry-api (1.0.2)
     opentelemetry-common (0.19.3)
       opentelemetry-api (~> 1.0)
     opentelemetry-exporter-jaeger (0.20.1)
@@ -119,7 +119,7 @@ GEM
     puma (5.6.4-java)
       nio4r (~> 2.0)
     racc (1.6.0-java)
-    rack (2.2.3)
+    rack (2.2.3.1)
     rack-protection (2.2.0)
       rack
     rake (13.0.6)
@@ -129,7 +129,7 @@ GEM
       nokogiri (~> 1.10)
       optimist (~> 3.0)
     redis (4.6.0)
-    representable (3.1.1)
+    representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
@@ -175,7 +175,7 @@ GEM
       sinatra (~> 2.0)
       spicy-proton (~> 2.1)
       statsd-ruby (~> 1.4)
-    vmpooler-provider-gce (0.2.0)
+    vmpooler-provider-gce (0.3.0)
       google-apis-compute_v1 (~> 0.14)
       google-cloud-dns (~> 0.35.1)
       googleauth (>= 0.16.2, < 1.2.0)
@@ -189,8 +189,8 @@ PLATFORMS
 
 DEPENDENCIES
   vmpooler (~> 2.3)
-  vmpooler-provider-gce (~> 0.2)
+  vmpooler-provider-gce (~> 0.3)
   vmpooler-provider-vsphere (~> 1.5)
 
 BUNDLED WITH
-   2.3.11
+   2.3.16
diff --git a/docs/index.yaml b/docs/index.yaml
@@ -1,9 +1,24 @@
 apiVersion: v1
 entries:
   vmpooler:
+  - apiVersion: v2
+    appVersion: 1.6.0-prod-all-providers
+    created: "2022-06-21T09:34:10.994204-05:00"
+    dependencies:
+    - name: redis
+      repository: https://charts.bitnami.com/bitnami
+      version: 16.10.1
+    description: A Helm chart to deploy vmpooler
+    digest: 0ffa44d75a8bd5b733de7f95d18c20f34d7a80f75ce4ad95670be6725471bd32
+    icon: https://github.com/puppetlabs/vmpooler/raw/master/lib/vmpooler/public/img/logo.png
+    name: vmpooler
+    type: application
+    urls:
+    - https://puppetlabs.github.io/vmpooler-deployment/vmpooler-1.14.0.tgz
+    version: 1.14.0
   - apiVersion: v2
     appVersion: 1.5.0-prod-all-providers
-    created: "2022-06-06T17:18:54.124017643Z"
+    created: "2022-06-21T09:34:10.988782-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -18,7 +33,7 @@ entries:
     version: 1.13.0
   - apiVersion: v2
     appVersion: 1.5.0-prod-all-providers
-    created: "2022-06-06T17:18:54.117163396Z"
+    created: "2022-06-21T09:34:10.982767-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -33,7 +48,7 @@ entries:
     version: 1.12.0
   - apiVersion: v2
     appVersion: 1.4.0-prod-all-providers
-    created: "2022-06-06T17:18:54.112765666Z"
+    created: "2022-06-21T09:34:10.975765-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -48,7 +63,7 @@ entries:
     version: 1.11.1
   - apiVersion: v2
     appVersion: 1.3.0-prod-all-providers
-    created: "2022-06-06T17:18:54.107092528Z"
+    created: "2022-06-21T09:34:10.971488-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -63,7 +78,7 @@ entries:
     version: 1.11.0
   - apiVersion: v2
     appVersion: 1.2.0-prod-all-providers
-    created: "2022-06-06T17:18:54.100796285Z"
+    created: "2022-06-21T09:34:10.966822-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -78,7 +93,7 @@ entries:
     version: 1.10.1
   - apiVersion: v2
     appVersion: 1.2.0-prod-all-providers
-    created: "2022-06-06T17:18:54.095674451Z"
+    created: "2022-06-21T09:34:10.960126-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -93,7 +108,7 @@ entries:
     version: 1.10.0
   - apiVersion: v2
     appVersion: 1.2.0-prod-all-providers
-    created: "2022-06-06T17:18:54.157081966Z"
+    created: "2022-06-21T09:34:11.025219-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -108,7 +123,7 @@ entries:
     version: 1.9.0
   - apiVersion: v2
     appVersion: 1.2.0-prod-all-providers
-    created: "2022-06-06T17:18:54.153793944Z"
+    created: "2022-06-21T09:34:11.021768-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -123,7 +138,7 @@ entries:
     version: 1.8.0
   - apiVersion: v2
     appVersion: 1.0.0-prod-all-providers
-    created: "2022-06-06T17:18:54.148988211Z"
+    created: "2022-06-21T09:34:11.018298-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -138,7 +153,7 @@ entries:
     version: 1.7.1
   - apiVersion: v2
     appVersion: 1.0.0-prod-all-providers
-    created: "2022-06-06T17:18:54.145584388Z"
+    created: "2022-06-21T09:34:11.013709-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -153,7 +168,7 @@ entries:
     version: 1.7.0
   - apiVersion: v2
     appVersion: 1.3.0
-    created: "2022-06-06T17:18:54.142103665Z"
+    created: "2022-06-21T09:34:11.009666-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -168,7 +183,7 @@ entries:
     version: 1.6.3
   - apiVersion: v2
     appVersion: 1.3.0
-    created: "2022-06-06T17:18:54.137599334Z"
+    created: "2022-06-21T09:34:11.00618-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -183,7 +198,7 @@ entries:
     version: 1.6.2
   - apiVersion: v2
     appVersion: 1.3.0
-    created: "2022-06-06T17:18:54.133191405Z"
+    created: "2022-06-21T09:34:11.001745-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -198,7 +213,7 @@ entries:
     version: 1.6.1
   - apiVersion: v2
     appVersion: 1.3.0
-    created: "2022-06-06T17:18:54.128352972Z"
+    created: "2022-06-21T09:34:10.998149-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -211,4 +226,4 @@ entries:
     urls:
     - https://puppetlabs.github.io/vmpooler-deployment/vmpooler-1.6.0.tgz
     version: 1.6.0
-generated: "2022-06-06T17:18:54.08662519Z"
+generated: "2022-06-21T09:34:10.955364-05:00"
diff --git a/docs/vmpooler-1.14.0.tgz b/docs/vmpooler-1.14.0.tgz
diff --git a/helm-charts/vmpooler/Chart.yaml b/helm-charts/vmpooler/Chart.yaml
@@ -3,8 +3,8 @@ name: vmpooler
 description: A Helm chart to deploy vmpooler
 type: application
 icon: https://github.com/puppetlabs/vmpooler/raw/master/lib/vmpooler/public/img/logo.png
-version: 1.13.0
-appVersion: 1.5.0-prod-all-providers
+version: 1.14.0
+appVersion: 1.6.0-prod-all-providers
 dependencies:
   - name: redis
     repository: https://charts.bitnami.com/bitnami