diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index c3cfc367fe10..de10d34ccbec 100644 --- a/.github/workflows/lint-test.yaml +++ b/.github/workflows/lint-test.yaml @@ -18,17 +18,17 @@ jobs: - uses: actions/setup-python@v4 with: - python-version: 3.7 + python-version: '3.7' - name: Set up chart-testing - uses: helm/chart-testing-action@v2.4.0 + uses: helm/chart-testing-action@v2.6.1 - name: Run chart-testing (list-changed) id: list-changed run: | - changed=$(ct list-changed --config .github/linters/ct.yaml) + changed="$(ct list-changed --config .github/linters/ct.yaml)" if [[ -n "$changed" ]]; then - echo "changed=true" >> $GITHUB_OUTPUT + echo "changed=true" >> "$GITHUB_OUTPUT" fi # - name: install helm unittest plugin diff --git a/charts/jiralert/Chart.yaml b/charts/jiralert/Chart.yaml index e27ac04e8909..24a32050e477 100755 --- a/charts/jiralert/Chart.yaml +++ b/charts/jiralert/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: jiralert description: A Helm chart for Kubernetes to install jiralert type: application -version: 1.6.0 +version: 1.6.1 appVersion: "v1.3.0" home: "https://github.com/prometheus-community/jiralert" keywords: diff --git a/charts/jiralert/ci/example-receivers-values.yaml b/charts/jiralert/ci/test-values.yaml similarity index 82% rename from charts/jiralert/ci/example-receivers-values.yaml rename to charts/jiralert/ci/test-values.yaml index 665604814946..45e98811001a 100644 --- a/charts/jiralert/ci/example-receivers-values.yaml +++ b/charts/jiralert/ci/test-values.yaml @@ -5,3 +5,6 @@ config: receivers: - name: 'default' project: EXAMPLE + +ingress: + enabled: true diff --git a/charts/jiralert/templates/ingress.yaml b/charts/jiralert/templates/ingress.yaml index 6d48cf9ec8d9..88f312580657 100644 --- a/charts/jiralert/templates/ingress.yaml +++ b/charts/jiralert/templates/ingress.yaml @@ -1,12 +1,11 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "jiralert.fullname" . -}} -{{- $svcPort := .Values.service.port -}} {{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }} {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }} {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}} {{- end }} {{- end }} -apiVersion: {{template "jiralert.ingress.apiversion" . }} +apiVersion: {{ template "jiralert.ingress.apiversion" . }} kind: Ingress metadata: name: {{ $fullName }} @@ -49,10 +48,10 @@ spec: service: name: {{ $fullName }} port: - number: {{ $svcPort }} + number: 9097 {{- else }} serviceName: {{ $fullName }} - servicePort: {{ $svcPort }} + servicePort: 9097 {{- end }} {{- end }} {{- end }}