Skip to content

Commit 246a8e3

Browse files
merge templates from 2.0.9 upstream
2 parents 05ee5d5 + 69feaad commit 246a8e3

File tree

160 files changed

+5128
-2729
lines changed

Some content is hidden

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

160 files changed

+5128
-2729
lines changed

.clomonitor.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# CLOMonitor metadata file
2+
# This file must be located at the root of the repository
3+
4+
# Checks exemptions
5+
exemptions:
6+
- check: dependency_update_tool
7+
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)
8+
- check: sbom
9+
reason: "Tracking Helm dependencies is not yet a stable practice."
10+
11+
# TODO:
12+
# License scanning information
13+
# licenseScanning:
14+
# URL with the repository's license scanning results
15+
#
16+
# CLOMonitor can extract license scanning results from FOSSA and Snyk badges
17+
# in the repository README.md file automatically. If your repository uses a
18+
# different scanning solution, this url can be set to pass the corresponding
19+
# check.
20+
# url: https://license-scanning-results.url
21+

.editorconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[*.{md,md.gotmpl}]
2+
indent_style = space
3+
indent_size = 4
4+
trim_trailing_whitespace = false

.github/dependabot.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
## Reference: https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
2+
version: 2
3+
updates:
4+
- package-ecosystem: "github-actions"
5+
directory: "/"
6+
schedule:
7+
interval: weekly
8+
day: "saturday"

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

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,13 @@ jobs:
1818
uses: azure/setup-helm@v3
1919
with:
2020
version: v3.10.1 # Also update in publish.yaml
21+
<<<<<<< HEAD
2122

2223
- name: Setup Kubectl
2324
uses: azure/setup-kubectl@v3
2425
id: install
26+
=======
27+
>>>>>>> argo-events-2.0.9
2528

2629
- name: Set up python
2730
uses: actions/setup-python@v4
@@ -30,10 +33,10 @@ jobs:
3033

3134
- name: Setup Chart Linting
3235
id: lint
33-
uses: helm/[email protected].0
36+
uses: helm/[email protected].1
3437
with:
3538
# Note: Also update in scripts/lint.sh
36-
version: v3.7.0
39+
version: v3.7.1
3740

3841
- name: List changed charts
3942
id: list-changed
@@ -45,6 +48,7 @@ jobs:
4548
echo "::set-output name=changed::true"
4649
echo "::set-output name=changed_charts::$charts"
4750
fi
51+
4852
- name: Run chart-testing (lint)
4953
run: ct lint --debug --config ./.github/configs/ct-lint.yaml --target-branch ${{ github.base_ref }} --lint-conf ./.github/configs/lintconf.yaml
5054

@@ -65,6 +69,18 @@ jobs:
6569
with:
6670
config: .github/configs/kind-config.yaml
6771

72+
<<<<<<< HEAD
73+
=======
74+
- name: Deploy latest ArgoCD CRDs when testing ArgoCD extensions
75+
if: |
76+
contains(steps.list-changed.outputs.changed_charts, 'argocd-image-updater') ||
77+
contains(steps.list-changed.outputs.changed_charts, 'argocd-apps')
78+
run: |
79+
helm repo add dandydeveloper https://dandydeveloper.github.io/charts/
80+
helm dependency build charts/argo-cd/
81+
helm template charts/argo-cd/ --set server.extensions.enabled=true -s templates/crds/* | kubectl apply -f -
82+
83+
>>>>>>> argo-events-2.0.9
6884
- name: Skip HPA tests of ArgoCD
6985
if: contains(steps.list-changed.outputs.changed_charts, 'argo-cd')
7086
run: |

.github/workflows/pr-title.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,18 @@ on:
88
- edited
99
- synchronize
1010

11+
permissions:
12+
contents: read
13+
1114
jobs:
1215
main:
16+
permissions:
17+
pull-requests: read # for amannn/action-semantic-pull-request to analyze PRs
18+
statuses: write # for amannn/action-semantic-pull-request to mark status of analyzed PR
1319
name: Validate PR title
1420
runs-on: ubuntu-latest
1521
steps:
16-
- uses: amannn/action-semantic-pull-request@v4
22+
- uses: amannn/action-semantic-pull-request@v5
1723
env:
1824
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1925
with:

.github/workflows/publish.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ on:
88
permissions:
99
contents: read
1010

11+
permissions:
12+
contents: read
13+
1114
jobs:
1215
publish:
1316
permissions:
@@ -31,13 +34,23 @@ jobs:
3134
run: |
3235
git config user.name "$GITHUB_ACTOR"
3336
git config user.email "[email protected]"
37+
<<<<<<< HEAD
3438
- name: Package chart
39+
=======
40+
41+
## This is required to consider the old Circle-CI Index and to stay compatible with all the old releases.
42+
- name: Fetch current Chart Index
43+
>>>>>>> argo-events-2.0.9
3544
run: |
3645
rm -rf .cr-release-packages
3746
mkdir .cr-release-packages
3847
helm package charts/argo-events -u -d .cr-release-packages/
3948
- name: Run chart-releaser
49+
<<<<<<< HEAD
4050
uses: helm/chart-releaser-action@main
51+
=======
52+
uses: helm/[email protected]
53+
>>>>>>> argo-events-2.0.9
4154
with:
4255
config: "./.github/configs/cr.yaml"
4356
skip_packaging: true

.github/workflows/stale.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,18 @@ name: Mark stale issues and pull requests
33
on:
44
schedule:
55
- cron: "30 1 * * *"
6+
7+
permissions:
8+
contents: read
9+
610
jobs:
711
stale:
12+
permissions:
13+
issues: write # for actions/stale to close stale issues
14+
pull-requests: write # for actions/stale to close stale PRs
815
runs-on: ubuntu-latest
916
steps:
10-
- uses: actions/stale@v5
17+
- uses: actions/stale@v6
1118
with:
1219
repo-token: ${{ secrets.GITHUB_TOKEN }}
1320
# Number of days of inactivity before an issue becomes stale

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ helm dependency update
9393
Minimally:
9494

9595
```
96-
helm install charts/argo-cd --namespace argocd -n argo-cd
96+
helm install argocd argo/argo-cd -n argocd --create-namespace
9797
kubectl port-forward service/argo-cd-argocd-server -n argocd 8080:443
9898
```
9999

README.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
44
[![Chart Publish](https://github.com/argoproj/argo-helm/actions/workflows/publish.yml/badge.svg?branch=main)](https://github.com/argoproj/argo-helm/actions/workflows/publish.yml)
5+
[![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/argo)](https://artifacthub.io/packages/search?repo=argo)
6+
[![CLOMonitor](https://img.shields.io/endpoint?url=https://clomonitor.io/api/projects/cncf/argo/badge)](https://clomonitor.io/projects/cncf/argo)
57

68
Argo Helm is a collection of **community maintained** charts for [https://argoproj.github.io](https://argoproj.github.io) projects. The charts can be added using following command:
79

@@ -11,4 +13,12 @@ helm repo add argo https://argoproj.github.io/argo-helm
1113

1214
## Contributing
1315

14-
We'd love to have you contribute! Please refer to our [contribution guidelines](CONTRIBUTING.md) for details.
16+
We'd love to have you contribute! Please refer to our [contribution guidelines](CONTRIBUTING.md) for details.
17+
18+
### Security Policy
19+
20+
If you have a security concern relating to either this project repo or an individual helm chart, please [open an issue](https://github.com/argoproj/argo-helm/issues/new/choose) or [start a discussion](https://github.com/argoproj/argo-helm/discussions/new).
21+
22+
### Changelog
23+
24+
Releases are managed independently for each helm chart, and changelogs are tracked on each release. Read more about this process [here](https://github.com/argoproj/argo-helm/blob/main/CONTRIBUTING.md#changelog).

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.22.2
5-
digest: sha256:b6dc7774d0cc20a7a889d10e61f3dd653bdacd7836558f4875688b5cb5051d80
6-
generated: "2022-09-19T12:39:19.736045+02:00"
4+
version: 4.22.3
5+
digest: sha256:ef6269e4e073dad10c230ccfb069fc013608111c895c5e7568450bb3967cf195
6+
generated: "2022-11-03T12:04:33.673857+09:00"

0 commit comments

Comments
 (0)