Skip to content

Commit f670c9c

Browse files
Merge pull request #14 from codefresh-io/upgrade-argocd-2.7
Upgrade argocd 2.7
2 parents 079305b + 7a78814 commit f670c9c

File tree

206 files changed

+3243
-318
lines changed

Some content is hidden

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

206 files changed

+3243
-318
lines changed

.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/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. -->

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

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,39 @@ 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@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
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@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
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@bd6b4b6205c4dbad673328db7b31b7fab9e241c0 # v4.6.1
2436
with:
2537
python-version: 3.9
2638

2739
- name: Setup Chart Linting
2840
id: lint
29-
uses: helm/[email protected]
41+
uses: helm/chart-testing-action@e8788873172cb653a90ca2e819d79d65a66d4e76 # v2.4.0
3042
with:
3143
# Note: Also update in scripts/lint.sh
3244
version: v3.7.1
@@ -58,7 +70,7 @@ jobs:
5870
fi
5971
6072
- name: Create kind cluster
61-
uses: helm/kind-action@v1.5.0
73+
uses: helm/kind-action@fa81e57adff234b2908110485695db0f181f3c67 # v1.7.0
6274
if: steps.list-changed.outputs.changed == 'true'
6375
with:
6476
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@0967ca812e7fdc8f5f71402a1b486d5bd061fe20 # v4.2.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@c3cd5d1ea3580753008872425915e343e351ab54 # v5.2.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

.github/workflows/publish.yml

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: Checkout
18-
uses: actions/checkout@v3
18+
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
1919
with:
2020
fetch-depth: 0
2121

2222
- name: Install Helm
23-
uses: azure/setup-helm@v3
23+
uses: azure/setup-helm@5119fcb9089d432beecbf79bb2c7915207344b78 # v3.5
2424
with:
2525
version: v3.10.1 # Also update in lint-and-test.yaml
2626

@@ -39,8 +39,24 @@ jobs:
3939
mkdir .cr-release-packages
4040
helm package charts/argo-cd -u -d .cr-release-packages/
4141
42+
# The GitHub repository secret `PGP_PRIVATE_KEY` contains the private key
43+
# in ASCII-armored format. To export a (new) key, run this command:
44+
# `gpg --armor --export-secret-key <my key>`
45+
- name: Prepare PGP key
46+
run: |
47+
IFS=""
48+
echo "$PGP_PRIVATE_KEY" | gpg --dearmor > $HOME/secring.gpg
49+
echo "$PGP_PASSPHRASE" > $HOME/passphrase.txt
50+
51+
# Tell chart-releaser-action where to find the key and its passphrase
52+
echo "CR_KEYRING=$HOME/secring.gpg" >> "$GITHUB_ENV"
53+
echo "CR_PASSPHRASE_FILE=$HOME/passphrase.txt" >> "$GITHUB_ENV"
54+
env:
55+
PGP_PRIVATE_KEY: "${{ secrets.PGP_PRIVATE_KEY }}"
56+
PGP_PASSPHRASE: "${{ secrets.PGP_PASSPHRASE }}"
57+
4258
- name: Run chart-releaser
43-
uses: helm/[email protected]
59+
uses: helm/chart-releaser-action@be16258da8010256c6e82849661221415f031968 # v1.5.0
4460
with:
4561
config: "./.github/configs/cr.yaml"
4662
skip_packaging: true

.github/workflows/scorecard.yml

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
# This workflow uses actions that are not certified by GitHub. They are provided
2+
# by a third-party and are governed by separate terms of service, privacy
3+
# policy, and support documentation.
4+
5+
name: Scorecard supply-chain security
6+
on:
7+
# For Branch-Protection check. Only the default branch is supported. See
8+
# https://github.com/ossf/scorecard/blob/main/docs/checks.md#branch-protection
9+
branch_protection_rule:
10+
# To guarantee Maintained check is occasionally updated. See
11+
# https://github.com/ossf/scorecard/blob/main/docs/checks.md#maintained
12+
schedule:
13+
- cron: '21 6 * * 6'
14+
push:
15+
branches: [ "main" ]
16+
17+
# Declare default permissions as read only.
18+
permissions: read-all
19+
20+
jobs:
21+
analysis:
22+
if: github.repository_owner == 'argoproj'
23+
name: Scorecard analysis
24+
runs-on: ubuntu-latest
25+
permissions:
26+
# Needed to upload the results to code-scanning dashboard.
27+
security-events: write
28+
# Needed to publish results and get a badge (see publish_results below).
29+
id-token: write
30+
# Uncomment the permissions below if installing in a private repository.
31+
# contents: read
32+
# actions: read
33+
34+
steps:
35+
- name: "Checkout code"
36+
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
37+
with:
38+
persist-credentials: false
39+
40+
- name: "Run analysis"
41+
uses: ossf/scorecard-action@08b4669551908b1024bb425080c797723083c031 # v2.2.0
42+
with:
43+
results_file: results.sarif
44+
results_format: sarif
45+
# (Optional) "write" PAT token. Uncomment the `repo_token` line below if:
46+
# - you want to enable the Branch-Protection check on a *public* repository, or
47+
# - you are installing Scorecard on a *private* repository
48+
# To create the PAT, follow the steps in https://github.com/ossf/scorecard-action#authentication-with-pat.
49+
repo_token: ${{ secrets.SCORECARD_TOKEN }}
50+
51+
# Public repositories:
52+
# - Publish results to OpenSSF REST API for easy access by consumers
53+
# - Allows the repository to include the Scorecard badge.
54+
# - See https://github.com/ossf/scorecard-action#publishing-results.
55+
# For private repositories:
56+
# - `publish_results` will always be set to `false`, regardless
57+
# of the value entered here.
58+
publish_results: true
59+
60+
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
61+
# format to the repository Actions tab.
62+
- name: "Upload artifact"
63+
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
64+
with:
65+
name: SARIF file
66+
path: results.sarif
67+
retention-days: 5
68+
69+
# Upload the results to GitHub's code scanning dashboard.
70+
- name: "Upload to code-scanning"
71+
uses: github/codeql-action/upload-sarif@cdcdbb579706841c47f7063dda365e292e5cad7a # v2.13.4
72+
with:
73+
sarif_file: results.sarif

.github/workflows/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
pull-requests: write # for actions/stale to close stale PRs
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: actions/stale@v8
17+
- uses: actions/stale@1160a2240286f5da8ec72b1c0816ce2481aabf84 # v8.0.0
1818
with:
1919
repo-token: ${{ secrets.GITHUB_TOKEN }}
2020
# Number of days of inactivity before an issue becomes stale

CODEOWNERS

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
1-
# https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners
2-
3-
# Other and new charts
4-
/charts/ @oliverbaehler
1+
# All
2+
* @mkilchhofer @jmeridth
53

64
# Argo Workflows
7-
/charts/argo-workflows/ @stefansedich @paguos @vladlosev @yann-soubeyrand @jmeridth @yu-croco
5+
/charts/argo-workflows/ @vladlosev @jmeridth @yu-croco @tico24
86

97
# Argo CD
10-
/charts/argo-cd/ @davidkarlsen @mr-sour @yann-soubeyrand @mbevc1 @mkilchhofer @yu-croco @jmeridth @pdrastil
8+
/charts/argo-cd/ @mbevc1 @mkilchhofer @yu-croco @jmeridth @pdrastil @tico24
119

1210
# Argo Events
13-
/charts/argo-events/ @jbehling @VaibhavPage @pdrastil
11+
/charts/argo-events/ @pdrastil @jmeridth @tico24
1412

1513
# Argo Rollouts
16-
/charts/argo-rollouts/
14+
/charts/argo-rollouts/ @jmeridth

CODE_OF_CONDUCT.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# Code of Conduct
2+
3+
We adhere to the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/main/code-of-conduct.md). Please reference the link for details.
4+
5+
## TL;DR (too long didn't read)
6+
7+
Be kind
8+
9+
Your participation is at the discression of the maintainers of this project.

0 commit comments

Comments
 (0)