Skip to content

Commit 44cb62e

Browse files
Merge pull request #50 from codefresh-io/v1.9.0-cap-CR-22221-update-fork
Update argo-events to 1.9.2 and update chart from upstream
2 parents 7c003e2 + 7aa2aed commit 44cb62e

File tree

256 files changed

+18622
-3587
lines changed

Some content is hidden

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

256 files changed

+18622
-3587
lines changed

.clomonitor.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ exemptions:
77
reason: "Helm deps are not currently scanned. Maintainers are watching developments to dependabot-core #2237" # Justification of this exemption (mandatory, it will be displayed on the UI)
88
- check: sbom
99
reason: "Tracking Helm dependencies is not yet a stable practice."
10+
- check: self_assessment
11+
reason: "Refer to self assessments supplied by the codebases Argo Helm supports."
12+
- check: signed_releases
13+
reason: "Argo Helm releases are made via Artifact Hub, where they are signed. The unsigned GitHub releases are for reference only."
14+
- check: license_scanning
15+
reason: "Temporary exemption: pending response from CNCF Service Desk"
1016

1117
# TODO:
1218
# License scanning information

.github/CODEOWNERS

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
* @mkilchhofer @jmeridth @yu-croco
2+
3+
/charts/argo-workflows/ @vladlosev @jmeridth @yu-croco @tico24
4+
/charts/argo-cd/ @mbevc1 @mkilchhofer @yu-croco @jmeridth @pdrastil @tico24
5+
/charts/argo-events/ @pdrastil @jmeridth @tico24 @yu-croco
6+
/charts/argo-rollouts/ @jmeridth @yu-croco

.github/configs/cr.yaml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,12 @@
11
## Reference: https://github.com/helm/chart-releaser
2-
index-path: "./index.yaml"
2+
index-path: "./index.yaml"
3+
4+
# PGP signing
5+
sign: true
6+
key: Argo Helm maintainers
7+
# keyring: # Set via env variable CR_KEYRING
8+
# passphrase-file: # Set via env variable CR_PASSPHRASE_FILE
9+
10+
# Enable automatic generation of release notes using GitHubs release notes generator.
11+
# see: https://docs.github.com/en/repositories/releasing-projects-on-github/automatically-generated-release-notes
12+
generate-release-notes: true

.github/configs/ct-lint.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ chart-dirs:
66
- charts
77
chart-repos:
88
- dandydeveloper=https://dandydeveloper.github.io/charts/
9-
helm-extra-args: "--timeout 600s"
109
validate-chart-schema: false
1110
validate-maintainers: true
1211
validate-yaml: true

.github/configs/labeler.yaml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,23 @@
11
argo-cd:
2-
- charts/argo-cd/**/*
2+
- changed-files:
3+
- any-glob-to-any-file: charts/argo-cd/**
34

45
argo-events:
5-
- charts/argo-events/**/*
6+
- changed-files:
7+
- any-glob-to-any-file: charts/argo-events/**
68

79
argo-rollouts:
8-
- charts/argo-rollouts/**/*
10+
- changed-files:
11+
- any-glob-to-any-file: charts/argo-rollouts/**
912

1013
argo-workflows:
11-
- charts/argo-workflows/**/*
14+
- changed-files:
15+
- any-glob-to-any-file: charts/argo-workflows/**
1216

1317
argocd-image-updater:
14-
- charts/argocd-image-updater/**/*
18+
- changed-files:
19+
- any-glob-to-any-file: charts/argocd-image-updater/**
1520

1621
argocd-apps:
17-
- charts/argocd-apps/**/*
22+
- changed-files:
23+
- any-glob-to-any-file: charts/argocd-apps/**

.github/pull_request_template.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
<!--
12
Note on DCO:
23
34
If the DCO action in the integration test fails, one or more of your commits are not signed off. Please click on the *Details* link next to the DCO action for instructions on how to resolve this.
5+
-->
46

57
Checklist:
68

@@ -11,4 +13,4 @@ Checklist:
1113
* [ ] I have signed off all my commits as required by [DCO](https://github.com/argoproj/argoproj/blob/master/community/CONTRIBUTING.md).
1214
* [ ] My build is green ([troubleshooting builds](https://argo-cd.readthedocs.io/en/stable/developer-guide/ci/)).
1315

14-
Changes are automatically published when merged to `main`. They are not published on branches.
16+
<!-- Changes are automatically published when merged to `main`. They are not published on branches. -->
Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
## Used on Renovate PRs to bump the chart version and add a changelog entry
2+
## Reference: https://github.com/stefanzweifel/git-auto-commit-action
3+
## Reference: https://github.com/marketplace/actions/changed-files
4+
name: 'Chart Version Bump and Changelog'
5+
6+
on:
7+
pull_request:
8+
types:
9+
- labeled
10+
11+
permissions:
12+
contents: write
13+
14+
jobs:
15+
helm-bumper:
16+
if: ${{ (contains(github.event.pull_request.labels.*.name, 'renovate')) }}
17+
runs-on: ubuntu-latest
18+
steps:
19+
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
20+
with:
21+
token: ${{ secrets.PAT }}
22+
fetch-depth: 0
23+
24+
- name: Get changed files
25+
id: changed-files
26+
uses: tj-actions/changed-files@716b1e13042866565e00e85fd4ec490e186c4a2f # v41.0.1
27+
with:
28+
files: charts/{argo-workflows,argo-cd,argo-events,argo-rollouts,argocd-image-updater}/Chart.yaml
29+
30+
- name: "Bump Version and Changelog"
31+
run: |
32+
chartName="$(echo \"${{ steps.changed-files.outputs.all_changed_files }}\" | cut -d '/' -f2)"
33+
echo "Changed chart name is: $chartName"
34+
echo "----------------------------------------"
35+
36+
parentDir="charts/${chartName}"
37+
38+
# Bump the chart version by one patch version
39+
version=$(grep '^version:' ${parentDir}/Chart.yaml | awk '{print $2}')
40+
major=$(echo $version | cut -d. -f1)
41+
minor=$(echo $version | cut -d. -f2)
42+
patch=$(echo $version | cut -d. -f3)
43+
patch=$(expr $patch + 1)
44+
sed -i "s/^version:.*/version: ${major}.${minor}.${patch}/g" ${parentDir}/Chart.yaml
45+
46+
# Add a changelog entry
47+
appVersion=$(grep '^appVersion:' ${parentDir}/Chart.yaml | awk '{print $2}')
48+
sed -i -e '/^ artifacthub.io\/changes: |/,$d' ${parentDir}/Chart.yaml
49+
echo " artifacthub.io/changes: |" >> ${parentDir}/Chart.yaml
50+
echo " - kind: changed" >> ${parentDir}/Chart.yaml
51+
echo " description: Bump ${chartName} to ${appVersion}" >> ${parentDir}/Chart.yaml
52+
cat ${parentDir}/Chart.yaml
53+
54+
- name: "Commit and push changes"
55+
uses: stefanzweifel/git-auto-commit-action@8756aa072ef5b4a080af5dc8fef36c5d586e521d # v5.0.0
56+
with:
57+
commit_options: '--signoff'

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

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,30 +6,42 @@ permissions:
66
contents: read
77

88
jobs:
9+
linter-artifacthub:
10+
runs-on: ubuntu-latest
11+
container:
12+
image: public.ecr.aws/artifacthub/ah:v1.14.0
13+
options: --user 1001
14+
steps:
15+
- name: Checkout
16+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
17+
- name: Run ah lint
18+
working-directory: ./charts
19+
run: ah lint
20+
921
chart-test:
1022
runs-on: ubuntu-latest
1123
steps:
1224
- name: Checkout
13-
uses: actions/checkout@v3
25+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
1426
with:
1527
fetch-depth: 0
1628

1729
- name: Set up Helm
18-
uses: azure/setup-helm@v3
30+
uses: azure/setup-helm@5119fcb9089d432beecbf79bb2c7915207344b78 # v3.5
1931
with:
2032
version: v3.10.1 # Also update in publish.yaml
2133

2234
- name: Set up python
23-
uses: actions/setup-python@v4
35+
uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
2436
with:
2537
python-version: 3.9
2638

2739
- name: Setup Chart Linting
2840
id: lint
29-
uses: helm/chart-testing-action@v2.3.1
41+
uses: helm/chart-testing-action@e6669bcd63d7cb57cb4380c33043eebe5d111992 # v2.6.1
3042
with:
3143
# Note: Also update in scripts/lint.sh
32-
version: v3.7.1
44+
version: v3.10.0
3345

3446
- name: List changed charts
3547
id: list-changed
@@ -38,8 +50,8 @@ jobs:
3850
changed=$(ct --config ./.github/configs/ct-lint.yaml --target-branch ${{ github.base_ref }} list-changed)
3951
charts=$(echo "$changed" | tr '\n' ' ' | xargs)
4052
if [[ -n "$changed" ]]; then
41-
echo "::set-output name=changed::true"
42-
echo "::set-output name=changed_charts::$charts"
53+
echo "changed=true" >> $GITHUB_OUTPUT
54+
echo "changed_charts=$charts" >> $GITHUB_OUTPUT
4355
fi
4456
4557
- name: Run chart-testing (lint)
@@ -57,7 +69,7 @@ jobs:
5769
echo -e '\033[0;32mDocumentation up to date\033[0m ✔'
5870
fi
5971
- name: Create kind cluster
60-
uses: helm/kind-action@v1.4.0
72+
uses: helm/kind-action@dda0770415bac9fc20092cacbc54aa298604d140 # v1.8.0
6173
if: steps.list-changed.outputs.changed == 'true'
6274
with:
6375
config: .github/configs/kind-config.yaml

.github/workflows/pr-sizing.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
## Reference: https://github.com/pascalgn/size-label-action
22
name: 'PR Labeling'
3+
34
on:
45
pull_request_target:
5-
types: [opened, synchronize, reopened]
6+
types:
7+
- opened
8+
- synchronize
9+
- reopened
610

711
permissions:
812
contents: read
@@ -12,7 +16,7 @@ jobs:
1216
triage:
1317
runs-on: ubuntu-latest
1418
steps:
15-
- uses: actions/labeler@v4
19+
- uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0
1620
with:
1721
configuration-path: ".github/configs/labeler.yaml"
1822
repo-token: "${{ secrets.GITHUB_TOKEN }}"
@@ -21,7 +25,6 @@ jobs:
2125
size-label:
2226
runs-on: ubuntu-latest
2327
steps:
24-
- name: size-label
25-
uses: "pascalgn/[email protected]"
28+
- uses: pascalgn/size-label-action@37a5ad4ae20ea8032abf169d953bcd661fd82cd3 # v0.5.0
2629
env:
2730
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/pr-title.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
name: Validate PR title
2020
runs-on: ubuntu-latest
2121
steps:
22-
- uses: amannn/action-semantic-pull-request@v5
22+
- uses: amannn/action-semantic-pull-request@e9fabac35e210fea40ca5b14c0da95a099eff26f # v5.4.0
2323
env:
2424
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2525
with:
@@ -31,6 +31,7 @@ jobs:
3131
argo-workflows
3232
argocd-image-updater
3333
argocd-apps
34+
deps
3435
github
3536
# Configure that a scope must always be provided.
3637
requireScope: true

0 commit comments

Comments
 (0)