Merge branch 'main' into dependabot/docker/docker/jruby-9.4.7.0-jdk11

This commit is contained in:
Eric Griswold 2024-07-25 11:56:20 -07:00 committed by GitHub
commit 808260d0d8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 127 additions and 62 deletions

View file

@ -1,5 +1,23 @@
# Changelog
## [3.8.1](https://github.com/puppetlabs/vmpooler-deployment/tree/3.8.1) (2024-07-08)
[Full Changelog](https://github.com/puppetlabs/vmpooler-deployment/compare/3.7.0...3.8.1)
**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\) empty commit for redeploy attempt [\#155](https://github.com/puppetlabs/vmpooler-deployment/pull/155) ([e-gris](https://github.com/e-gris))
- RE-16207: Create a 3.8.0 release / script cleanup [\#154](https://github.com/puppetlabs/vmpooler-deployment/pull/154) ([e-gris](https://github.com/e-gris))
- 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)

View file

@ -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,11 +81,11 @@ 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`.
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.
@ -115,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.

View file

@ -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

View file

@ -3,7 +3,37 @@ entries:
vmpooler:
- apiVersion: v2
appVersion: 5.6.0
created: "2023-10-05T19:54:50.312950505Z"
created: "2024-07-08T21:21:53.977010185Z"
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: "2024-07-08T21:21:53.971876365Z"
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: "2024-07-08T21:21:53.96694823Z"
dependencies:
- name: redis
repository: https://charts.bitnami.com/bitnami
@ -18,7 +48,7 @@ entries:
version: 3.7.0
- apiVersion: v2
appVersion: 5.5.3
created: "2023-10-05T19:54:50.308282755Z"
created: "2024-07-08T21:21:53.96148818Z"
dependencies:
- name: redis
repository: https://charts.bitnami.com/bitnami
@ -33,7 +63,7 @@ entries:
version: 3.6.0
- apiVersion: v2
appVersion: 5.5.3
created: "2023-10-05T19:54:50.304656796Z"
created: "2024-07-08T21:21:53.956499712Z"
dependencies:
- name: redis
repository: https://charts.bitnami.com/bitnami
@ -48,7 +78,7 @@ entries:
version: 3.5.3
- apiVersion: v2
appVersion: 5.5.2
created: "2023-10-05T19:54:50.300594963Z"
created: "2024-07-08T21:21:53.951089965Z"
dependencies:
- name: redis
repository: https://charts.bitnami.com/bitnami
@ -63,7 +93,7 @@ entries:
version: 3.5.2
- apiVersion: v2
appVersion: 5.5.1
created: "2023-10-05T19:54:50.296970171Z"
created: "2024-07-08T21:21:53.946138725Z"
dependencies:
- name: redis
repository: https://charts.bitnami.com/bitnami
@ -78,7 +108,7 @@ entries:
version: 3.5.1
- apiVersion: v2
appVersion: 5.5.0
created: "2023-10-05T19:54:50.292672588Z"
created: "2024-07-08T21:21:53.940330388Z"
dependencies:
- name: redis
repository: https://charts.bitnami.com/bitnami
@ -93,7 +123,7 @@ entries:
version: 3.5.0
- apiVersion: v2
appVersion: 5.4.1
created: "2023-10-05T19:54:50.288715671Z"
created: "2024-07-08T21:21:53.935453624Z"
dependencies:
- name: redis
repository: https://charts.bitnami.com/bitnami
@ -108,7 +138,7 @@ entries:
version: 3.4.1
- apiVersion: v2
appVersion: 5.4.0
created: "2023-10-05T19:54:50.284719588Z"
created: "2024-07-08T21:21:53.930029687Z"
dependencies:
- name: redis
repository: https://charts.bitnami.com/bitnami
@ -123,7 +153,7 @@ entries:
version: 3.4.0
- apiVersion: v2
appVersion: 5.3.0
created: "2023-10-05T19:54:50.280420505Z"
created: "2024-07-08T21:21:53.924803582Z"
dependencies:
- name: redis
repository: https://charts.bitnami.com/bitnami
@ -138,7 +168,7 @@ entries:
version: 3.3.0
- apiVersion: v2
appVersion: 5.2.0
created: "2023-10-05T19:54:50.276299171Z"
created: "2024-07-08T21:21:53.91997434Z"
dependencies:
- name: redis
repository: https://charts.bitnami.com/bitnami
@ -153,7 +183,7 @@ entries:
version: 3.2.0
- apiVersion: v2
appVersion: 5.1.0
created: "2023-10-05T19:54:50.272252755Z"
created: "2024-07-08T21:21:53.914583057Z"
dependencies:
- name: redis
repository: https://charts.bitnami.com/bitnami
@ -168,7 +198,7 @@ entries:
version: 3.1.0
- apiVersion: v2
appVersion: 5.0.0
created: "2023-10-05T19:54:50.26845388Z"
created: "2024-07-08T21:21:53.9097774Z"
dependencies:
- name: redis
repository: https://charts.bitnami.com/bitnami
@ -183,7 +213,7 @@ entries:
version: 3.0.0
- apiVersion: v2
appVersion: 4.1.0
created: "2023-10-05T19:54:50.26409863Z"
created: "2024-07-08T21:21:53.904902374Z"
dependencies:
- name: redis
repository: https://charts.bitnami.com/bitnami
@ -198,7 +228,7 @@ entries:
version: 2.2.0
- apiVersion: v2
appVersion: 4.0.0
created: "2023-10-05T19:54:50.259656796Z"
created: "2024-07-08T21:21:53.899492713Z"
dependencies:
- name: redis
repository: https://charts.bitnami.com/bitnami
@ -213,7 +243,7 @@ entries:
version: 2.1.0
- apiVersion: v2
appVersion: 4.0.0
created: "2023-10-05T19:54:50.256013255Z"
created: "2024-07-08T21:21:53.89465156Z"
dependencies:
- name: redis
repository: https://charts.bitnami.com/bitnami
@ -228,7 +258,7 @@ entries:
version: 2.0.0
- apiVersion: v2
appVersion: 1.7.0-prod-all-providers
created: "2023-10-05T19:54:50.233063005Z"
created: "2024-07-08T21:21:53.864903432Z"
dependencies:
- name: redis
repository: https://charts.bitnami.com/bitnami
@ -243,7 +273,7 @@ entries:
version: 1.19.0
- apiVersion: v2
appVersion: 1.7.0-prod-all-providers
created: "2023-10-05T19:54:50.22886013Z"
created: "2024-07-08T21:21:53.859409264Z"
dependencies:
- name: redis
repository: https://charts.bitnami.com/bitnami
@ -258,7 +288,7 @@ entries:
version: 1.18.0
- apiVersion: v2
appVersion: 1.7.0-prod-all-providers
created: "2023-10-05T19:54:50.224906171Z"
created: "2024-07-08T21:21:53.854590839Z"
dependencies:
- name: redis
repository: https://charts.bitnami.com/bitnami
@ -273,7 +303,7 @@ entries:
version: 1.17.0
- apiVersion: v2
appVersion: 1.6.0-prod-all-providers
created: "2023-10-05T19:54:50.221327505Z"
created: "2024-07-08T21:21:53.849115017Z"
dependencies:
- name: redis
repository: https://charts.bitnami.com/bitnami
@ -288,7 +318,7 @@ entries:
version: 1.16.0
- apiVersion: v2
appVersion: 1.6.0-prod-all-providers
created: "2023-10-05T19:54:50.217222338Z"
created: "2024-07-08T21:21:53.843819109Z"
dependencies:
- name: redis
repository: https://charts.bitnami.com/bitnami
@ -303,7 +333,7 @@ entries:
version: 1.15.0
- apiVersion: v2
appVersion: 1.6.0-prod-all-providers
created: "2023-10-05T19:54:50.213633963Z"
created: "2024-07-08T21:21:53.839045792Z"
dependencies:
- name: redis
repository: https://charts.bitnami.com/bitnami
@ -318,7 +348,7 @@ entries:
version: 1.14.0
- apiVersion: v2
appVersion: 1.5.0-prod-all-providers
created: "2023-10-05T19:54:50.209512088Z"
created: "2024-07-08T21:21:53.833686087Z"
dependencies:
- name: redis
repository: https://charts.bitnami.com/bitnami
@ -333,7 +363,7 @@ entries:
version: 1.13.0
- apiVersion: v2
appVersion: 1.5.0-prod-all-providers
created: "2023-10-05T19:54:50.205032713Z"
created: "2024-07-08T21:21:53.828886995Z"
dependencies:
- name: redis
repository: https://charts.bitnami.com/bitnami
@ -348,7 +378,7 @@ entries:
version: 1.12.0
- apiVersion: v2
appVersion: 1.4.0-prod-all-providers
created: "2023-10-05T19:54:50.201916171Z"
created: "2024-07-08T21:21:53.824398221Z"
dependencies:
- name: redis
repository: https://charts.bitnami.com/bitnami
@ -363,7 +393,7 @@ entries:
version: 1.11.1
- apiVersion: v2
appVersion: 1.3.0-prod-all-providers
created: "2023-10-05T19:54:50.198635213Z"
created: "2024-07-08T21:21:53.820588339Z"
dependencies:
- name: redis
repository: https://charts.bitnami.com/bitnami
@ -378,7 +408,7 @@ entries:
version: 1.11.0
- apiVersion: v2
appVersion: 1.2.0-prod-all-providers
created: "2023-10-05T19:54:50.194437796Z"
created: "2024-07-08T21:21:53.816316559Z"
dependencies:
- name: redis
repository: https://charts.bitnami.com/bitnami
@ -393,7 +423,7 @@ entries:
version: 1.10.1
- apiVersion: v2
appVersion: 1.2.0-prod-all-providers
created: "2023-10-05T19:54:50.190624213Z"
created: "2024-07-08T21:21:53.812461753Z"
dependencies:
- name: redis
repository: https://charts.bitnami.com/bitnami
@ -408,7 +438,7 @@ entries:
version: 1.10.0
- apiVersion: v2
appVersion: 1.2.0-prod-all-providers
created: "2023-10-05T19:54:50.252056546Z"
created: "2024-07-08T21:21:53.889349659Z"
dependencies:
- name: redis
repository: https://charts.bitnami.com/bitnami
@ -423,7 +453,7 @@ entries:
version: 1.9.0
- apiVersion: v2
appVersion: 1.2.0-prod-all-providers
created: "2023-10-05T19:54:50.249761588Z"
created: "2024-07-08T21:21:53.886495016Z"
dependencies:
- name: redis
repository: https://charts.bitnami.com/bitnami
@ -438,7 +468,7 @@ entries:
version: 1.8.0
- apiVersion: v2
appVersion: 1.0.0-prod-all-providers
created: "2023-10-05T19:54:50.247455838Z"
created: "2024-07-08T21:21:53.883593006Z"
dependencies:
- name: redis
repository: https://charts.bitnami.com/bitnami
@ -453,7 +483,7 @@ entries:
version: 1.7.1
- apiVersion: v2
appVersion: 1.0.0-prod-all-providers
created: "2023-10-05T19:54:50.244773671Z"
created: "2024-07-08T21:21:53.880220899Z"
dependencies:
- name: redis
repository: https://charts.bitnami.com/bitnami
@ -468,7 +498,7 @@ entries:
version: 1.7.0
- apiVersion: v2
appVersion: 1.3.0
created: "2023-10-05T19:54:50.242502046Z"
created: "2024-07-08T21:21:53.877292701Z"
dependencies:
- name: redis
repository: https://charts.bitnami.com/bitnami
@ -483,7 +513,7 @@ entries:
version: 1.6.3
- apiVersion: v2
appVersion: 1.3.0
created: "2023-10-05T19:54:50.240104546Z"
created: "2024-07-08T21:21:53.874287649Z"
dependencies:
- name: redis
repository: https://charts.bitnami.com/bitnami
@ -498,7 +528,7 @@ entries:
version: 1.6.2
- apiVersion: v2
appVersion: 1.3.0
created: "2023-10-05T19:54:50.237562338Z"
created: "2024-07-08T21:21:53.870832057Z"
dependencies:
- name: redis
repository: https://charts.bitnami.com/bitnami
@ -513,7 +543,7 @@ entries:
version: 1.6.1
- apiVersion: v2
appVersion: 1.3.0
created: "2023-10-05T19:54:50.235330338Z"
created: "2024-07-08T21:21:53.867889879Z"
dependencies:
- name: redis
repository: https://charts.bitnami.com/bitnami
@ -526,4 +556,4 @@ entries:
urls:
- https://puppetlabs.github.io/vmpooler-deployment/vmpooler-1.6.0.tgz
version: 1.6.0
generated: "2023-10-05T19:54:50.185752796Z"
generated: "2024-07-08T21:21:53.807574936Z"

BIN
docs/vmpooler-3.8.0.tgz Normal file

Binary file not shown.

BIN
docs/vmpooler-3.8.1.tgz Normal file

Binary file not shown.

View file

@ -3,7 +3,7 @@ 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.7.0
version: 3.8.1
appVersion: 5.6.0
dependencies:
- name: redis

12
helm-package Normal file
View file

@ -0,0 +1,12 @@
#!/usr/bin/env bash
set -e
set -x
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 .

View file

@ -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"