diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 82dd703..cf4b6f2 100644 --- a/.github/workflows/release.yml +++ b/.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: | diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 374e8f8..7afe28d 100644 --- a/.github/workflows/test.yml +++ b/.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 diff --git a/helm-charts/vmpooler/Chart.lock b/helm-charts/vmpooler/Chart.lock index d5fddf2..3c00010 100644 --- a/helm-charts/vmpooler/Chart.lock +++ b/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" diff --git a/helm-charts/vmpooler/Chart.yaml b/helm-charts/vmpooler/Chart.yaml index 26eb5a8..0a57624 100644 --- a/helm-charts/vmpooler/Chart.yaml +++ b/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.9.0 +version: 3.9.1 appVersion: 5.7.0 dependencies: - name: redis - repository: https://charts.bitnami.com/bitnami + repository: https://artifactory.delivery.puppetlabs.net/artifactory/helm__local version: 16.13.2 diff --git a/helm-charts/vmpooler/values.yaml b/helm-charts/vmpooler/values.yaml index 65bdc28..e251dfa 100644 --- a/helm-charts/vmpooler/values.yaml +++ b/helm-charts/vmpooler/values.yaml @@ -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: @@ -164,6 +170,11 @@ redis: - -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: diff --git a/helm-package b/helm-package index a172c6a..d5e9b07 100644 --- a/helm-package +++ b/helm-package @@ -3,7 +3,7 @@ set -e set -x -helm repo add bitnami https://charts.bitnami.com/bitnami +helm repo add artifactory https://artifactory.delivery.puppetlabs.net/artifactory/helm__local cd /apps/helm-charts/vmpooler helm dependency update cd /apps/docs diff --git a/update-chart-lock b/update-chart-lock index 8748596..dff98f5 100755 --- a/update-chart-lock +++ b/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'