Merge branch 'main' into test_redis_update

puppetlabs · Aug 8, 2023 · 3a1864b · 3a1864b
2 parents 1f30144 + fcad67b
commit 3a1864b
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 36 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -77,26 +77,26 @@ jobs:
             console.log('return:', returnValue);
             return returnValue;
 
-      # - name: Generate Changelog
-      #   uses: docker://githubchangeloggenerator/github-changelog-generator:1.16.2
-      #   with:
-      #     args: >-
-      #       --future-release ${{ steps.nv.outputs.version }}
-      #   env:
-      #     CHANGELOG_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      # - name: Validate Changelog
-      #   run : |
-      #     set -e
-      #     if [[ -n $(git status --porcelain) ]]; then
-      #       echo "Here is the current git status:"
-      #       git status
-      #       echo
-      #       echo "The following changes were detected:"
-      #       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 }}'"
-      #       exit 1
-      #     fi
+      - name: Generate Changelog
+        uses: docker://githubchangeloggenerator/github-changelog-generator:1.16.2
+        with:
+          args: >-
+            --future-release ${{ steps.nv.outputs.version }}
+        env:
+          CHANGELOG_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Validate Changelog
+        run : |
+          set -e
+          if [[ -n $(git status --porcelain) ]]; then
+            echo "Here is the current git status:"
+            git status
+            echo
+            echo "The following changes were detected:"
+            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 }}'"
+            exit 1
+          fi
 
       - name: Generate Release Notes
         uses: docker://githubchangeloggenerator/github-changelog-generator:1.16.2

diff --git a/README.md b/README.md
@@ -1,17 +1,15 @@
 # vmpooler-deployment
 
-- [vmpooler-deployment](#vmpooler-deployment)
-  - [VMPooler Components](#vmpooler-components)
-  - [Docker Registry](#docker-registry)
-  - [Helm Repository](#helm-repository)
-    - [Adding / updating charts](#adding--updating-charts)
-  - [Development](#development)
-    - [Docker Compose URLs](#docker-compose-urls)
-    - [Deploy Chart for Testing](#deploy-chart-for-testing)
-  - [Submitting Issues](#submitting-issues)
-  - [Releasing](#releasing)
-  - [Contributing](#contributing)
-  - [License](#license)
+- [VMPooler Components](#vmpooler-components)
+- [Docker Registry](#docker-registry)
+- [Helm Repository](#helm-repository)
+  - [Adding / updating charts](#adding--updating-charts)
+- [Development](#development)
+  - [Docker Compose URLs](#docker-compose-urls)
+  - [Deploy Chart for Testing](#deploy-chart-for-testing)
+- [Releasing](#releasing)
+- [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.