From cf972af0516ea659b6be1c2881d8272b82e1b731 Mon Sep 17 00:00:00 2001 From: Peiman Jafari <18074432+peimanja@users.noreply.github.com> Date: Tue, 7 Feb 2023 06:08:00 -0800 Subject: [PATCH] [prometheus-artifactory-exporter] Bump the exporter version to 1.12.0 (#12) --- .github/workflows/codespell.yaml | 2 +- .github/workflows/lint-test.yaml | 10 +++++----- .github/workflows/linter.yml | 3 ++- .github/workflows/release.yaml | 10 +++------- charts/prometheus-artifactory-exporter/Chart.yaml | 4 ++-- .../templates/podsecuritypolicy.yaml | 6 +----- charts/prometheus-artifactory-exporter/values.yaml | 3 ++- 7 files changed, 16 insertions(+), 22 deletions(-) diff --git a/.github/workflows/codespell.yaml b/.github/workflows/codespell.yaml index 0cf4215..f2bf1a5 100644 --- a/.github/workflows/codespell.yaml +++ b/.github/workflows/codespell.yaml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Code - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Codespell uses: codespell-project/actions-codespell@master with: diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index 2db4624..15257cd 100644 --- a/.github/workflows/lint-test.yaml +++ b/.github/workflows/lint-test.yaml @@ -12,16 +12,16 @@ jobs: fetch-depth: 0 - name: Set up Helm - uses: azure/setup-helm@v2.0 + uses: azure/setup-helm@v3 with: version: v3.8.1 - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v4 with: python-version: 3.7 - name: Set up chart-testing - uses: helm/chart-testing-action@v2.2.1 + uses: helm/chart-testing-action@v2.3.1 - name: Run chart-testing (list-changed) id: list-changed @@ -35,13 +35,13 @@ jobs: if: steps.list-changed.outputs.changed == 'true' run: | helm env - helm plugin install https://github.com/quintush/helm-unittest.git --version 0.2.8 + helm plugin install https://github.com/quintush/helm-unittest.git --version 0.2.11 - name: Run chart-testing (lint) run: ct lint --config ct.yaml - name: Create kind cluster - uses: helm/kind-action@v1.2.0 + uses: helm/kind-action@v1.4.0 if: steps.list-changed.outputs.changed == 'true' - name: Run chart-testing (install) diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index 8bcc005..6e11ada 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -11,7 +11,8 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Code - uses: actions/checkout@v2 + uses: actions/checkout@v3 + - name: Lint Code Base uses: docker://github/super-linter:v3.12.0 env: diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index fe0813b..1fc34de 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Fetch history run: git fetch --prune --unshallow @@ -20,14 +20,10 @@ jobs: git config user.name "$GITHUB_ACTOR" git config user.email "$GITHUB_ACTOR@users.noreply.github.com" - # See https://github.com/helm/chart-releaser-action/issues/6 - name: Install Helm - run: | - curl -fsSLo get_helm.sh https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 - chmod 700 get_helm.sh - ./get_helm.sh + uses: azure/setup-helm@v3 - name: Run chart-releaser - uses: helm/chart-releaser-action@v1.0.0 + uses: helm/chart-releaser-action@v1.5.0 env: CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}" diff --git a/charts/prometheus-artifactory-exporter/Chart.yaml b/charts/prometheus-artifactory-exporter/Chart.yaml index 5125971..8eeb231 100644 --- a/charts/prometheus-artifactory-exporter/Chart.yaml +++ b/charts/prometheus-artifactory-exporter/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 -appVersion: "1.10.0" +appVersion: "1.12.0" description: A Helm chart for the Prometheus Artifactory Exporter name: prometheus-artifactory-exporter -version: 0.4.0 +version: 0.5.0 keywords: - metrics - artifactory diff --git a/charts/prometheus-artifactory-exporter/templates/podsecuritypolicy.yaml b/charts/prometheus-artifactory-exporter/templates/podsecuritypolicy.yaml index d8c3441..058c801 100644 --- a/charts/prometheus-artifactory-exporter/templates/podsecuritypolicy.yaml +++ b/charts/prometheus-artifactory-exporter/templates/podsecuritypolicy.yaml @@ -1,9 +1,5 @@ -{{- if .Values.rbac.pspEnabled }} -{{- if .Capabilities.APIVersions.Has "policy/v1beta1" }} +{{- if and .Values.rbac.pspEnabled (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") }} apiVersion: policy/v1beta1 -{{ else }} -apiVersion: extensions/v1beta1 -{{ end -}} kind: PodSecurityPolicy metadata: name: {{ template "prometheus-artifactory-exporter.fullname" . }} diff --git a/charts/prometheus-artifactory-exporter/values.yaml b/charts/prometheus-artifactory-exporter/values.yaml index 5a34e1b..0c790b6 100644 --- a/charts/prometheus-artifactory-exporter/values.yaml +++ b/charts/prometheus-artifactory-exporter/values.yaml @@ -19,7 +19,7 @@ image: registry: ghcr.io repository: peimanja/artifactory_exporter # set to canary for the latest unreleased version - tag: v1.10.0 + tag: v1.12.0 pullPolicy: IfNotPresent nameOverride: "" @@ -48,6 +48,7 @@ options: # visit https://github.com/peimanja/artifactory_exporter#optional-metrics for more details optionalMetrics: [] # - replication_status + # - federation_status service: type: ClusterIP