Merge pull request #35 from puppetlabs/DIO-2833-docker-1.4.0

(DIO-2833) Bump the gemfile too since this is used for building the i…
puppetlabs · Apr 7, 2022 · 2b935f1 · 2b935f1
2 parents c8dc62f + 8ae6bb0
commit 2b935f1
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 22 deletions.
diff --git a/docker/prod-all-providers/Gemfile b/docker/prod-all-providers/Gemfile
@@ -1,5 +1,5 @@
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
-gem 'vmpooler',                    '~> 2.2'
+gem 'vmpooler',                    '~> 2.3'
 gem 'vmpooler-provider-vsphere',   '~> 1.5'
 gem 'vmpooler-provider-gce',       '~> 0.1'
diff --git a/docker/prod-all-providers/Gemfile.lock b/docker/prod-all-providers/Gemfile.lock
@@ -5,11 +5,11 @@ GEM
       public_suffix (>= 2.0.2, < 5.0)
     bindata (2.4.10)
     builder (3.2.4)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     connection_pool (2.2.5)
     declarative (0.0.20)
     deep_merge (1.2.2)
-    faraday (1.9.3)
+    faraday (1.10.0)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -32,9 +32,9 @@ GEM
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     faraday-retry (1.0.3)
-    google-apis-compute_v1 (0.23.0)
+    google-apis-compute_v1 (0.31.0)
       google-apis-core (>= 0.4, < 2.a)
-    google-apis-core (0.4.1)
+    google-apis-core (0.4.2)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -43,7 +43,7 @@ GEM
       retriable (>= 2.0, < 4.a)
       rexml
       webrick
-    google-apis-dns_v1 (0.17.0)
+    google-apis-dns_v1 (0.19.0)
       google-apis-core (>= 0.4, < 2.a)
     google-cloud-core (1.6.0)
       google-cloud-env (~> 1.0)
@@ -53,8 +53,8 @@ GEM
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       zonefile (~> 1.04)
-    google-cloud-env (1.5.0)
-      faraday (>= 0.17.3, < 2.0)
+    google-cloud-env (1.6.0)
+      faraday (>= 0.17.3, < 3.0)
     google-cloud-errors (1.2.0)
     googleauth (0.16.2)
       faraday (>= 0.17.3, < 2.0)
@@ -89,6 +89,10 @@ GEM
     opentelemetry-instrumentation-concurrent_ruby (0.19.2)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.19.0)
+    opentelemetry-instrumentation-http_client (0.19.3)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-common (~> 0.19.3)
+      opentelemetry-instrumentation-base (~> 0.19.0)
     opentelemetry-instrumentation-redis (0.21.2)
       opentelemetry-api (~> 1.0)
       opentelemetry-common (~> 0.19.3)
@@ -112,51 +116,52 @@ GEM
     pickup (0.0.11)
     prometheus-client (2.1.0)
     public_suffix (4.0.6)
-    puma (5.5.2-java)
+    puma (5.6.4-java)
       nio4r (~> 2.0)
     racc (1.6.0-java)
     rack (2.2.3)
-    rack-protection (2.1.0)
+    rack-protection (2.2.0)
       rack
     rake (13.0.6)
     rbvmomi (3.0.0)
       builder (~> 3.2)
       json (~> 2.3)
       nokogiri (~> 1.10)
       optimist (~> 3.0)
-    redis (4.5.1)
+    redis (4.6.0)
     representable (3.1.1)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
     rexml (3.2.5)
     ruby2_keywords (0.0.5)
-    signet (0.16.0)
+    signet (0.16.1)
       addressable (~> 2.8)
-      faraday (>= 0.17.3, < 2.0)
+      faraday (>= 0.17.5, < 3.0)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
-    sinatra (2.1.0)
+    sinatra (2.2.0)
       mustermann (~> 1.0)
       rack (~> 2.2)
-      rack-protection (= 2.1.0)
+      rack-protection (= 2.2.0)
       tilt (~> 2.0)
-    spicy-proton (2.1.13)
+    spicy-proton (2.1.14)
       bindata (~> 2.3)
     statsd-ruby (1.5.0)
-    thrift (0.15.0)
+    thrift (0.16.0)
     tilt (2.0.10)
     trailblazer-option (0.1.2)
     uber (0.1.0)
-    vmpooler (2.2.0)
+    vmpooler (2.3.0)
       concurrent-ruby (~> 1.1)
       connection_pool (~> 2.2)
       deep_merge (~> 1.2)
       net-ldap (~> 0.16)
       nokogiri (~> 1.10)
       opentelemetry-exporter-jaeger (= 0.20.1)
       opentelemetry-instrumentation-concurrent_ruby (= 0.19.2)
+      opentelemetry-instrumentation-http_client (= 0.19.3)
       opentelemetry-instrumentation-redis (= 0.21.2)
       opentelemetry-instrumentation-sinatra (= 0.19.3)
       opentelemetry-resource_detectors (= 0.19.1)
@@ -183,9 +188,9 @@ PLATFORMS
   universal-java-1.8
 
 DEPENDENCIES
-  vmpooler (~> 2.2)
+  vmpooler (~> 2.3)
   vmpooler-provider-gce (~> 0.1)
   vmpooler-provider-vsphere (~> 1.5)
 
 BUNDLED WITH
-   2.3.4
+   2.3.11
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.11.0
-appVersion: 1.3.0-prod-all-providers
+version: 1.11.1
+appVersion: 1.4.0-prod-all-providers
 dependencies:
   - name: redis
     repository: https://charts.bitnami.com/bitnami