From 12212d7dc5da18815affac3b9ec0532ff792ff25 Mon Sep 17 00:00:00 2001 From: Kwong Tung Nan Date: Tue, 17 Dec 2024 17:13:06 +0800 Subject: [PATCH 1/6] Add & fix metrics endpoint --- charts/pgcat/Chart.yaml | 2 +- charts/pgcat/templates/deployment.yaml | 3 +++ charts/pgcat/templates/prometheus_exporter.yaml | 16 ++++++++++++++++ charts/pgcat/templates/service.yaml | 4 ++++ 4 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 charts/pgcat/templates/prometheus_exporter.yaml diff --git a/charts/pgcat/Chart.yaml b/charts/pgcat/Chart.yaml index 430c839b..6ffced79 100644 --- a/charts/pgcat/Chart.yaml +++ b/charts/pgcat/Chart.yaml @@ -5,4 +5,4 @@ maintainers: - name: PostgresML email: team@postgresml.org appVersion: "1.2.0" -version: 0.2.5 +version: 0.2.6 diff --git a/charts/pgcat/templates/deployment.yaml b/charts/pgcat/templates/deployment.yaml index 84c57f1b..1ca1b328 100644 --- a/charts/pgcat/templates/deployment.yaml +++ b/charts/pgcat/templates/deployment.yaml @@ -36,6 +36,9 @@ spec: - name: pgcat containerPort: {{ .Values.configuration.general.port }} protocol: TCP + - name: metrics + containerPort: {{ .Values.configuration.general.prometheus_exporter_port }} + protocol: TCP livenessProbe: tcpSocket: port: pgcat diff --git a/charts/pgcat/templates/prometheus_exporter.yaml b/charts/pgcat/templates/prometheus_exporter.yaml new file mode 100644 index 00000000..1d2b9663 --- /dev/null +++ b/charts/pgcat/templates/prometheus_exporter.yaml @@ -0,0 +1,16 @@ +apiVersion: monitoring.coreos.com/v1 +kind: PodMonitor +metadata: + name: {{ include "pgcat.fullname" . }} + labels: + {{- include "pgcat.labels" . | nindent 4 }} +spec: + podMetricsEndpoints: + - interval: 10s + path: /metrics + scheme: http + targetPort: {{ .Values.configuration.general.prometheus_exporter_port }} + selector: + matchLabels: + app.kubernetes.io/instance: pgcat + app.kubernetes.io/name: pgcat diff --git a/charts/pgcat/templates/service.yaml b/charts/pgcat/templates/service.yaml index 56c4be71..31cfd21b 100644 --- a/charts/pgcat/templates/service.yaml +++ b/charts/pgcat/templates/service.yaml @@ -11,5 +11,9 @@ spec: targetPort: pgcat protocol: TCP name: pgcat + - port: {{ .Values.configuration.general.prometheus_exporter_port }} + targetPort: metrics + protocol: TCP + name: metrics selector: {{- include "pgcat.selectorLabels" . | nindent 4 }} From 2a444a2b54b9fcdeaf38e67764262959a770e5b5 Mon Sep 17 00:00:00 2001 From: Kwong Tung Nan Date: Tue, 17 Dec 2024 17:23:15 +0800 Subject: [PATCH 2/6] Add enable_prometheus_exporter to podmonitor Signed-off-by: Kwong Tung Nan --- charts/pgcat/templates/prometheus_exporter.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/charts/pgcat/templates/prometheus_exporter.yaml b/charts/pgcat/templates/prometheus_exporter.yaml index 1d2b9663..5c640174 100644 --- a/charts/pgcat/templates/prometheus_exporter.yaml +++ b/charts/pgcat/templates/prometheus_exporter.yaml @@ -1,3 +1,4 @@ +{{- if .Values.configuration.general.enable_prometheus_exporter }} apiVersion: monitoring.coreos.com/v1 kind: PodMonitor metadata: @@ -14,3 +15,4 @@ spec: matchLabels: app.kubernetes.io/instance: pgcat app.kubernetes.io/name: pgcat +{{- end }} From 83f44fe2a0d8c8a083c881ec9bbf084af087125a Mon Sep 17 00:00:00 2001 From: Kwong Tung Nan Date: Tue, 17 Dec 2024 17:23:54 +0800 Subject: [PATCH 3/6] Make semver be 0.3.0 as it may potentially break existing setup Signed-off-by: Kwong Tung Nan --- charts/pgcat/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/pgcat/Chart.yaml b/charts/pgcat/Chart.yaml index 6ffced79..d91c1f21 100644 --- a/charts/pgcat/Chart.yaml +++ b/charts/pgcat/Chart.yaml @@ -5,4 +5,4 @@ maintainers: - name: PostgresML email: team@postgresml.org appVersion: "1.2.0" -version: 0.2.6 +version: 0.3.0 From 1a8981c7beb1044cd2ff6f1261aad60d426be7c7 Mon Sep 17 00:00:00 2001 From: Kwong Tung Nan Date: Tue, 17 Dec 2024 17:32:28 +0800 Subject: [PATCH 4/6] Remove prometheus exporter port from service Signed-off-by: Kwong Tung Nan --- charts/pgcat/templates/service.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/charts/pgcat/templates/service.yaml b/charts/pgcat/templates/service.yaml index 31cfd21b..56c4be71 100644 --- a/charts/pgcat/templates/service.yaml +++ b/charts/pgcat/templates/service.yaml @@ -11,9 +11,5 @@ spec: targetPort: pgcat protocol: TCP name: pgcat - - port: {{ .Values.configuration.general.prometheus_exporter_port }} - targetPort: metrics - protocol: TCP - name: metrics selector: {{- include "pgcat.selectorLabels" . | nindent 4 }} From f2cc8cd174becacc4a9682ef68db6f1d44aecc58 Mon Sep 17 00:00:00 2001 From: Kwong Tung Nan Date: Tue, 17 Dec 2024 17:40:54 +0800 Subject: [PATCH 5/6] Bump actions/checkout to v4 Signed-off-by: Kwong Tung Nan --- .github/workflows/chart-lint-test.yaml | 2 +- .github/workflows/chart-release.yaml | 2 +- .github/workflows/generate-chart-readme.yaml | 2 +- .github/workflows/publish-ci-docker-image.yml | 2 +- .github/workflows/publish-deb-package.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/chart-lint-test.yaml b/.github/workflows/chart-lint-test.yaml index c19789fb..c947c62e 100644 --- a/.github/workflows/chart-lint-test.yaml +++ b/.github/workflows/chart-lint-test.yaml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3.1.0 + uses: actions/checkout@v4 with: fetch-depth: 0 diff --git a/.github/workflows/chart-release.yaml b/.github/workflows/chart-release.yaml index fa572724..64630a5b 100644 --- a/.github/workflows/chart-release.yaml +++ b/.github/workflows/chart-release.yaml @@ -17,7 +17,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0 + uses: actions/checkout@v4 with: fetch-depth: 0 diff --git a/.github/workflows/generate-chart-readme.yaml b/.github/workflows/generate-chart-readme.yaml index affc40cf..c68bf40c 100644 --- a/.github/workflows/generate-chart-readme.yaml +++ b/.github/workflows/generate-chart-readme.yaml @@ -17,7 +17,7 @@ jobs: - name: Install readme-generator-for-helm run: npm install -g @bitnami/readme-generator-for-helm - name: Checkout - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 + uses: actions/checkout@v4 with: path: charts ref: ${{github.event.pull_request.head.ref}} diff --git a/.github/workflows/publish-ci-docker-image.yml b/.github/workflows/publish-ci-docker-image.yml index 5df4fd48..b0b88ab4 100644 --- a/.github/workflows/publish-ci-docker-image.yml +++ b/.github/workflows/publish-ci-docker-image.yml @@ -6,7 +6,7 @@ jobs: publish-ci-docker-image: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Login to GitHub Container Registry uses: docker/login-action@v1 with: diff --git a/.github/workflows/publish-deb-package.yml b/.github/workflows/publish-deb-package.yml index dbb7abd8..b9e97a61 100644 --- a/.github/workflows/publish-deb-package.yml +++ b/.github/workflows/publish-deb-package.yml @@ -18,7 +18,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set package version if: github.event_name == 'push' # For push event run: | From dd5d57f4dcf90c3a3b6f52fb07135dd0cdb8bff8 Mon Sep 17 00:00:00 2001 From: Kwong Tung Nan Date: Tue, 17 Dec 2024 17:59:33 +0800 Subject: [PATCH 6/6] Fix github actions Signed-off-by: Kwong Tung Nan --- .github/workflows/chart-lint-test.yaml | 14 +++++--------- .github/workflows/chart-release.yaml | 6 ++---- .github/workflows/publish-ci-docker-image.yml | 2 +- .github/workflows/publish-deb-package.yml | 2 +- 4 files changed, 9 insertions(+), 15 deletions(-) diff --git a/.github/workflows/chart-lint-test.yaml b/.github/workflows/chart-lint-test.yaml index c947c62e..750ea19c 100644 --- a/.github/workflows/chart-lint-test.yaml +++ b/.github/workflows/chart-lint-test.yaml @@ -15,21 +15,17 @@ jobs: fetch-depth: 0 - name: Set up Helm - uses: azure/setup-helm@v3 - with: - version: v3.8.1 + uses: azure/setup-helm@v4 # Python is required because `ct lint` runs Yamale (https://github.com/23andMe/Yamale) and # yamllint (https://github.com/adrienverge/yamllint) which require Python - name: Set up Python - uses: actions/setup-python@v5.1.0 + uses: actions/setup-python@v5 with: - python-version: 3.7 + python-version: 3.13 - name: Set up chart-testing - uses: helm/chart-testing-action@v2.2.1 - with: - version: v3.5.1 + uses: helm/chart-testing-action@v2 - name: Run chart-testing (list-changed) id: list-changed @@ -43,7 +39,7 @@ jobs: run: ct lint --config ct.yaml - name: Create kind cluster - uses: helm/kind-action@v1.10.0 + uses: helm/kind-action@v1 if: steps.list-changed.outputs.changed == 'true' - name: Run chart-testing (install) diff --git a/.github/workflows/chart-release.yaml b/.github/workflows/chart-release.yaml index 64630a5b..6e6540f8 100644 --- a/.github/workflows/chart-release.yaml +++ b/.github/workflows/chart-release.yaml @@ -27,12 +27,10 @@ jobs: git config user.email "$GITHUB_ACTOR@users.noreply.github.com" - name: Install Helm - uses: azure/setup-helm@5119fcb9089d432beecbf79bb2c7915207344b78 # v3.5 - with: - version: v3.13.0 + uses: azure/setup-helm@v4 - name: Run chart-releaser - uses: helm/chart-releaser-action@a917fd15b20e8b64b94d9158ad54cd6345335584 # v1.6.0 + uses: helm/chart-releaser-action@v1 with: charts_dir: charts config: cr.yaml diff --git a/.github/workflows/publish-ci-docker-image.yml b/.github/workflows/publish-ci-docker-image.yml index b0b88ab4..cc0de246 100644 --- a/.github/workflows/publish-ci-docker-image.yml +++ b/.github/workflows/publish-ci-docker-image.yml @@ -8,7 +8,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Login to GitHub Container Registry - uses: docker/login-action@v1 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.actor }} diff --git a/.github/workflows/publish-deb-package.yml b/.github/workflows/publish-deb-package.yml index b9e97a61..7d8ee8b2 100644 --- a/.github/workflows/publish-deb-package.yml +++ b/.github/workflows/publish-deb-package.yml @@ -27,7 +27,7 @@ jobs: - name: Set package version (manual dispatch) if: github.event_name == 'workflow_dispatch' # For manual dispatch run: echo "packageVersion=${{ github.event.inputs.packageVersion }}" >> "$GITHUB_ENV" - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@v1 with: toolchain: stable - name: Install dependencies