Skip to content

Commit

Permalink
Merge branch 'main' into update-pod-labels
Browse files Browse the repository at this point in the history
  • Loading branch information
zeritti authored Dec 22, 2024
2 parents 959c87f + 8983e10 commit 1b152d6
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 5 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/lint-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:

- uses: actions/setup-python@v5
with:
python-version: '3.7'
python-version: '3.11'

- name: Set up chart-testing
uses: helm/[email protected]
Expand Down Expand Up @@ -62,8 +62,5 @@ jobs:
fi
if: steps.list-changed.outputs.changed == 'true'

- name: Apply Gateway API CRDs
run: kubectl apply -k https://github.com/kubernetes-sigs/gateway-api/config/crd

- name: Run chart-testing (install)
run: ct install --config .github/linters/ct.yaml
2 changes: 1 addition & 1 deletion charts/prometheus-sql-exporter/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
description: Prometheus SQL Exporter
name: prometheus-sql-exporter
version: 0.2.0
version: 0.2.1
appVersion: v0.5.8
home: https://github.com/justwatchcom/sql_exporter
sources:
Expand Down
7 changes: 7 additions & 0 deletions charts/prometheus-sql-exporter/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@ metadata:
name: {{ template "prometheus-sql-exporter.fullname" . }}
labels:
{{- include "prometheus-sql-exporter.labels" . | nindent 4 }}
{{- if .Values.deployment.labels }}
{{- toYaml .Values.deployment.labels | trim | nindent 4 }}
{{- end }}
{{- if .Values.deployment.annotations }}
annotations:
{{- toYaml .Values.deployment.annotations | nindent 4 }}
{{- end }}
spec:
replicas: {{ .Values.replicaCount }}
selector:
Expand Down
5 changes: 5 additions & 0 deletions charts/prometheus-sql-exporter/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,11 @@ annotations: {}

podLabels: {}

# Labels and annotations to attach to the deployment resource
deployment:
annotations: {}
labels: {}

# Configurable health checks
livenessProbe:
initialDelaySeconds: 3
Expand Down

0 comments on commit 1b152d6

Please sign in to comment.