diff --git a/docker/Gemfile b/docker/Gemfile index cd67ec9..5f34f92 100644 --- a/docker/Gemfile +++ b/docker/Gemfile @@ -1,6 +1,6 @@ source ENV['GEM_SOURCE'] || 'https://rubygems.org' -gem 'vmpooler', '~> 3.0' +gem 'vmpooler', git: 'https://github.com/puppetlabs/vmpooler.git', branch: 'P4DEVOPS-9434' gem 'vmpooler-dns-gcp', '~> 1.0' # Remove temporarily until a stable minor release is published # gem 'vmpooler-provider-ec2', '~> 0.0.1' diff --git a/docker/Gemfile.lock b/docker/Gemfile.lock index c6eb3c4..d91d1ec 100644 --- a/docker/Gemfile.lock +++ b/docker/Gemfile.lock @@ -1,21 +1,49 @@ +GIT + remote: https://github.com/puppetlabs/vmpooler.git + revision: d0020becb3a08417d7e58f118987e22eea9bb42c + branch: P4DEVOPS-9434 + specs: + vmpooler (3.7.0) + concurrent-ruby (~> 1.1) + connection_pool (~> 2.4) + deep_merge (~> 1.2) + net-ldap (~> 0.16) + opentelemetry-exporter-jaeger (= 0.23.0) + opentelemetry-instrumentation-concurrent_ruby (= 0.21.1) + opentelemetry-instrumentation-http_client (= 0.22.2) + opentelemetry-instrumentation-rack (= 0.23.4) + opentelemetry-instrumentation-redis (= 0.25.3) + opentelemetry-instrumentation-sinatra (= 0.23.2) + opentelemetry-resource_detectors (= 0.24.2) + opentelemetry-sdk (~> 1.8) + pickup (~> 0.0.11) + prometheus-client (>= 2, < 5) + puma (>= 5.0.4, < 7) + rack (>= 2.2, < 4.0) + rake (~> 13.0) + redis (~> 5.0) + sinatra (>= 2, < 4) + spicy-proton (~> 2.1) + statsd-ruby (~> 1.4) + GEM remote: https://rubygems.org/ specs: - addressable (2.8.7) - public_suffix (>= 2.0.2, < 7.0) + addressable (2.8.8) + public_suffix (>= 2.0.2, < 8.0) base64 (0.3.0) bindata (2.5.1) builder (3.3.0) - concurrent-ruby (1.3.5) - connection_pool (2.5.3) + concurrent-ruby (1.3.6) + connection_pool (2.5.5) declarative (0.0.20) deep_merge (1.2.2) - faraday (2.13.1) + faraday (2.14.0) faraday-net_http (>= 2.0, < 3.5) json logger - faraday-net_http (3.4.0) - net-http (>= 0.5.0) + faraday-net_http (3.4.2) + net-http (~> 0.5) google-apis-compute_v1 (0.86.0) google-apis-core (>= 0.11.0, < 2.a) google-apis-core (0.11.3) @@ -49,23 +77,25 @@ GEM signet (>= 0.16, < 2.a) httpclient (2.9.0) mutex_m - json (2.12.2-java) - jwt (2.10.1) + json (2.18.0-java) + jwt (2.10.2) base64 logger (1.7.0) memoist (0.16.2) mini_mime (1.1.5) - multi_json (1.15.0) - mustermann (3.0.3) + multi_json (1.18.0) + mustermann (3.0.4) ruby2_keywords (~> 0.0.1) mutex_m (0.3.0) - net-http (0.6.0) - uri - net-ldap (0.19.0) - nio4r (2.7.4-java) - nokogiri (1.18.8-java) + net-http (0.9.1) + uri (>= 0.11.1) + net-ldap (0.20.0) + base64 + ostruct + nio4r (2.7.5-java) + nokogiri (1.18.10-java) racc (~> 1.4) - opentelemetry-api (1.5.0) + opentelemetry-api (1.7.0) opentelemetry-common (0.20.1) opentelemetry-api (~> 1.0) opentelemetry-exporter-jaeger (0.23.0) @@ -102,47 +132,48 @@ GEM opentelemetry-resource_detectors (0.24.2) google-cloud-env opentelemetry-sdk (~> 1.0) - opentelemetry-sdk (1.8.0) + opentelemetry-sdk (1.10.0) opentelemetry-api (~> 1.1) opentelemetry-common (~> 0.20) opentelemetry-registry (~> 0.2) opentelemetry-semantic_conventions - opentelemetry-semantic_conventions (1.11.0) + opentelemetry-semantic_conventions (1.36.0) opentelemetry-api (~> 1.0) optimist (3.2.1) os (1.1.4) + ostruct (0.6.3) pickup (0.0.11) - prometheus-client (4.2.4) + prometheus-client (4.2.5) base64 public_suffix (6.0.2) - puma (6.6.0-java) + puma (6.6.1-java) nio4r (~> 2.0) racc (1.8.1-java) - rack (2.2.17) + rack (2.2.21) rack-protection (3.2.0) base64 (>= 0.1.0) rack (~> 2.2, >= 2.2.4) - rake (13.3.0) + rake (13.3.1) rbvmomi2 (3.8.0) builder (~> 3.2) json (~> 2.3) nokogiri (~> 1.12, >= 1.12.5) optimist (~> 3.0) - redis (5.4.0) + redis (5.4.1) redis-client (>= 0.22.0) - redis-client (0.24.0) + redis-client (0.26.2) connection_pool representable (3.2.0) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) retriable (3.1.2) - rexml (3.4.1) + rexml (3.4.4) ruby2_keywords (0.0.5) - signet (0.20.0) + signet (0.21.0) addressable (~> 2.8) faraday (>= 0.17.5, < 3.a) - jwt (>= 1.5, < 3.0) + jwt (>= 1.5, < 4.0) multi_json (~> 1.10) sinatra (3.2.0) mustermann (~> 3.0) @@ -153,32 +184,10 @@ GEM bindata (~> 2.3) statsd-ruby (1.5.0) thrift (0.22.0) - tilt (2.6.0) + tilt (2.6.1) trailblazer-option (0.1.2) uber (0.1.0) - uri (1.0.3) - vmpooler (3.7.0) - concurrent-ruby (~> 1.1) - connection_pool (~> 2.4) - deep_merge (~> 1.2) - net-ldap (~> 0.16) - opentelemetry-exporter-jaeger (= 0.23.0) - opentelemetry-instrumentation-concurrent_ruby (= 0.21.1) - opentelemetry-instrumentation-http_client (= 0.22.2) - opentelemetry-instrumentation-rack (= 0.23.4) - opentelemetry-instrumentation-redis (= 0.25.3) - opentelemetry-instrumentation-sinatra (= 0.23.2) - opentelemetry-resource_detectors (= 0.24.2) - opentelemetry-sdk (~> 1.8) - pickup (~> 0.0.11) - prometheus-client (>= 2, < 5) - puma (>= 5.0.4, < 7) - rack (>= 2.2, < 4.0) - rake (~> 13.0) - redis (~> 5.0) - sinatra (>= 2, < 4) - spicy-proton (~> 2.1) - statsd-ruby (~> 1.4) + uri (1.1.1) vmpooler-dns-gcp (1.2.0) google-cloud-dns (~> 0.35.1) googleauth (>= 0.16.2, < 1.3.0) @@ -196,7 +205,7 @@ PLATFORMS universal-java-11 DEPENDENCIES - vmpooler (~> 3.0) + vmpooler! vmpooler-dns-gcp (~> 1.0) vmpooler-provider-gce (~> 1.0) vmpooler-provider-vsphere (~> 3.0) diff --git a/docs/index.yaml b/docs/index.yaml index a00122b..5b3dde6 100644 --- a/docs/index.yaml +++ b/docs/index.yaml @@ -2,38 +2,38 @@ apiVersion: v1 entries: vmpooler: - apiVersion: v2 - appVersion: 5.7.0 - created: "2025-08-01T14:47:26.530766161Z" + appVersion: pr170-430b5d956b5338db0d86f33294509c2a6c5575ab + created: "2025-12-24T12:33:40.981853315Z" dependencies: - name: redis repository: https://artifactory.delivery.puppetlabs.net/artifactory/helm__local version: 16.13.2 description: A Helm chart to deploy vmpooler - digest: ac8ac8d284483f9fedd6dcd43c977620121ff63e12f410297f667e2bba44c4aa + digest: 108dcee171d37468eadf2ca55dcaf9bc6300402b87de8debb7730434a1131245 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-3.9.1.tgz - version: 3.9.1 + - https://puppetlabs.github.io/vmpooler-deployment/vmpooler-3.9.3-rc.23.tgz + version: 3.9.3-rc.23 - apiVersion: v2 appVersion: 5.7.0 - created: "2025-08-01T14:47:26.522784925Z" + created: "2025-12-24T12:33:40.977964684Z" dependencies: - name: redis repository: https://artifactory.delivery.puppetlabs.net/artifactory/helm__local version: 16.13.2 description: A Helm chart to deploy vmpooler - digest: 0c46e7c9566275f85c9a2525ce2f5e62cd377ddd7f273475bb7f4472a1fc8b29 + digest: ac8ac8d284483f9fedd6dcd43c977620121ff63e12f410297f667e2bba44c4aa 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-3.9.1-rc.1.tgz - version: 3.9.1-rc.1 + - https://puppetlabs.github.io/vmpooler-deployment/vmpooler-3.9.1.tgz + version: 3.9.1 - apiVersion: v2 appVersion: 5.7.0 - created: "2025-08-01T14:47:26.511435751Z" + created: "2025-12-24T12:33:40.974295801Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -48,7 +48,7 @@ entries: version: 3.9.0 - apiVersion: v2 appVersion: 5.6.0 - created: "2025-08-01T14:47:26.499359292Z" + created: "2025-12-24T12:33:40.971086664Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -63,7 +63,7 @@ entries: version: 3.8.3 - apiVersion: v2 appVersion: 5.6.0 - created: "2025-08-01T14:47:26.488598934Z" + created: "2025-12-24T12:33:40.967170491Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -78,7 +78,7 @@ entries: version: 3.8.2 - apiVersion: v2 appVersion: 5.6.0 - created: "2025-08-01T14:47:26.476360664Z" + created: "2025-12-24T12:33:40.963552066Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -93,7 +93,7 @@ entries: version: 3.8.1 - apiVersion: v2 appVersion: 5.6.0 - created: "2025-08-01T14:47:26.465872839Z" + created: "2025-12-24T12:33:40.960084472Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -108,7 +108,7 @@ entries: version: 3.8.0 - apiVersion: v2 appVersion: 5.6.0 - created: "2025-08-01T14:47:26.454823621Z" + created: "2025-12-24T12:33:40.95579872Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -123,7 +123,7 @@ entries: version: 3.7.0 - apiVersion: v2 appVersion: 5.5.3 - created: "2025-08-01T14:47:26.444772227Z" + created: "2025-12-24T12:33:40.952183003Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -138,7 +138,7 @@ entries: version: 3.6.0 - apiVersion: v2 appVersion: 5.5.3 - created: "2025-08-01T14:47:26.433931552Z" + created: "2025-12-24T12:33:40.948603327Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -153,7 +153,7 @@ entries: version: 3.5.3 - apiVersion: v2 appVersion: 5.5.2 - created: "2025-08-01T14:47:26.424035301Z" + created: "2025-12-24T12:33:40.94499611Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -168,7 +168,7 @@ entries: version: 3.5.2 - apiVersion: v2 appVersion: 5.5.1 - created: "2025-08-01T14:47:26.411819215Z" + created: "2025-12-24T12:33:40.941169978Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -183,7 +183,7 @@ entries: version: 3.5.1 - apiVersion: v2 appVersion: 5.5.0 - created: "2025-08-01T14:47:26.401583826Z" + created: "2025-12-24T12:33:40.937644885Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -198,7 +198,7 @@ entries: version: 3.5.0 - apiVersion: v2 appVersion: 5.4.1 - created: "2025-08-01T14:47:26.390414322Z" + created: "2025-12-24T12:33:40.933638297Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -213,7 +213,7 @@ entries: version: 3.4.1 - apiVersion: v2 appVersion: 5.4.0 - created: "2025-08-01T14:47:26.379928244Z" + created: "2025-12-24T12:33:40.929987538Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -228,7 +228,7 @@ entries: version: 3.4.0 - apiVersion: v2 appVersion: 5.3.0 - created: "2025-08-01T14:47:26.368518543Z" + created: "2025-12-24T12:33:40.926179657Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -243,7 +243,7 @@ entries: version: 3.3.0 - apiVersion: v2 appVersion: 5.2.0 - created: "2025-08-01T14:47:26.358252054Z" + created: "2025-12-24T12:33:40.921928112Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -258,7 +258,7 @@ entries: version: 3.2.0 - apiVersion: v2 appVersion: 5.1.0 - created: "2025-08-01T14:47:26.346223906Z" + created: "2025-12-24T12:33:40.918488935Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -273,7 +273,7 @@ entries: version: 3.1.0 - apiVersion: v2 appVersion: 5.0.0 - created: "2025-08-01T14:47:26.336021044Z" + created: "2025-12-24T12:33:40.914659303Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -288,7 +288,7 @@ entries: version: 3.0.0 - apiVersion: v2 appVersion: 4.1.0 - created: "2025-08-01T14:47:26.324819648Z" + created: "2025-12-24T12:33:40.911297126Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -303,7 +303,7 @@ entries: version: 2.2.0 - apiVersion: v2 appVersion: 4.0.0 - created: "2025-08-01T14:47:26.314076098Z" + created: "2025-12-24T12:33:40.907129455Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -318,7 +318,7 @@ entries: version: 2.1.0 - apiVersion: v2 appVersion: 4.0.0 - created: "2025-08-01T14:47:26.3025029Z" + created: "2025-12-24T12:33:40.903327157Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -333,7 +333,7 @@ entries: version: 2.0.0 - apiVersion: v2 appVersion: 1.7.0-prod-all-providers - created: "2025-08-01T14:47:26.217686479Z" + created: "2025-12-24T12:33:40.881045318Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -348,7 +348,7 @@ entries: version: 1.19.0 - apiVersion: v2 appVersion: 1.7.0-prod-all-providers - created: "2025-08-01T14:47:26.20615313Z" + created: "2025-12-24T12:33:40.87376801Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -363,7 +363,7 @@ entries: version: 1.18.0 - apiVersion: v2 appVersion: 1.7.0-prod-all-providers - created: "2025-08-01T14:47:26.192913076Z" + created: "2025-12-24T12:33:40.869307217Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -378,7 +378,7 @@ entries: version: 1.17.0 - apiVersion: v2 appVersion: 1.6.0-prod-all-providers - created: "2025-08-01T14:47:26.180016696Z" + created: "2025-12-24T12:33:40.865429336Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -393,7 +393,7 @@ entries: version: 1.16.0 - apiVersion: v2 appVersion: 1.6.0-prod-all-providers - created: "2025-08-01T14:47:26.163482559Z" + created: "2025-12-24T12:33:40.861573079Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -408,7 +408,7 @@ entries: version: 1.15.0 - apiVersion: v2 appVersion: 1.6.0-prod-all-providers - created: "2025-08-01T14:47:26.148027262Z" + created: "2025-12-24T12:33:40.857812363Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -423,7 +423,7 @@ entries: version: 1.14.0 - apiVersion: v2 appVersion: 1.5.0-prod-all-providers - created: "2025-08-01T14:47:26.129088412Z" + created: "2025-12-24T12:33:40.854035481Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -438,7 +438,7 @@ entries: version: 1.13.0 - apiVersion: v2 appVersion: 1.5.0-prod-all-providers - created: "2025-08-01T14:47:26.115192635Z" + created: "2025-12-24T12:33:40.850357223Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -453,7 +453,7 @@ entries: version: 1.12.0 - apiVersion: v2 appVersion: 1.4.0-prod-all-providers - created: "2025-08-01T14:47:26.104012949Z" + created: "2025-12-24T12:33:40.846837214Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -468,7 +468,7 @@ entries: version: 1.11.1 - apiVersion: v2 appVersion: 1.3.0-prod-all-providers - created: "2025-08-01T14:47:26.094249573Z" + created: "2025-12-24T12:33:40.844057989Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -483,7 +483,7 @@ entries: version: 1.11.0 - apiVersion: v2 appVersion: 1.2.0-prod-all-providers - created: "2025-08-01T14:47:26.08366946Z" + created: "2025-12-24T12:33:40.840576812Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -498,7 +498,7 @@ entries: version: 1.10.1 - apiVersion: v2 appVersion: 1.2.0-prod-all-providers - created: "2025-08-01T14:47:26.073735253Z" + created: "2025-12-24T12:33:40.837820337Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -513,7 +513,7 @@ entries: version: 1.10.0 - apiVersion: v2 appVersion: 1.2.0-prod-all-providers - created: "2025-08-01T14:47:26.292230858Z" + created: "2025-12-24T12:33:40.899849313Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -528,7 +528,7 @@ entries: version: 1.9.0 - apiVersion: v2 appVersion: 1.2.0-prod-all-providers - created: "2025-08-01T14:47:26.282594053Z" + created: "2025-12-24T12:33:40.897269712Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -543,7 +543,7 @@ entries: version: 1.8.0 - apiVersion: v2 appVersion: 1.0.0-prod-all-providers - created: "2025-08-01T14:47:26.274204699Z" + created: "2025-12-24T12:33:40.895095732Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -558,7 +558,7 @@ entries: version: 1.7.1 - apiVersion: v2 appVersion: 1.0.0-prod-all-providers - created: "2025-08-01T14:47:26.265409971Z" + created: "2025-12-24T12:33:40.892546255Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -573,7 +573,7 @@ entries: version: 1.7.0 - apiVersion: v2 appVersion: 1.3.0 - created: "2025-08-01T14:47:26.256953201Z" + created: "2025-12-24T12:33:40.890456524Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -588,7 +588,7 @@ entries: version: 1.6.3 - apiVersion: v2 appVersion: 1.3.0 - created: "2025-08-01T14:47:26.246802746Z" + created: "2025-12-24T12:33:40.888249752Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -603,7 +603,7 @@ entries: version: 1.6.2 - apiVersion: v2 appVersion: 1.3.0 - created: "2025-08-01T14:47:26.238207026Z" + created: "2025-12-24T12:33:40.885537986Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -618,7 +618,7 @@ entries: version: 1.6.1 - apiVersion: v2 appVersion: 1.3.0 - created: "2025-08-01T14:47:26.228886776Z" + created: "2025-12-24T12:33:40.883390588Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -631,4 +631,4 @@ entries: urls: - https://puppetlabs.github.io/vmpooler-deployment/vmpooler-1.6.0.tgz version: 1.6.0 -generated: "2025-08-01T14:47:26.062605037Z" +generated: "2025-12-24T12:33:40.833367378Z" diff --git a/docs/vmpooler-3.9.3-rc.23.tgz b/docs/vmpooler-3.9.3-rc.23.tgz new file mode 100644 index 0000000..2ece076 Binary files /dev/null and b/docs/vmpooler-3.9.3-rc.23.tgz differ diff --git a/helm-charts/vmpooler/Chart.yaml b/helm-charts/vmpooler/Chart.yaml index 0a57624..9032b9c 100644 --- 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: 3.9.1 -appVersion: 5.7.0 +version: 3.9.3-rc.23 +appVersion: pr170-430b5d956b5338db0d86f33294509c2a6c5575ab dependencies: - name: redis repository: https://artifactory.delivery.puppetlabs.net/artifactory/helm__local