Merge pull request #172 from puppetlabs/update-vmpooler-3.8.1

Update vmpooler to 3.8.1

.github/workflows/release.yml

@@ -16,6 +16,11 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: Activate twingate to access artifactory
+        uses: twingate/github-action@main
+        with:
+          service-key: ${{ secrets.TWINGATE_PUBLIC_REPO_KEY }}
+
       - name: Get New Chart Version
         id: nv
         run: |

.github/workflows/test.yml

@@ -15,6 +15,11 @@ jobs:
           clean: true
           fetch-depth: 0
 
+      - name: Activate twingate to access artifactory
+        uses: twingate/github-action@main
+        with:
+          service-key: ${{ secrets.TWINGATE_PUBLIC_REPO_KEY }}
+
       - uses: azure/setup-helm@v3
 
       - uses: actions/setup-python@v4
@@ -25,4 +30,4 @@ jobs:
         uses: helm/chart-testing-action@v2
 
       - name: Run chart-testing (lint)
-        run: ct lint --chart-dirs helm-charts --all --validate-maintainers=false --chart-repos bitnami=https://charts.bitnami.com/bitnami
+        run: ct lint --chart-dirs helm-charts --all --validate-maintainers=false --chart-repos artifactory=https://artifactory.delivery.puppetlabs.net/artifactory/helm__local

.gitignore

@@ -4,5 +4,3 @@
 .vagrant/
 .idea/
 helm-charts/vmpooler/charts/
-/docker/data/redis/**
-!docker/data/**/.gitkeep

CHANGELOG.md

@@ -1,5 +1,60 @@
 # Changelog
 
+## [3.9.1](https://github.com/puppetlabs/vmpooler-deployment/tree/3.9.1) (2025-08-01)
+
+[Full Changelog](https://github.com/puppetlabs/vmpooler-deployment/compare/3.9.0...3.9.1)
+
+**Merged pull requests:**
+
+- \(P4DEVOPS-7373\) Use artifactory instead of bitnami repos [\#166](https://github.com/puppetlabs/vmpooler-deployment/pull/166) ([isaac-hammes](https://github.com/isaac-hammes))
+
+## [3.9.0](https://github.com/puppetlabs/vmpooler-deployment/tree/3.9.0) (2025-06-05)
+
+[Full Changelog](https://github.com/puppetlabs/vmpooler-deployment/compare/3.8.3...3.9.0)
+
+**Merged pull requests:**
+
+- \(maint\) Update vmpooler to version 3.7.0 [\#162](https://github.com/puppetlabs/vmpooler-deployment/pull/162) ([isaac-hammes](https://github.com/isaac-hammes))
+
+## [3.8.3](https://github.com/puppetlabs/vmpooler-deployment/tree/3.8.3) (2025-01-30)
+
+[Full Changelog](https://github.com/puppetlabs/vmpooler-deployment/compare/3.8.2...3.8.3)
+
+**Implemented enhancements:**
+
+- Update memory limit for api pod to 4G [\#159](https://github.com/puppetlabs/vmpooler-deployment/pull/159) ([mahikalra](https://github.com/mahikalra))
+
+## [3.8.2](https://github.com/puppetlabs/vmpooler-deployment/tree/3.8.2) (2024-07-25)
+
+[Full Changelog](https://github.com/puppetlabs/vmpooler-deployment/compare/3.7.0...3.8.2)
+
+**Implemented enhancements:**
+
+- \(RE-15696\) Local Development - Add Grafana and remove redis mount [\#147](https://github.com/puppetlabs/vmpooler-deployment/pull/147) ([yachub](https://github.com/yachub))
+
+**Fixed bugs:**
+
+- vsphere [\#153](https://github.com/puppetlabs/vmpooler-deployment/issues/153)
+
+**Merged pull requests:**
+
+- \(maint\) Burn the 3.8.0 release and try building again [\#156](https://github.com/puppetlabs/vmpooler-deployment/pull/156) ([e-gris](https://github.com/e-gris))
+- \(maint\) empty commit for redeploy attempt [\#155](https://github.com/puppetlabs/vmpooler-deployment/pull/155) ([e-gris](https://github.com/e-gris))
+- Bump jruby from 9.4.5.0-jdk11 to 9.4.7.0-jdk11 in /docker [\#152](https://github.com/puppetlabs/vmpooler-deployment/pull/152) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump jruby from 9.4.3.0-jdk11 to 9.4.5.0-jdk11 in /docker [\#149](https://github.com/puppetlabs/vmpooler-deployment/pull/149) ([dependabot[bot]](https://github.com/apps/dependabot))
+
+## [3.7.0](https://github.com/puppetlabs/vmpooler-deployment/tree/3.7.0) (2023-10-05)
+
+[Full Changelog](https://github.com/puppetlabs/vmpooler-deployment/compare/3.6.0...3.7.0)
+
+**Implemented enhancements:**
+
+- Gem dependency updates [\#145](https://github.com/puppetlabs/vmpooler-deployment/pull/145) ([yachub](https://github.com/yachub))
+
+**Fixed bugs:**
+
+- \(RE-15163\) Call BGREWRITEAOF on the redis database every restart to reduce aof file size [\#144](https://github.com/puppetlabs/vmpooler-deployment/pull/144) ([isaac-hammes](https://github.com/isaac-hammes))
+
 ## [3.6.0](https://github.com/puppetlabs/vmpooler-deployment/tree/3.6.0) (2023-09-07)
 
 [Full Changelog](https://github.com/puppetlabs/vmpooler-deployment/compare/3.5.3...3.6.0)

README.md

@@ -12,11 +12,11 @@
   - [Contributing](#contributing)
   - [License](#license)
 
-This repo contains Dockerfiles and a Helm chart that can be used to deploy [VMPooler](https://github.com/puppetlabs/vmpooler). The Release Engineering team at Puppet uses the code here as part of operating our VMPooler instances.
+Contains Dockerfiles and a Helm chart that are used to deploy [VMPooler](https://github.com/puppetlabs/vmpooler).
 
 ## VMPooler Components
 
-The docker image gnerated and hosted by this project contain the following VMPooler components:
+The docker image contains these VMPooler components:
 
 - [VMPooler Core](https://github.com/puppetlabs/vmpooler)
 - [VMPooler Google CloudDNS Plugin](https://github.com/puppetlabs/vmpooler-dns-google-clouddns)
@@ -26,34 +26,34 @@ The docker image gnerated and hosted by this project contain the following VMPoo
 
 ## Docker Registry
 
-The GitHub Actions in this repository publish images to GitHub Packages. You can browse the VMPooler containers [here](https://github.com/puppetlabs/vmpooler-deployment/pkgs/container/vmpooler-deployment%2Fvmpooler).
+GitHub Actions publishes images to GitHub Packages. Browse the VMPooler containers: https://github.com/puppetlabs/vmpooler-deployment/pkgs/container/vmpooler-deployment%2Fvmpooler
 
-The vmpooler officially released docker image tags use a semantic version, where the version increments correlate to the increments in any of the gems at `docker/Gemfile`.
+The vmpooler released docker image tags use semantic versioning; the version increments correlate to the increments in any of the gems at `docker/Gemfile`.
 
 Image tags starting with `pr<PULL REQUEST NUMBER>-<GIT SHA>` are generated when opening and pushing to a pull request and will periodically be cleaned up.
 
 ## Helm Repository
 
-The `docs/` folder in this repository represents a Helm repository served via GitHub Pages at https://puppetlabs.github.io/vmpooler-deployment/
+The `docs` folder represents a Helm repository served via GitHub Pages at https://puppetlabs.github.io/vmpooler-deployment
 
 ```bash
-$ helm repo add vmpooler-deployment https://puppetlabs.github.io/vmpooler-deployment/
+$ helm repo add vmpooler-deployment https://puppetlabs.github.io/vmpooler-deployment
 "vmpooler-deployment" has been added to your repositories
 ```
 
 ### Adding / updating charts
 
-Make the desired changes to the helm chart in helm-charts/vmpooler and run `./update-chart`.
+Update the helm chart in helm-charts/vmpooler. Run `./update-chart`.
 
 ## Development
 
 Prerequisites:
 
-- [Docker](https://docs.docker.com/engine/install/)
-- [Docker Compose](https://docs.docker.com/compose/install/)
+- [Docker](https://docs.docker.com/engine/install)
+- [Docker Compose](https://docs.docker.com/compose/install)
 
 1. Become familiar with the configuration file `docker/vmpooler.yaml` as described in [VMPooler](https://github.com/puppetlabs/vmpooler) Core.
-   - The default configuration file only enables the dummy provider built into [VMPooler](https://github.com/puppetlabs/vmpooler) Core. See each project below for documentation on how to use provider specific options:
+   - The default configuration file enables the dummy provider built into [VMPooler](https://github.com/puppetlabs/vmpooler) Core. See each project for documentation on how to use provider specific options:
       - [vmpooler-provider-ec2](https://github.com/puppetlabs/vmpooler-provider-ec2)
       - [vmpooler-provider-gce](https://github.com/puppetlabs/vmpooler-provider-gce)
       - [vmpooler-provider-vsphere](https://github.com/puppetlabs/vmpooler-provider-vsphere)
@@ -81,21 +81,25 @@ Prerequisites:
       3. Run `./update-gemfile-lock` to update the `Gemfile.lock`
       4. Run `docker compose build && docker compose up`.
 
-When a dependency Helm chart is updated, be sure to run `./update-chart-lock` to update the lockfile, otherwise the test and release workflows will fail.
+When a dependency Helm chart is updated, always run `./update-chart-lock` to update the lockfile, otherwise the test and release workflows will fail.
 
 ### Docker Compose URLs
 
-These are the default ports used in the docker compose file, to change them edit the `ports` key under the desired service in either `docker/docker-compose.yml` or `docker/docker-compose.local.yml`.
+These are the default ports used in the docker compose file. To change them edit the `ports` key under the service in either `docker/docker-compose.yml` or `docker/docker-compose.local.yml`.
 
-| App/Endpoint       | Path                                                        |
-|--------------------|-------------------------------------------------------------|
-| Redis Server       | `localhost:6379` (Password: `vmpooler`)                     |
-| Redis Commander    | <http://localhost:8080> (Credentials: `admin:admin`)        |
-| Jaeger             | <http://localhost:8081>
-| VMPooler API       | <http://localhost:8082/api/v3>                              |
-| VMPooler Dashboard | <http://localhost:8082/dashboard>                           |
-| Metrics (API)      | <http://localhost:8082/prometheus>                          |
-| Metrics (Manager)  | <http://localhost:8083/prometheus>                          |
+Tracing data is sent to the Jaeger instance, a prometheus server scrapes metrics, and both are pre-configured in Grafana as datasources for easy visualization and history of data.
+
+| App/Endpoint       | Path                                                         |
+|--------------------|--------------------------------------------------------------|
+| Redis Server       | `localhost:6379` (Password: `vmpooler`)                      |
+| Redis Commander    | <http://localhost:8080> (Credentials: `admin:admin`)         |
+| Jaeger             | <http://localhost:8081>                                      |
+| VMPooler API       | <http://localhost:8082/api/v3>                               |
+| VMPooler Dashboard | <http://localhost:8082/dashboard>                            |
+| Metrics (API)      | <http://localhost:8082/prometheus>                           |
+| Metrics (Manager)  | <http://localhost:8083/prometheus>                           |
+| Prometheus Server  | <http://localhost:9090>                                      |
+| Grafana Server     | <http://localhost:3000> (Credentials: `admin:admin`)         |
 
 ### Deploy Chart for Testing
 
@@ -111,22 +115,18 @@ Artifactory Example:
 
 Create a GitHub tag and release, publish a new docker image, and helm chart by opening a release prep pull request and running the release action below.
 
-**NOTE**: Due to the GitHub limitation that does not allow any method of bypassing status checks on a protected branch, the process below will technically publish the helm chart pointing to a nonexistent docker tag until the release workflow is run.
+**NOTE**: Due to the GitHub limitation that does not allow any method of bypassing status checks on a protected branch, the process below will publish the helm chart pointing to a nonexistent docker tag until the release workflow is run.
 
-1. Bump the "appVersion" key in `helm-charts/vmpooler/Chart.yaml` appropriately based on changes to `docker/Gemfile` and `docker/Gemfile.lock` in merged pull requests since the last release.
+1. Increment the "appVersion" key in `helm-charts/vmpooler/Chart.yaml` appropriately based on changes to `docker/Gemfile` and `docker/Gemfile.lock` in merged pull requests since the last release.
    - This key pertains to the docker tag that will be pushed upon release.
-2. Bump the "version" key in `helm-charts/vmpooler/Chart.yaml` appropriately based on changes to the chart itself and increments of the "appVersion" in merged pull requests since the last release.
+2. Increment the "version" key in `helm-charts/vmpooler/Chart.yaml` appropriately based on changes to the chart itself and increments of the "appVersion" in merged pull requests since the last release.
    - This key pertains to the helm chart verison that will be pushed upon release.
 3. Run `./update-changelog` to update `CHANGELOG.md`.
 4. Run `./build-chart` to package the new chart and update the repo index.
-5. Commit and push changes to a new branch, then open a pull request against `main` and be sure to add the "maintenance" label.
+5. Commit and push changes to a new branch then open a pull request against `main` and be sure to add the "maintenance" label.
 6. After the pull request is approved and merged, then navigate to Actions --> Docker and Helm Release --> run workflow --> Branch: main --> Run workflow.
    - This action will push a tagged docker image to the GitHub container registry and helm chart to GitHub pages.
 
-## Contributing
-
-We welcome and encourage contributions!
-
 ## License
 
 vmpooler-deployment is distributed under the [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html). See the [LICENSE](LICENSE) file for more details.

build-chart

@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
 
-docker run --rm -it -v $(pwd):/apps --entrypoint /bin/sh alpine/helm \
-  -c 'helm repo add bitnami https://charts.bitnami.com/bitnami && cd /apps/helm-charts/vmpooler && helm dependency update && cd /apps/docs && helm package ../helm-charts/* && helm repo index --url https://puppetlabs.github.io/vmpooler-deployment/ .'
+set -e
+set -x
+
+docker run --rm --interactive --tty --volume=$(pwd):/apps \
+       --entrypoint /bin/sh alpine/helm ./helm-package

docker/Dockerfile

@@ -8,7 +8,7 @@
 # RUN:
 #   docker run -e VMPOOLER_CONFIG -p 80:4567 -it vmpooler
 
-FROM jruby:9.4.3.0-jdk11
+FROM jruby:9.4.7.0-jdk11
 
 LABEL org.opencontainers.image.description "VMPooler plus all known providers"
 

docker/Dockerfile.dev

@@ -9,7 +9,7 @@
 # Then change directory into vmpooler-projects and build with: 
 
 
-FROM jruby:9.4.3.0-jdk11
+FROM jruby:9.4.7.0-jdk11
 
 LABEL org.opencontainers.image.description "VMPooler plus all known providers"
 

docker/Gemfile.lock

@@ -1,21 +1,24 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.5)
-      public_suffix (>= 2.0.2, < 6.0)
-    bindata (2.4.15)
-    builder (3.2.4)
-    concurrent-ruby (1.2.2)
-    connection_pool (2.4.1)
+    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.6)
+    connection_pool (2.5.5)
     declarative (0.0.20)
     deep_merge (1.2.2)
-    faraday (2.7.10)
-      faraday-net_http (>= 2.0, < 3.1)
-      ruby2_keywords (>= 0.0.4)
-    faraday-net_http (3.0.2)
-    google-apis-compute_v1 (0.77.0)
+    faraday (2.14.0)
+      faraday-net_http (>= 2.0, < 3.5)
+      json
+      logger
+    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.1)
+    google-apis-core (0.11.3)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -23,20 +26,20 @@ GEM
       representable (~> 3.0)
       retriable (>= 2.0, < 4.a)
       rexml
-      webrick
-    google-apis-dns_v1 (0.33.0)
+    google-apis-dns_v1 (0.36.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-cloud-core (1.6.0)
-      google-cloud-env (~> 1.0)
+    google-cloud-core (1.8.0)
+      google-cloud-env (>= 1.0, < 3.a)
       google-cloud-errors (~> 1.0)
     google-cloud-dns (0.35.1)
       google-apis-dns_v1 (~> 0.1)
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       zonefile (~> 1.04)
-    google-cloud-env (1.6.0)
-      faraday (>= 0.17.3, < 3.0)
-    google-cloud-errors (1.3.1)
+    google-cloud-env (2.3.1)
+      base64 (~> 0.2)
+      faraday (>= 1.0, < 3.a)
+    google-cloud-errors (1.5.0)
     googleauth (1.2.0)
       faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
@@ -44,20 +47,28 @@ GEM
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
-    httpclient (2.8.3)
-    json (2.6.3-java)
-    jwt (2.7.1)
+    httpclient (2.9.0)
+      mutex_m
+    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.0)
+    multi_json (1.19.1)
+    mustermann (3.0.4)
       ruby2_keywords (~> 0.0.1)
-    net-ldap (0.18.0)
-    nio4r (2.5.9-java)
-    nokogiri (1.15.4-java)
+    mutex_m (0.3.0)
+    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.2.2)
-    opentelemetry-common (0.20.0)
+    opentelemetry-api (1.7.0)
+    opentelemetry-common (0.20.1)
       opentelemetry-api (~> 1.0)
     opentelemetry-exporter-jaeger (0.23.0)
       opentelemetry-api (~> 1.1)
@@ -65,7 +76,7 @@ GEM
       opentelemetry-sdk (~> 1.2)
       opentelemetry-semantic_conventions
       thrift
-    opentelemetry-instrumentation-base (0.22.2)
+    opentelemetry-instrumentation-base (0.22.3)
       opentelemetry-api (~> 1.0)
       opentelemetry-registry (~> 0.1)
     opentelemetry-instrumentation-concurrent_ruby (0.21.1)
@@ -88,64 +99,68 @@ GEM
       opentelemetry-common (~> 0.20.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
       opentelemetry-instrumentation-rack (~> 0.21)
-    opentelemetry-registry (0.3.0)
+    opentelemetry-registry (0.4.0)
       opentelemetry-api (~> 1.1)
-    opentelemetry-resource_detectors (0.24.1)
+    opentelemetry-resource_detectors (0.24.2)
       google-cloud-env
       opentelemetry-sdk (~> 1.0)
-    opentelemetry-sdk (1.3.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.10.0)
+    opentelemetry-semantic_conventions (1.36.0)
       opentelemetry-api (~> 1.0)
-    optimist (3.1.0)
+    optimist (3.2.1)
     os (1.1.4)
+    ostruct (0.6.3)
     pickup (0.0.11)
-    prometheus-client (4.2.1)
-    public_suffix (5.0.3)
-    puma (6.3.1-java)
+    prometheus-client (4.2.5)
+      base64
+    public_suffix (6.0.2)
+    puma (6.6.1-java)
       nio4r (~> 2.0)
-    racc (1.7.1-java)
-    rack (2.2.8)
-    rack-protection (3.1.0)
+    racc (1.8.1-java)
+    rack (2.2.21)
+    rack-protection (3.2.0)
+      base64 (>= 0.1.0)
       rack (~> 2.2, >= 2.2.4)
-    rake (13.0.6)
-    rbvmomi2 (3.6.1)
+    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.0.7)
-      redis-client (>= 0.9.0)
-    redis-client (0.16.0)
+    redis (5.4.1)
+      redis-client (>= 0.22.0)
+    redis-client (0.26.3)
       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.2.6)
+    rexml (3.4.4)
     ruby2_keywords (0.0.5)
-    signet (0.17.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.1.0)
+    sinatra (3.2.0)
       mustermann (~> 3.0)
       rack (~> 2.2, >= 2.2.4)
-      rack-protection (= 3.1.0)
+      rack-protection (= 3.2.0)
       tilt (~> 2.0)
     spicy-proton (2.1.15)
       bindata (~> 2.3)
     statsd-ruby (1.5.0)
-    thrift (0.18.1)
-    tilt (2.2.0)
+    thrift (0.22.0)
+    tilt (2.7.0)
     trailblazer-option (0.1.2)
     uber (0.1.0)
-    vmpooler (3.5.1)
+    uri (1.1.1)
+    vmpooler (3.8.1)
       concurrent-ruby (~> 1.1)
       connection_pool (~> 2.4)
       deep_merge (~> 1.2)
@@ -153,10 +168,11 @@ GEM
       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.1)
-      opentelemetry-sdk (~> 1.3, >= 1.3.0)
+      opentelemetry-resource_detectors (= 0.24.2)
+      opentelemetry-sdk (~> 1.8)
       pickup (~> 0.0.11)
       prometheus-client (>= 2, < 5)
       puma (>= 5.0.4, < 7)
@@ -177,7 +193,6 @@ GEM
     vmpooler-provider-vsphere (3.3.4)
       rbvmomi2 (>= 3.1, < 4.0)
       vmpooler (~> 3.0)
-    webrick (1.8.1)
     zonefile (1.06)
 
 PLATFORMS

docker/docker-compose.dev.yml

@@ -5,10 +5,6 @@ services:
     # This should match the major version used in the vmpooler helm chart
     image: redis:6
     command: "redis-server --requirepass vmpooler"
-    volumes:
-      - type: bind
-        source: ./data/redis
-        target: /data
     ports:
       - "6379:6379"
 
@@ -99,3 +95,23 @@ services:
     links:
       - redis-server
       - jaeger-aio
+
+  prometheus:
+    image: prom/prometheus:latest
+    volumes:
+      - ./prometheus.yml:/etc/prometheus/prometheus.yml
+    ports:
+      - "9090:9090"
+    links:
+      - vmpooler-api
+      - vmpooler-manager
+
+  grafana:
+    image: grafana/grafana-oss:latest
+    volumes:
+      - ./grafana/provisioning:/etc/grafana/provisioning
+    ports:
+     - '3000:3000'
+    links:
+      - prometheus
+      - jaeger-aio

docker/docker-compose.yml

@@ -5,10 +5,6 @@ services:
     # This should match the major version used in the vmpooler helm chart
     image: redis:6
     command: "redis-server --requirepass vmpooler"
-    volumes:
-      - type: bind
-        source: ./data/redis
-        target: /data
     ports:
       - "6379:6379"
 
@@ -87,3 +83,23 @@ services:
     links:
       - redis-server
       - jaeger-aio
+
+  prometheus:
+    image: prom/prometheus:latest
+    volumes:
+      - ./prometheus.yml:/etc/prometheus/prometheus.yml
+    ports:
+      - "9090:9090"
+    links:
+      - vmpooler-api
+      - vmpooler-manager
+
+  grafana:
+    image: grafana/grafana-oss:latest
+    volumes:
+      - ./grafana/provisioning:/etc/grafana/provisioning
+    ports:
+     - '3000:3000'
+    links:
+      - prometheus
+      - jaeger-aio

docker/grafana/provisioning/datasources/datasource.yml

@@ -0,0 +1,10 @@
+apiVersion: 1
+
+datasources:
+  - name: Prometheus
+    type: prometheus
+    url: http://prometheus:9090
+
+  - name: Jaeger
+    type: jaeger
+    url: http://jaeger-aio:16686

docker/prometheus.yml

@@ -0,0 +1,14 @@
+global:
+  scrape_interval:     15s
+  evaluation_interval: 15s
+
+scrape_configs:
+  - job_name: vmpooler-api
+    metrics_path: /prometheus
+    static_configs:
+      - targets: ['vmpooler-api:4567']
+
+  - job_name: vmpooler-manager
+    metrics_path: /prometheus
+    static_configs:
+      - targets: ['vmpooler-manager:4567']

docs/index.yaml

@@ -1,9 +1,129 @@
 apiVersion: v1
 entries:
   vmpooler:
+  - apiVersion: v2
+    appVersion: 5.7.0
+    created: "2025-08-01T14:47:26.530766161Z"
+    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
+    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
+  - apiVersion: v2
+    appVersion: 5.7.0
+    created: "2025-08-01T14:47:26.522784925Z"
+    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
+    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
+  - apiVersion: v2
+    appVersion: 5.7.0
+    created: "2025-08-01T14:47:26.511435751Z"
+    dependencies:
+    - name: redis
+      repository: https://charts.bitnami.com/bitnami
+      version: 16.13.2
+    description: A Helm chart to deploy vmpooler
+    digest: 0b6a59f120583298798b6641929924257d8b004acac12e8435736480ad15da9b
+    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.0.tgz
+    version: 3.9.0
+  - apiVersion: v2
+    appVersion: 5.6.0
+    created: "2025-08-01T14:47:26.499359292Z"
+    dependencies:
+    - name: redis
+      repository: https://charts.bitnami.com/bitnami
+      version: 16.13.2
+    description: A Helm chart to deploy vmpooler
+    digest: 80ed97d541895fb564463e30bb3092969a037450c714f5d1985ca42acc0af39c
+    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.8.3.tgz
+    version: 3.8.3
+  - apiVersion: v2
+    appVersion: 5.6.0
+    created: "2025-08-01T14:47:26.488598934Z"
+    dependencies:
+    - name: redis
+      repository: https://charts.bitnami.com/bitnami
+      version: 16.13.2
+    description: A Helm chart to deploy vmpooler
+    digest: 9172047131a3d8a429d44430ca72b0c286a1eba05f8feb1005575abd910abdd4
+    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.8.2.tgz
+    version: 3.8.2
+  - apiVersion: v2
+    appVersion: 5.6.0
+    created: "2025-08-01T14:47:26.476360664Z"
+    dependencies:
+    - name: redis
+      repository: https://charts.bitnami.com/bitnami
+      version: 16.13.2
+    description: A Helm chart to deploy vmpooler
+    digest: 174a3fafcfe52e13ca2e082645092a6a84331625f313b7e318e01f76671fe1a8
+    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.8.1.tgz
+    version: 3.8.1
+  - apiVersion: v2
+    appVersion: 5.6.0
+    created: "2025-08-01T14:47:26.465872839Z"
+    dependencies:
+    - name: redis
+      repository: https://charts.bitnami.com/bitnami
+      version: 16.13.2
+    description: A Helm chart to deploy vmpooler
+    digest: 5dd1ffe3f60944ffd63596d47df20868aa9b850b2507cb37d1d353a8fb1f3a4b
+    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.8.0.tgz
+    version: 3.8.0
+  - apiVersion: v2
+    appVersion: 5.6.0
+    created: "2025-08-01T14:47:26.454823621Z"
+    dependencies:
+    - name: redis
+      repository: https://charts.bitnami.com/bitnami
+      version: 16.13.2
+    description: A Helm chart to deploy vmpooler
+    digest: 353ce166a446f0a4af01230c3041ab03e122113c5393cac497a5946ed7f64701
+    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.7.0.tgz
+    version: 3.7.0
   - apiVersion: v2
     appVersion: 5.5.3
-    created: "2023-09-07T15:17:39.911537797Z"
+    created: "2025-08-01T14:47:26.444772227Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -18,7 +138,7 @@ entries:
     version: 3.6.0
   - apiVersion: v2
     appVersion: 5.5.3
-    created: "2023-09-07T15:17:39.906624839Z"
+    created: "2025-08-01T14:47:26.433931552Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -33,7 +153,7 @@ entries:
     version: 3.5.3
   - apiVersion: v2
     appVersion: 5.5.2
-    created: "2023-09-07T15:17:39.893660506Z"
+    created: "2025-08-01T14:47:26.424035301Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -48,7 +168,7 @@ entries:
     version: 3.5.2
   - apiVersion: v2
     appVersion: 5.5.1
-    created: "2023-09-07T15:17:39.885982297Z"
+    created: "2025-08-01T14:47:26.411819215Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -63,7 +183,7 @@ entries:
     version: 3.5.1
   - apiVersion: v2
     appVersion: 5.5.0
-    created: "2023-09-07T15:17:39.877094672Z"
+    created: "2025-08-01T14:47:26.401583826Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -78,7 +198,7 @@ entries:
     version: 3.5.0
   - apiVersion: v2
     appVersion: 5.4.1
-    created: "2023-09-07T15:17:39.869012506Z"
+    created: "2025-08-01T14:47:26.390414322Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -93,7 +213,7 @@ entries:
     version: 3.4.1
   - apiVersion: v2
     appVersion: 5.4.0
-    created: "2023-09-07T15:17:39.856741631Z"
+    created: "2025-08-01T14:47:26.379928244Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -108,7 +228,7 @@ entries:
     version: 3.4.0
   - apiVersion: v2
     appVersion: 5.3.0
-    created: "2023-09-07T15:17:39.844453256Z"
+    created: "2025-08-01T14:47:26.368518543Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -123,7 +243,7 @@ entries:
     version: 3.3.0
   - apiVersion: v2
     appVersion: 5.2.0
-    created: "2023-09-07T15:17:39.830466214Z"
+    created: "2025-08-01T14:47:26.358252054Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -138,7 +258,7 @@ entries:
     version: 3.2.0
   - apiVersion: v2
     appVersion: 5.1.0
-    created: "2023-09-07T15:17:39.795587881Z"
+    created: "2025-08-01T14:47:26.346223906Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -153,7 +273,7 @@ entries:
     version: 3.1.0
   - apiVersion: v2
     appVersion: 5.0.0
-    created: "2023-09-07T15:17:39.785748172Z"
+    created: "2025-08-01T14:47:26.336021044Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -168,7 +288,7 @@ entries:
     version: 3.0.0
   - apiVersion: v2
     appVersion: 4.1.0
-    created: "2023-09-07T15:17:39.762261172Z"
+    created: "2025-08-01T14:47:26.324819648Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -183,7 +303,7 @@ entries:
     version: 2.2.0
   - apiVersion: v2
     appVersion: 4.0.0
-    created: "2023-09-07T15:17:39.752463381Z"
+    created: "2025-08-01T14:47:26.314076098Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -198,7 +318,7 @@ entries:
     version: 2.1.0
   - apiVersion: v2
     appVersion: 4.0.0
-    created: "2023-09-07T15:17:39.738754631Z"
+    created: "2025-08-01T14:47:26.3025029Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -213,7 +333,7 @@ entries:
     version: 2.0.0
   - apiVersion: v2
     appVersion: 1.7.0-prod-all-providers
-    created: "2023-09-07T15:17:39.645096464Z"
+    created: "2025-08-01T14:47:26.217686479Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -228,7 +348,7 @@ entries:
     version: 1.19.0
   - apiVersion: v2
     appVersion: 1.7.0-prod-all-providers
-    created: "2023-09-07T15:17:39.634982881Z"
+    created: "2025-08-01T14:47:26.20615313Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -243,7 +363,7 @@ entries:
     version: 1.18.0
   - apiVersion: v2
     appVersion: 1.7.0-prod-all-providers
-    created: "2023-09-07T15:17:39.626603589Z"
+    created: "2025-08-01T14:47:26.192913076Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -258,7 +378,7 @@ entries:
     version: 1.17.0
   - apiVersion: v2
     appVersion: 1.6.0-prod-all-providers
-    created: "2023-09-07T15:17:39.617066756Z"
+    created: "2025-08-01T14:47:26.180016696Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -273,7 +393,7 @@ entries:
     version: 1.16.0
   - apiVersion: v2
     appVersion: 1.6.0-prod-all-providers
-    created: "2023-09-07T15:17:39.608003714Z"
+    created: "2025-08-01T14:47:26.163482559Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -288,7 +408,7 @@ entries:
     version: 1.15.0
   - apiVersion: v2
     appVersion: 1.6.0-prod-all-providers
-    created: "2023-09-07T15:17:39.599827547Z"
+    created: "2025-08-01T14:47:26.148027262Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -303,7 +423,7 @@ entries:
     version: 1.14.0
   - apiVersion: v2
     appVersion: 1.5.0-prod-all-providers
-    created: "2023-09-07T15:17:39.590080339Z"
+    created: "2025-08-01T14:47:26.129088412Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -318,7 +438,7 @@ entries:
     version: 1.13.0
   - apiVersion: v2
     appVersion: 1.5.0-prod-all-providers
-    created: "2023-09-07T15:17:39.580538297Z"
+    created: "2025-08-01T14:47:26.115192635Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -333,7 +453,7 @@ entries:
     version: 1.12.0
   - apiVersion: v2
     appVersion: 1.4.0-prod-all-providers
-    created: "2023-09-07T15:17:39.572294922Z"
+    created: "2025-08-01T14:47:26.104012949Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -348,7 +468,7 @@ entries:
     version: 1.11.1
   - apiVersion: v2
     appVersion: 1.3.0-prod-all-providers
-    created: "2023-09-07T15:17:39.547711547Z"
+    created: "2025-08-01T14:47:26.094249573Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -363,7 +483,7 @@ entries:
     version: 1.11.0
   - apiVersion: v2
     appVersion: 1.2.0-prod-all-providers
-    created: "2023-09-07T15:17:39.538105631Z"
+    created: "2025-08-01T14:47:26.08366946Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -378,7 +498,7 @@ entries:
     version: 1.10.1
   - apiVersion: v2
     appVersion: 1.2.0-prod-all-providers
-    created: "2023-09-07T15:17:39.525626464Z"
+    created: "2025-08-01T14:47:26.073735253Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -393,7 +513,7 @@ entries:
     version: 1.10.0
   - apiVersion: v2
     appVersion: 1.2.0-prod-all-providers
-    created: "2023-09-07T15:17:39.722565381Z"
+    created: "2025-08-01T14:47:26.292230858Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -408,7 +528,7 @@ entries:
     version: 1.9.0
   - apiVersion: v2
     appVersion: 1.2.0-prod-all-providers
-    created: "2023-09-07T15:17:39.712973589Z"
+    created: "2025-08-01T14:47:26.282594053Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -423,7 +543,7 @@ entries:
     version: 1.8.0
   - apiVersion: v2
     appVersion: 1.0.0-prod-all-providers
-    created: "2023-09-07T15:17:39.699163839Z"
+    created: "2025-08-01T14:47:26.274204699Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -438,7 +558,7 @@ entries:
     version: 1.7.1
   - apiVersion: v2
     appVersion: 1.0.0-prod-all-providers
-    created: "2023-09-07T15:17:39.689759297Z"
+    created: "2025-08-01T14:47:26.265409971Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -453,7 +573,7 @@ entries:
     version: 1.7.0
   - apiVersion: v2
     appVersion: 1.3.0
-    created: "2023-09-07T15:17:39.681260922Z"
+    created: "2025-08-01T14:47:26.256953201Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -468,7 +588,7 @@ entries:
     version: 1.6.3
   - apiVersion: v2
     appVersion: 1.3.0
-    created: "2023-09-07T15:17:39.672291422Z"
+    created: "2025-08-01T14:47:26.246802746Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -483,7 +603,7 @@ entries:
     version: 1.6.2
   - apiVersion: v2
     appVersion: 1.3.0
-    created: "2023-09-07T15:17:39.663543047Z"
+    created: "2025-08-01T14:47:26.238207026Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -498,7 +618,7 @@ entries:
     version: 1.6.1
   - apiVersion: v2
     appVersion: 1.3.0
-    created: "2023-09-07T15:17:39.655003422Z"
+    created: "2025-08-01T14:47:26.228886776Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -511,4 +631,4 @@ entries:
     urls:
     - https://puppetlabs.github.io/vmpooler-deployment/vmpooler-1.6.0.tgz
     version: 1.6.0
-generated: "2023-09-07T15:17:39.514564089Z"
+generated: "2025-08-01T14:47:26.062605037Z"

helm-charts/vmpooler/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: redis
-  repository: https://charts.bitnami.com/bitnami
+  repository: https://artifactory.delivery.puppetlabs.net/artifactory/helm__local
   version: 16.13.2
-digest: sha256:3a3d3cfce254ddfa488e495a3e2e141ee59c0ea4a583ba813093def78ca132cb
-generated: "2023-01-24T12:41:13.082268468Z"
+digest: sha256:9f085fa04b66dea3610b03474b3eb2e2fd09733c4c6cbbda15a152770a9169b0
+generated: "2025-07-31T09:10:07.046655-07:00"

helm-charts/vmpooler/Chart.yaml

@@ -3,9 +3,9 @@ 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.6.0
-appVersion: 5.5.3
+version: 3.10.0
+appVersion: 5.8.0
 dependencies:
   - name: redis
-    repository: https://charts.bitnami.com/bitnami
+    repository: https://artifactory.delivery.puppetlabs.net/artifactory/helm__local
     version: 16.13.2

helm-charts/vmpooler/values.yaml

@@ -70,7 +70,7 @@ api:
       memory: 2Gi
     limits:
       cpu: 2000m
-      memory: 2Gi
+      memory: 4Gi
 
 manager:
   resources:
@@ -130,6 +130,12 @@ affinity: {}
 # Redis provided by bitnami/redis
 # For a full list of parameters see: https://github.com/bitnami/charts/tree/master/bitnami/redis/
 redis:
+  # Override the Redis image
+  image:
+    registry: artifactory.delivery.puppetlabs.net
+    repository: release-engineering/redis
+    tag: "6.2.7-debian-11-r11"
+    pullPolicy: IfNotPresent
   fullnameOverride: redis
   architecture: standalone
   networkPolicy:
@@ -156,7 +162,19 @@ redis:
       initialDelaySeconds: 40
       periodSeconds: 10
       failureThreshold: 10
+    lifecycleHooks:
+      postStart:
+        exec:
+          command:
+          - /bin/sh
+          - -c
+          - echo "AUTH $REDIS_PASSWORD\nBGREWRITEAOF" | redis-cli
   metrics:
+    image:
+      registry: artifactory.delivery.puppetlabs.net
+      repository: release-engineering/redis-exporter
+      tag: "1.43.0-debian-11-r4"
+      pullPolicy: IfNotPresent
     enabled: true
     resources:
       requests:

helm-package

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+set -e
+set -x
+
+helm repo add artifactory https://artifactory.delivery.puppetlabs.net/artifactory/helm__local
+cd /apps/helm-charts/vmpooler
+helm dependency update
+cd /apps/docs
+helm package ../helm-charts/*
+helm repo index --url https://puppetlabs.github.io/vmpooler-deployment .
+

update-changelog

@@ -1,5 +1,11 @@
 #!/usr/bin/env bash
 
-docker run -it --rm -e CHANGELOG_GITHUB_TOKEN -v $(pwd):/usr/local/src/your-app \
-  githubchangeloggenerator/github-changelog-generator:1.16.2 \
-  github_changelog_generator --future-release $(yq .version helm-charts/vmpooler/Chart.yaml)
+set -e
+set -x
+
+future_release=$(yq .version helm-charts/vmpooler/Chart.yaml)
+
+docker run --interactive --tty --rm=true --env=CHANGELOG_GITHUB_TOKEN \
+       --volume=$(pwd):/usr/local/src/your-app \
+       githubchangeloggenerator/github-changelog-generator:1.16.2 \
+       github_changelog_generator --future-release="$future_release"

update-chart-lock

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
 docker run --rm -it -v $(pwd):/apps --entrypoint /bin/sh alpine/helm \
-  -c 'helm repo add bitnami https://charts.bitnami.com/bitnami && cd /apps/helm-charts/vmpooler && helm dependency update'
+  -c 'helm repo add artifactory https://artifactory.delivery.puppetlabs.net/artifactory/helm__local && cd /apps/helm-charts/vmpooler && helm dependency update'