Skip to content

Commit 1a55354

Browse files
initialize argo-cd
1 parent c8f7efb commit 1a55354

File tree

4 files changed

+9
-20
lines changed

4 files changed

+9
-20
lines changed

.github/configs/ct-install.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
# Don't add the 'debug' attribute, otherwise the workflow won't work anymore
33
# Only Used for the CT Install Stage
44
remote: origin
5-
target-branch: main
6-
chart-dirs:
7-
- charts
5+
charts:
6+
- charts/argo-cd
87
chart-repos:
98
- dandydeveloper=https://dandydeveloper.github.io/charts/
109
helm-extra-args: "--timeout 600s"

.github/configs/ct-lint.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
# Don't add the 'debug' attribute, otherwise the workflow won't work anymore
33
# Only Used for the CT Lint Stage
44
remote: origin
5-
target-branch: main
6-
chart-dirs:
7-
- charts
5+
charts:
6+
- charts/argo-cd
87
chart-repos:
98
- dandydeveloper=https://dandydeveloper.github.io/charts/
109
helm-extra-args: "--timeout 600s"

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

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@ jobs:
3535
id: list-changed
3636
run: |
3737
## If executed with debug this won't work anymore.
38-
changed=$(ct --config ./.github/configs/ct-lint.yaml list-changed)
38+
changed=$(ct --config ./.github/configs/ct-lint.yaml --target-branch ${{ github.base_ref }} list-changed)
3939
charts=$(echo "$changed" | tr '\n' ' ' | xargs)
4040
if [[ -n "$changed" ]]; then
4141
echo "::set-output name=changed::true"
4242
echo "::set-output name=changed_charts::$charts"
4343
fi
4444
- name: Run chart-testing (lint)
45-
run: ct lint --debug --config ./.github/configs/ct-lint.yaml --lint-conf ./.github/configs/lintconf.yaml
45+
run: ct lint --debug --config ./.github/configs/ct-lint.yaml --target-branch ${{ github.base_ref }} --lint-conf ./.github/configs/lintconf.yaml
4646

4747
- name: Run docs-testing (helm-docs)
4848
id: helm-docs
@@ -62,15 +62,6 @@ jobs:
6262
with:
6363
config: .github/configs/kind-config.yaml
6464

65-
- name: Deploy latest ArgoCD CRDs when testing ArgoCD extensions
66-
if: |
67-
contains(steps.list-changed.outputs.changed_charts, 'argocd-image-updater') ||
68-
contains(steps.list-changed.outputs.changed_charts, 'argocd-apps')
69-
run: |
70-
helm repo add dandydeveloper https://dandydeveloper.github.io/charts/
71-
helm dependency build charts/argo-cd/
72-
helm template charts/argo-cd/ -s templates/crds/* | kubectl apply -f -
73-
7465
- name: Skip HPA tests of ArgoCD
7566
if: contains(steps.list-changed.outputs.changed_charts, 'argo-cd')
7667
run: |
@@ -85,5 +76,5 @@ jobs:
8576
helm install redis bitnami/redis --wait --namespace redis --set auth.password=argocd --set architecture=standalone
8677
8778
- name: Run chart-testing (install)
88-
run: ct install --config ./.github/configs/ct-install.yaml
89-
if: steps.list-changed.outputs.changed == 'true'
79+
run: ct install --config ./.github/configs/ct-install.yaml --target-branch ${{ github.base_ref }}
80+
if: steps.list-changed.outputs.changed == 'true'

charts/argo-cd/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
appVersion: v2.4.15
33
description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
44
name: argo-cd
5-
version: 5.7.0
5+
version: 5.7.0-cf-init
66
home: https://github.com/argoproj/argo-helm
77
icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
88
sources:

0 commit comments

Comments
 (0)