Skip to content

Commit fbff06e

Browse files
Merge pull request #181 from codefresh-io/CR-29629-rollouts-fix-helm-test
chore: fix helm lint for argo-cd chart
2 parents 28b1128 + e70cb45 commit fbff06e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+5757
-369
lines changed

.github/workflows/lint-and-test.yml

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
options: --user 1001
1414
steps:
1515
- name: Checkout
16-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
16+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1717
- name: Run ah lint
1818
working-directory: ./charts
1919
run: ah lint
@@ -22,40 +22,40 @@ jobs:
2222
runs-on: ubuntu-latest
2323
steps:
2424
- name: Checkout
25-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
25+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2626
with:
2727
fetch-depth: 0
2828

2929
- name: Set up Helm
30-
uses: azure/setup-helm@fe7b79cd5ee1e45176fcad797de68ecaf3ca4814 # v4.2.0
30+
uses: azure/setup-helm@b9e51907a09c216f16ebe8536097933489208112 # v4.3.0
3131
with:
3232
version: v3.10.1 # Also update in publish.yaml
3333

3434
- name: Set up python
35-
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
35+
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
3636
with:
3737
python-version: 3.9
3838

3939
- name: Setup Chart Linting
4040
id: lint
41-
uses: helm/chart-testing-action@e6669bcd63d7cb57cb4380c33043eebe5d111992 # v2.6.1
41+
uses: helm/chart-testing-action@0d28d3144d3a25ea2cc349d6e59901c4ff469b3b # v2.7.0
4242
with:
4343
# Note: Also update in scripts/lint.sh
44-
version: v3.10.0
44+
version: v3.11.0
4545

4646
- name: List changed charts
4747
id: list-changed
4848
run: |
4949
## If executed with debug this won't work anymore.
50-
changed=$(ct --config ./.github/configs/ct-lint.yaml list-changed)
50+
changed=$(ct --config ./.github/configs/ct-lint.yaml --target-branch ${{ github.base_ref }} list-changed)
5151
charts=$(echo "$changed" | tr '\n' ' ' | xargs)
5252
if [[ -n "$changed" ]]; then
5353
echo "changed=true" >> $GITHUB_OUTPUT
5454
echo "changed_charts=$charts" >> $GITHUB_OUTPUT
5555
fi
5656
5757
- name: Run chart-testing (lint)
58-
run: ct lint --debug --config ./.github/configs/ct-lint.yaml --lint-conf ./.github/configs/lintconf.yaml
58+
run: ct lint --debug --config ./.github/configs/ct-lint.yaml --target-branch ${{ github.base_ref }} --lint-conf ./.github/configs/lintconf.yaml
5959

6060
- name: Run docs-testing (helm-docs)
6161
id: helm-docs
@@ -70,20 +70,11 @@ jobs:
7070
fi
7171
7272
- name: Create kind cluster
73-
uses: helm/kind-action@0025e74a8c7512023d06dc019c617aa3cf561fde # v1.10.0
73+
uses: helm/kind-action@a1b0e391336a6ee6713a0583f8c6240d70863de3 # v1.12.0
7474
if: steps.list-changed.outputs.changed == 'true'
7575
with:
7676
config: .github/configs/kind-config.yaml
7777

78-
- name: Deploy latest ArgoCD CRDs when testing ArgoCD extensions
79-
if: |
80-
contains(steps.list-changed.outputs.changed_charts, 'argocd-image-updater') ||
81-
contains(steps.list-changed.outputs.changed_charts, 'argocd-apps')
82-
run: |
83-
helm repo add dandydeveloper https://dandydeveloper.github.io/charts/
84-
helm dependency build charts/argo-cd/
85-
helm template charts/argo-cd/ --set server.extensions.enabled=true -s templates/crds/* | kubectl apply -f -
86-
8778
- name: Skip HPA tests of ArgoCD
8879
if: contains(steps.list-changed.outputs.changed_charts, 'argo-cd')
8980
run: |
@@ -98,5 +89,5 @@ jobs:
9889
helm install redis bitnami/redis --wait --namespace redis --set auth.password=argocd --set architecture=standalone
9990
10091
- name: Run chart-testing (install)
101-
run: ct install --config ./.github/configs/ct-install.yaml
92+
run: ct install --config ./.github/configs/ct-install.yaml --target-branch ${{ github.base_ref }}
10293
if: steps.list-changed.outputs.changed == 'true'

charts/argo-cd/Chart.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dependencies:
22
- name: redis-ha
33
repository: https://dandydeveloper.github.io/charts/
4-
version: 4.26.1
5-
digest: sha256:d72c308ab0eef4233e25bfc3f8fc97cf9b02a9c5d0186ea89e2f8fb332cb9c41
6-
generated: "2024-02-18T19:42:53.135599+02:00"
4+
version: 4.33.4
5+
digest: sha256:0b29877775aa5af33b15df29c9acb92e99a5b90759d3223c5dde281b978c0fe6
6+
generated: "2025-06-08T11:20:09.721359+03:00"

charts/argo-cd/Chart.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
apiVersion: v2
2-
appVersion: v2.11.7
3-
kubeVersion: ">=1.23.0-0"
2+
appVersion: v3.0.2-2025-06-24-979b8c8e
3+
kubeVersion: ">=1.25.0-0"
44
description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
55
name: argo-cd
6-
version: 7.3.11
6+
version: 8.0.6-3-cap-v3.0.2-2025-06-24-979b8c8e
77
home: https://github.com/argoproj/argo-helm
88
icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
99
sources:
@@ -18,7 +18,7 @@ maintainers:
1818
url: https://argoproj.github.io/
1919
dependencies:
2020
- name: redis-ha
21-
version: 4.26.1
21+
version: 4.33.4
2222
repository: https://dandydeveloper.github.io/charts/
2323
condition: redis-ha.enabled
2424
annotations:
@@ -27,4 +27,4 @@ annotations:
2727
url: https://argoproj.github.io/argo-helm/pgp_keys.asc
2828
artifacthub.io/changes: |
2929
- kind: changed
30-
description: Bump argo-cd to v2.11.7
30+
description: Upgraded ubuntu base image to 25.04 and aligned git-lfs installation with upstream

0 commit comments

Comments
 (0)