Skip to content

Commit 6e1ba60

Browse files
rollouts cf-init
1 parent 4dd3157 commit 6e1ba60

File tree

3 files changed

+19
-32
lines changed

3 files changed

+19
-32
lines changed

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

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
## Reference: https://github.com/helm/chart-testing-action
21
name: Linting and Testing
2+
33
on: pull_request
44

55
permissions:
@@ -26,24 +26,23 @@ jobs:
2626

2727
- name: Setup Chart Linting
2828
id: lint
29-
uses: helm/[email protected].1
29+
uses: helm/[email protected].0
3030
with:
3131
# Note: Also update in scripts/lint.sh
32-
version: v3.7.1
32+
version: v3.7.0
3333

3434
- name: List changed charts
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
44-
4544
- name: Run chart-testing (lint)
46-
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
4746

4847
- name: Run docs-testing (helm-docs)
4948
id: helm-docs
@@ -56,35 +55,23 @@ jobs:
5655
else
5756
echo -e '\033[0;32mDocumentation up to date\033[0m ✔'
5857
fi
59-
6058
- name: Create kind cluster
61-
uses: helm/kind-action@v1.5.0
59+
uses: helm/kind-action@v1.4.0
6260
if: steps.list-changed.outputs.changed == 'true'
6361
with:
6462
config: .github/configs/kind-config.yaml
6563

66-
- name: Deploy latest ArgoCD CRDs when testing ArgoCD extensions
67-
if: |
68-
contains(steps.list-changed.outputs.changed_charts, 'argocd-image-updater') ||
69-
contains(steps.list-changed.outputs.changed_charts, 'argocd-apps')
70-
run: |
71-
helm repo add dandydeveloper https://dandydeveloper.github.io/charts/
72-
helm dependency build charts/argo-cd/
73-
helm template charts/argo-cd/ --set server.extensions.enabled=true -s templates/crds/* | kubectl apply -f -
74-
7564
- name: Skip HPA tests of ArgoCD
7665
if: contains(steps.list-changed.outputs.changed_charts, 'argo-cd')
7766
run: |
7867
## Metrics API not available in kind cluster
7968
rm charts/argo-cd/ci/ha-autoscaling-values.yaml
80-
8169
- name: Create an external redis for ArgoCD externalRedis feature
8270
if: contains(steps.list-changed.outputs.changed_charts, 'argo-cd')
8371
run: |
8472
kubectl create namespace redis
8573
helm repo add bitnami https://charts.bitnami.com/bitnami
8674
helm install redis bitnami/redis --wait --namespace redis --set auth.password=argocd --set architecture=standalone
87-
8875
- name: Run chart-testing (install)
89-
run: ct install --config ./.github/configs/ct-install.yaml
90-
if: steps.list-changed.outputs.changed == 'true'
76+
run: ct install --config ./.github/configs/ct-install.yaml --target-branch ${{ github.base_ref }}
77+
if: steps.list-changed.outputs.changed == 'true'

.github/workflows/publish.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
## Reference: https://github.com/helm/chart-releaser-action
1+
2+
23
name: Chart Publish
34
on:
45
push:
56
branches:
6-
- main
7+
- argo-rollouts
78

89
permissions:
910
contents: read
@@ -27,20 +28,19 @@ jobs:
2728
- name: Add dependency chart repos
2829
run: |
2930
helm repo add dandydeveloper https://dandydeveloper.github.io/charts/
30-
3131
- name: Configure Git
3232
run: |
3333
git config user.name "$GITHUB_ACTOR"
3434
git config user.email "[email protected]"
35-
36-
## This is required to consider the old Circle-CI Index and to stay compatible with all the old releases.
37-
- name: Fetch current Chart Index
35+
- name: Package chart
3836
run: |
39-
git checkout origin/gh-pages index.yaml
40-
37+
rm -rf .cr-release-packages
38+
mkdir .cr-release-packages
39+
helm package charts/argo-rollouts -u -d .cr-release-packages/
4140
- name: Run chart-releaser
42-
uses: helm/chart-releaser-action@v1.5.0
41+
uses: helm/chart-releaser-action@main
4342
with:
4443
config: "./.github/configs/cr.yaml"
44+
skip_packaging: true
4545
env:
46-
CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
46+
CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

charts/argo-rollouts/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
appVersion: v1.4.0
33
description: A Helm chart for Argo Rollouts
44
name: argo-rollouts
5-
version: 2.22.1
5+
version: 2.22.1-0-cf-init
66
home: https://github.com/argoproj/argo-helm
77
icon: https://argoproj.github.io/argo-rollouts/assets/logo.png
88
keywords:

0 commit comments

Comments
 (0)