From 58a695eb71c951a0eef79f1ec68fec7563c25d55 Mon Sep 17 00:00:00 2001 From: Andrey Taranik Date: Sun, 12 Nov 2023 23:15:04 +0300 Subject: [PATCH 1/6] update in github actions --- .github/workflows/lint-test.yaml | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index 70681ab..19eae4f 100644 --- a/.github/workflows/lint-test.yaml +++ b/.github/workflows/lint-test.yaml @@ -7,24 +7,24 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 0 - name: Set up Helm - uses: azure/setup-helm@v1 + uses: azure/setup-helm@v3 with: - version: v3.6.2 + version: v3.12.1 # 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@v2 + uses: actions/setup-python@v4 with: - python-version: 3.8 + python-version: 3.10 - name: Set up chart-testing - uses: helm/chart-testing-action@v2.1.0 + uses: helm/chart-testing-action@v2.6.0 - name: Run chart-testing (list-changed) id: list-changed @@ -37,10 +37,8 @@ jobs: - name: Run chart-testing (lint) run: ct lint --config ct.yaml - - name: Create k3d cluster - uses: nolar/setup-k3d-k3s@v1 - with: - version: "v1.25.15+k3s1" + - name: Create k8s Kind cluster + uses: helm/kind-action@v1.8.0 - name: Run chart-testing (install) run: ct install --config ct.yaml From 09235c1d3f2a651d60084a7ff60720be9618458c Mon Sep 17 00:00:00 2001 From: Andrey Taranik Date: Sun, 12 Nov 2023 23:19:12 +0300 Subject: [PATCH 2/6] revert python version in chart testing --- .github/workflows/lint-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index 19eae4f..6219b01 100644 --- a/.github/workflows/lint-test.yaml +++ b/.github/workflows/lint-test.yaml @@ -21,7 +21,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: 3.10 + python-version: 3.8 - name: Set up chart-testing uses: helm/chart-testing-action@v2.6.0 From 3b78f1035f709d614bd56427ed7e93e61a35934d Mon Sep 17 00:00:00 2001 From: Andrey Taranik Date: Sun, 12 Nov 2023 23:26:03 +0300 Subject: [PATCH 3/6] revert timezone in aws-cost-reporter chart --- charts/aws-cost-reporter/Chart.yaml | 2 +- charts/aws-cost-reporter/README.md | 2 +- charts/aws-cost-reporter/templates/cronjob.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/aws-cost-reporter/Chart.yaml b/charts/aws-cost-reporter/Chart.yaml index 424fb5b..639fa84 100644 --- a/charts/aws-cost-reporter/Chart.yaml +++ b/charts/aws-cost-reporter/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: aws-cost-reporter description: AWS Cost Reporter type: application -version: 1.0.0 +version: 1.0.1 appVersion: "v0.1.0" sources: - https://github.com/neondatabase/aws-cost-reporter diff --git a/charts/aws-cost-reporter/README.md b/charts/aws-cost-reporter/README.md index 82da3ff..be7eda9 100644 --- a/charts/aws-cost-reporter/README.md +++ b/charts/aws-cost-reporter/README.md @@ -1,6 +1,6 @@ # aws-cost-reporter -![Version: 1.0.0](https://img.shields.io/badge/Version-1.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) [![Lint and Test Charts](https://github.com/neondatabase/helm-charts/actions/workflows/lint-test.yaml/badge.svg)](https://github.com/neondatabase/helm-charts/actions/workflows/lint-test.yaml) +![Version: 1.0.1](https://img.shields.io/badge/Version-1.0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) [![Lint and Test Charts](https://github.com/neondatabase/helm-charts/actions/workflows/lint-test.yaml/badge.svg)](https://github.com/neondatabase/helm-charts/actions/workflows/lint-test.yaml) AWS Cost Reporter diff --git a/charts/aws-cost-reporter/templates/cronjob.yaml b/charts/aws-cost-reporter/templates/cronjob.yaml index 5e736c5..52f2665 100644 --- a/charts/aws-cost-reporter/templates/cronjob.yaml +++ b/charts/aws-cost-reporter/templates/cronjob.yaml @@ -5,7 +5,7 @@ metadata: labels: {{- include "aws-cost-reporter.labels" . | nindent 4 }} spec: - #timeZone: "Etc/UTC" + timeZone: "Etc/UTC" schedule: '0 12 * * *' jobTemplate: metadata: From 218a862e01f0fb9d565591a97652282e13d15b2e Mon Sep 17 00:00:00 2001 From: Andrey Taranik Date: Sun, 12 Nov 2023 23:30:57 +0300 Subject: [PATCH 4/6] test all charts --- .github/workflows/lint-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index 6219b01..ae76343 100644 --- a/.github/workflows/lint-test.yaml +++ b/.github/workflows/lint-test.yaml @@ -41,4 +41,4 @@ jobs: uses: helm/kind-action@v1.8.0 - name: Run chart-testing (install) - run: ct install --config ct.yaml + run: ct install --all --config ct.yaml From 9431f06c33ad7892748cd357ff15d909238a712e Mon Sep 17 00:00:00 2001 From: Andrey Taranik Date: Mon, 13 Nov 2023 00:13:09 +0300 Subject: [PATCH 5/6] fix in aws-cost-reporter --- .github/workflows/lint-test.yaml | 2 +- charts/aws-cost-reporter/templates/cronjob.yaml | 2 +- ct.yaml | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index ae76343..6219b01 100644 --- a/.github/workflows/lint-test.yaml +++ b/.github/workflows/lint-test.yaml @@ -41,4 +41,4 @@ jobs: uses: helm/kind-action@v1.8.0 - name: Run chart-testing (install) - run: ct install --all --config ct.yaml + run: ct install --config ct.yaml diff --git a/charts/aws-cost-reporter/templates/cronjob.yaml b/charts/aws-cost-reporter/templates/cronjob.yaml index 52f2665..ac8d02d 100644 --- a/charts/aws-cost-reporter/templates/cronjob.yaml +++ b/charts/aws-cost-reporter/templates/cronjob.yaml @@ -6,7 +6,7 @@ metadata: {{- include "aws-cost-reporter.labels" . | nindent 4 }} spec: timeZone: "Etc/UTC" - schedule: '0 12 * * *' + schedule: '0 18 * * *' jobTemplate: metadata: name: {{ include "aws-cost-reporter.fullname" . }} diff --git a/ct.yaml b/ct.yaml index aa12a38..6a0c023 100644 --- a/ct.yaml +++ b/ct.yaml @@ -5,6 +5,3 @@ chart-dirs: - charts helm-extra-args: "--timeout 600s" validate-maintainers: false - -# aws-cost-reporter chart install cronjob resource that impossible test with ct -excluded-charts: aws-cost-reporter From d477cf6bdf74e9f97095de3dfbff51ccbf921dba Mon Sep 17 00:00:00 2001 From: Andrey Taranik Date: Mon, 13 Nov 2023 00:20:05 +0300 Subject: [PATCH 6/6] fix in ct settings --- .github/workflows/lint-test.yaml | 4 ++-- ct.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index 6219b01..77290ea 100644 --- a/.github/workflows/lint-test.yaml +++ b/.github/workflows/lint-test.yaml @@ -21,10 +21,10 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: 3.8 + python-version: '3.10' - name: Set up chart-testing - uses: helm/chart-testing-action@v2.6.0 + uses: helm/chart-testing-action@v2.6.1 - name: Run chart-testing (list-changed) id: list-changed diff --git a/ct.yaml b/ct.yaml index 6a0c023..894e423 100644 --- a/ct.yaml +++ b/ct.yaml @@ -3,5 +3,5 @@ remote: origin target-branch: main chart-dirs: - charts -helm-extra-args: "--timeout 600s" +helm-extra-args: '--timeout 600s' validate-maintainers: false