(RE-15162) Update Redis gem to version 5.0.

docker/Gemfile

@@ -1,13 +1,13 @@
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
-gem 'vmpooler',                    '~> 2.5'
+# gem 'vmpooler',                    '~> 2.5'
 # Remove temporarily until a stable minor release is published
 # gem 'vmpooler-provider-ec2',       '~> 0.0.1'
 gem 'vmpooler-provider-gce',       '~> 0.5'
 gem 'vmpooler-provider-vsphere',   '~> 2.1'
 
 # For development install via a git branch use something like:
-# gem 'vmpooler', git: 'https://github.com/puppetlabs/vmpooler.git', branch: 'my-feature'
+gem 'vmpooler', git: 'https://github.com/puppetlabs/vmpooler.git', branch: 'update_redis'
 # gem 'vmpooler-provider-ec2', git: 'https://github.com/puppetlabs/vmpooler-provider-ec2.git', branch: 'my-feature'
 # gem 'vmpooler-provider-gce', git: 'https://github.com/puppetlabs/vmpooler-provider-gce.git', branch: 'my-feature'
 # gem 'vmpooler-provider-vsphere', git: 'https://github.com/puppetlabs/vmpooler-provider-vsphere.git', branch: 'my-feature'

docker/Gemfile.lock

@@ -1,19 +1,46 @@
+GIT
+  remote: https://github.com/puppetlabs/vmpooler.git
+  revision: 2d2d47e5ad1856f2c9e0f53b692167229bb32c89
+  branch: update_redis
+  specs:
+    vmpooler (2.5.0)
+      concurrent-ruby (~> 1.1)
+      connection_pool (~> 2.2)
+      deep_merge (~> 1.2)
+      net-ldap (~> 0.16)
+      opentelemetry-exporter-jaeger (= 0.20.1)
+      opentelemetry-instrumentation-concurrent_ruby (= 0.19.2)
+      opentelemetry-instrumentation-http_client (= 0.19.4)
+      opentelemetry-instrumentation-redis (= 0.21.3)
+      opentelemetry-instrumentation-sinatra (= 0.19.3)
+      opentelemetry-resource_detectors (= 0.19.1)
+      opentelemetry-sdk (~> 1.0, >= 1.0.2)
+      pickup (~> 0.0.11)
+      prometheus-client (~> 2.0)
+      puma (~> 5.0, >= 5.0.4)
+      rack (~> 2.2)
+      rake (~> 13.0)
+      redis (~> 5.0)
+      sinatra (~> 2.0)
+      spicy-proton (~> 2.1)
+      statsd-ruby (~> 1.4)
+
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.1)
+    addressable (2.8.4)
       public_suffix (>= 2.0.2, < 6.0)
     bindata (2.4.15)
     builder (3.2.4)
     concurrent-ruby (1.2.2)
-    connection_pool (2.3.0)
+    connection_pool (2.4.0)
     declarative (0.0.20)
     deep_merge (1.2.2)
     faraday (2.7.4)
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.2)
-    google-apis-compute_v1 (0.63.0)
+    google-apis-compute_v1 (0.65.0)
       google-apis-core (>= 0.11.0, < 2.a)
     google-apis-core (0.11.0)
       addressable (~> 2.5, >= 2.5.1)
@@ -52,9 +79,9 @@ GEM
     multi_json (1.15.0)
     mustermann (2.0.2)
       ruby2_keywords (~> 0.0.1)
-    net-ldap (0.17.1)
+    net-ldap (0.18.0)
-    nio4r (2.5.8-java)
+    nio4r (2.5.9-java)
-    nokogiri (1.14.2-java)
+    nokogiri (1.14.3-java)
       racc (~> 1.4)
     opentelemetry-api (1.1.0)
     opentelemetry-common (0.19.6)
@@ -101,7 +128,7 @@ GEM
     puma (5.6.5-java)
       nio4r (~> 2.0)
     racc (1.6.2-java)
-    rack (2.2.6.3)
+    rack (2.2.6.4)
     rack-protection (2.2.4)
       rack
     rake (13.0.6)
@@ -110,7 +137,10 @@ GEM
       json (~> 2.3)
       nokogiri (~> 1.12, >= 1.12.5)
       optimist (~> 3.0)
-    redis (4.8.1)
+    redis (5.0.6)
+      redis-client (>= 0.9.0)
+    redis-client (0.14.1)
+      connection_pool
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
@@ -135,27 +165,6 @@ GEM
     tilt (2.1.0)
     trailblazer-option (0.1.2)
     uber (0.1.0)
-    vmpooler (2.5.0)
-      concurrent-ruby (~> 1.1)
-      connection_pool (~> 2.2)
-      deep_merge (~> 1.2)
-      net-ldap (~> 0.16)
-      opentelemetry-exporter-jaeger (= 0.20.1)
-      opentelemetry-instrumentation-concurrent_ruby (= 0.19.2)
-      opentelemetry-instrumentation-http_client (= 0.19.4)
-      opentelemetry-instrumentation-redis (= 0.21.3)
-      opentelemetry-instrumentation-sinatra (= 0.19.3)
-      opentelemetry-resource_detectors (= 0.19.1)
-      opentelemetry-sdk (~> 1.0, >= 1.0.2)
-      pickup (~> 0.0.11)
-      prometheus-client (~> 2.0)
-      puma (~> 5.0, >= 5.0.4)
-      rack (~> 2.2)
-      rake (~> 13.0)
-      redis (~> 4.1)
-      sinatra (~> 2.0)
-      spicy-proton (~> 2.1)
-      statsd-ruby (~> 1.4)
     vmpooler-provider-gce (0.5.0)
       google-apis-compute_v1 (~> 0.14)
       google-cloud-dns (~> 0.35.1)
@@ -171,7 +180,7 @@ PLATFORMS
   universal-java-11
 
 DEPENDENCIES
-  vmpooler (~> 2.5)
+  vmpooler!
   vmpooler-provider-gce (~> 0.5)
   vmpooler-provider-vsphere (~> 2.1)
 

helm-charts/vmpooler/templates/deployment-manager.yaml

@@ -116,7 +116,7 @@ spec:
         - name: REDIS_CONNECTION_POOL_TIMEOUT
           value: "40"
         - name: REDIS_RECONNECT_ATTEMPTS
-          value: "40"
+          value: '[0, 0.1, 0.2, 0.4, 0.8, 1.6, 3.2, 6.4, 12.8, 25.6, 51.2, 102.4, 204.8]'
         - name: ONDEMAND_REQUEST_TTL
           value: '{{ .Values.ondemand_request_ttl }}'
         - name: ONDEMAND_CLONE_LIMIT