Merge branch 'main' into test_redis_update

.github/workflows/release.yml

@@ -77,26 +77,26 @@ jobs:
             console.log('return:', returnValue);
             return returnValue;
 
-      # - name: Generate Changelog
+      - name: Generate Changelog
-      #   uses: docker://githubchangeloggenerator/github-changelog-generator:1.16.2
+        uses: docker://githubchangeloggenerator/github-changelog-generator:1.16.2
-      #   with:
+        with:
-      #     args: >-
+          args: >-
-      #       --future-release ${{ steps.nv.outputs.version }}
+            --future-release ${{ steps.nv.outputs.version }}
-      #   env:
+        env:
-      #     CHANGELOG_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          CHANGELOG_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      # - name: Validate Changelog
+      - name: Validate Changelog
-      #   run : |
+        run : |
-      #     set -e
+          set -e
-      #     if [[ -n $(git status --porcelain) ]]; then
+          if [[ -n $(git status --porcelain) ]]; then
-      #       echo "Here is the current git status:"
+            echo "Here is the current git status:"
-      #       git status
+            git status
-      #       echo
+            echo
-      #       echo "The following changes were detected:"
+            echo "The following changes were detected:"
-      #       git --no-pager diff
+            git --no-pager diff
-      #       echo "Uncommitted PRs found in the changelog. Please submit a release prep PR of changes after running '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 ${{ steps.nv.outputs.version }}'"
+            echo "Uncommitted PRs found in the changelog. Please submit a release prep PR of changes after running '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 ${{ steps.nv.outputs.version }}'"
-      #       exit 1
+            exit 1
-      #     fi
+          fi
 
       - name: Generate Release Notes
         uses: docker://githubchangeloggenerator/github-changelog-generator:1.16.2

CHANGELOG.md

@@ -1,11 +1,21 @@
 # Changelog
 
+## [3.2.0](https://github.com/puppetlabs/vmpooler-deployment/tree/3.2.0) (2023-08-10)
+
+[Full Changelog](https://github.com/puppetlabs/vmpooler-deployment/compare/3.1.0...3.2.0)
+
+**Implemented enhancements:**
+
+- Bump jruby and all vmpooler gems [\#110](https://github.com/puppetlabs/vmpooler-deployment/pull/110) ([yachub](https://github.com/yachub))
+- \(RE-15638\) Make redis connection options configurable [\#108](https://github.com/puppetlabs/vmpooler-deployment/pull/108) ([yachub](https://github.com/yachub))
+
 ## [3.1.0](https://github.com/puppetlabs/vmpooler-deployment/tree/3.1.0) (2023-05-01)
 
 [Full Changelog](https://github.com/puppetlabs/vmpooler-deployment/compare/3.0.0...3.1.0)
 
 **Implemented enhancements:**
 
+- Explicit JDK Tag and Newer Java Compatibility [\#85](https://github.com/puppetlabs/vmpooler-deployment/issues/85)
 - Bump all vmpooler gems [\#103](https://github.com/puppetlabs/vmpooler-deployment/pull/103) ([yachub](https://github.com/yachub))
 
 **Merged pull requests:**

README.md

@@ -1,17 +1,15 @@
 # vmpooler-deployment
 
-- [vmpooler-deployment](#vmpooler-deployment)
+- [VMPooler Components](#vmpooler-components)
-  - [VMPooler Components](#vmpooler-components)
+- [Docker Registry](#docker-registry)
-  - [Docker Registry](#docker-registry)
+- [Helm Repository](#helm-repository)
-  - [Helm Repository](#helm-repository)
+  - [Adding / updating charts](#adding--updating-charts)
-    - [Adding / updating charts](#adding--updating-charts)
+- [Development](#development)
-  - [Development](#development)
+  - [Docker Compose URLs](#docker-compose-urls)
-    - [Docker Compose URLs](#docker-compose-urls)
+  - [Deploy Chart for Testing](#deploy-chart-for-testing)
-    - [Deploy Chart for Testing](#deploy-chart-for-testing)
+- [Releasing](#releasing)
-  - [Submitting Issues](#submitting-issues)
+- [Contributing](#contributing)
-  - [Releasing](#releasing)
+- [License](#license)
-  - [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.
 
@@ -108,10 +106,6 @@ Helm charts are hosted with GitHub Pages since GitHub Packages does not support
 Artifactory Example:
 `curl -H 'X-JFrog-Art-Api:<YOUR_API_KEY>' -T vmpooler-x.y.z-rc.1.tgz "https://artifactory.example.com/artifactory/helm__local/vmpooler-x.y.z-rc.1.tgz"`
 
-## Submitting Issues
-
-Please file any issues or requests in Jira at <https://puppet.atlassian.net/jira/software/c/projects/POOLER/issues> where project development is tracked across all VMPooler related components.
-
 ## Releasing
 
 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.

docker/Dockerfile

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

docker/Dockerfile.local

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

docker/Gemfile.lock

@@ -176,11 +176,11 @@ GEM
       google-cloud-dns (~> 0.35.1)
       googleauth (>= 0.16.2, < 1.3.0)
       vmpooler (~> 3.0)
-    vmpooler-provider-gce (1.1.0)
+    vmpooler-provider-gce (1.2.0)
       google-apis-compute_v1 (~> 0.14)
       googleauth (>= 0.16.2, < 1.4.0)
       vmpooler (~> 3.0)
-    vmpooler-provider-vsphere (3.1.0)
+    vmpooler-provider-vsphere (3.2.0)
       rbvmomi2 (>= 3.1, < 4.0)
       vmpooler (~> 3.0)
     webrick (1.8.1)

docs/index.yaml

@@ -1,6 +1,21 @@
 apiVersion: v1
 entries:
   vmpooler:
+  - apiVersion: v2
+    appVersion: 5.2.0
+    created: "2023-08-10T19:39:59.624068419Z"
+    dependencies:
+    - name: redis
+      repository: https://charts.bitnami.com/bitnami
+      version: 16.13.2
+    description: A Helm chart to deploy vmpooler
+    digest: db4d79f5daaba68d989f0c1cd71e6753ad2324e481eedade0932ff635394ec66
+    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.2.0.tgz
+    version: 3.2.0
   - apiVersion: v2
     appVersion: 5.1.0
     created: "2023-08-10T16:25:40.014437992Z"

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

@@ -110,9 +110,9 @@ spec:
         - name: REDIS_SERVER
           value: 'redis-master'
         - name: REDIS_CONNECTION_POOL_SIZE
-          value: "200"
+          value: '{{ .Values.redis_connection_pool_size }}'
         - name: REDIS_CONNECTION_POOL_TIMEOUT
-          value: "40"
+          value: '{{ .Values.redis_connection_pool_timeout }}'
         - name: REDIS_RECONNECT_ATTEMPTS
           value: "[0,0.25,0.5,1,2,4,8,16,32,64,128,256,512]"
         - name: ONDEMAND_REQUEST_TTL

helm-charts/vmpooler/values.yaml

@@ -16,6 +16,10 @@ vm_lifetime: '2'
 vm_lifetime_auth: '12'
 timeout: '15'
 
+redis_connection_pool_size: '200'
+redis_connection_pool_timeout: '40'
+redis_reconnect_attempts: '40'
+
 :dns_configs:
   :example:
     dns_class: dynamic-dns