Skip to content

Commit 30b338a

Browse files
Update argocd to 2.6 and chart to 5.27.1 (#7)
Update argocd to 2.6 and chart to 5.27.1
2 parents 9591bf1 + 27e4ddb commit 30b338a

File tree

110 files changed

+9079
-1952
lines changed

Some content is hidden

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

110 files changed

+9079
-1952
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ jobs:
3838
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
41-
echo "::set-output name=changed::true"
42-
echo "::set-output name=changed_charts::$charts"
41+
echo "changed=true" >> $GITHUB_OUTPUT
42+
echo "changed_charts=$charts" >> $GITHUB_OUTPUT
4343
fi
4444
4545
- name: Run chart-testing (lint)
@@ -58,7 +58,7 @@ jobs:
5858
fi
5959
6060
- name: Create kind cluster
61-
uses: helm/kind-action@v1.4.0
61+
uses: helm/kind-action@v1.5.0
6262
if: steps.list-changed.outputs.changed == 'true'
6363
with:
6464
config: .github/configs/kind-config.yaml

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
helm package charts/argo-cd -u -d .cr-release-packages/
4141
4242
- name: Run chart-releaser
43-
uses: helm/chart-releaser-action@main
43+
uses: helm/chart-releaser-action@v1.5.0
4444
with:
4545
config: "./.github/configs/cr.yaml"
4646
skip_packaging: true

.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@v6
17+
- uses: actions/stale@v7
1818
with:
1919
repo-token: ${{ secrets.GITHUB_TOKEN }}
2020
# Number of days of inactivity before an issue becomes stale

CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
/charts/argo-workflows/ @stefansedich @paguos @vladlosev @yann-soubeyrand @jmeridth @yu-croco
88

99
# Argo CD
10-
/charts/argo-cd/ @davidkarlsen @mr-sour @yann-soubeyrand @mbevc1 @mkilchhofer @yu-croco @jmeridth
10+
/charts/argo-cd/ @davidkarlsen @mr-sour @yann-soubeyrand @mbevc1 @mkilchhofer @yu-croco @jmeridth @pdrastil
1111

1212
# Argo Events
1313
/charts/argo-events/ @jbehling @VaibhavPage @pdrastil

CONTRIBUTING.md

Lines changed: 98 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -2,110 +2,160 @@
22

33
Argo Helm is a collection of **community maintained** charts. Therefore we rely on you to test your changes sufficiently.
44

5-
6-
# Pull Requests
5+
## Pull Requests
76

87
All submissions, including submissions by project members, require review. We use GitHub pull requests for this purpose. Consult [GitHub Help](https://help.github.com/articles/about-pull-requests/) for more information on using pull requests. See the above stated requirements for PR on this project.
98

9+
### Pull Request Title Linting
10+
11+
We lint the title of your pull request to ensure it follows the [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) specification. This is done using GitHub actions and the [action-semantic-pull-request](.github/workflows/pr-title.yml) workflow. We require the scope of the change to be included in the title. The scope should be the name of the chart you are changing. For example, if you are changing the `argo-cd` chart, the title of your pull request should be `fix(argo-cd): Fix typo in values.yaml`.
12+
13+
## Documentation
14+
15+
The documentation for each chart is generated with [helm-docs](https://github.com/norwoodj/helm-docs). This way we can ensure that values are consistent with the chart documentation.
16+
17+
We have a script on the repository which will execute the helm-docs docker container, so that you don't have to worry about downloading the binary etc. Simply execute the script (Bash compatible, might require sudo privileges):
18+
19+
```shell
20+
./scripts/helm-docs.sh
21+
```
22+
23+
> **Note**
24+
> When creating your own `README.md.gotmpl`, don't forget to add it to your `.helmignore` file.
25+
26+
### Updating a chart README.md
27+
28+
When updating the `README.md.gotmpl` inside a chart directory you must to run the `helm-docs` script to generate the updated `README.md` file. To reiterate, you should not edit the `README.md` file manually. It will be generated by the following command:
29+
30+
```shell
31+
./scripts/helm-docs.sh
32+
```
33+
34+
> **Note**
35+
> If you see changes to unrelated chart `README.md` files you may have accidentally updated a `README.md.gotmpl` file in another chart's folder unintentionally or someone else failed to run this script. Please revert those changes if you do not intend them to be a part of your pull request.
36+
1037
## Versioning
1138

12-
Each chart's version follows the [semver standard](https://semver.org/). New charts should start at version `1.0.0`, if it's considered stable. If it's not considered stable, it must be released as [prerelease](#prerelease).
39+
Each chart's version follows the [semver standard](https://semver.org/).
40+
41+
New charts should start at version `1.0.0`, if it's considered stable. If it isn't considered stable, it must be released as `prerelease`.
1342

1443
Any breaking changes to a chart (backwards incompatible) require:
1544

16-
* Bump of the current Major version of the chart
17-
* State possible manual changes for this chart version in the `Upgrading` section of the chart's `README.md.gotmpl` ([See Upgrade](#upgrades))
45+
* Bump of the current Major version of the chart
46+
* State possible manual changes for this chart version in the `Upgrading` section of the chart's `README.md.gotmpl`
47+
48+
### New Application Versions
49+
50+
When selecting new application versions ensure you make the following changes:
51+
52+
* `values.yaml`: Bump all instances of the container image version
53+
* `Chart.yaml`: Ensure `appVersion` matches the above container image and bump `version`
54+
55+
Please ensure chart version changes adhere to semantic versioning standards:
56+
57+
* Major: Large chart rewrites, major non-backwards compatible or destructive changes
58+
* Minor: New chart functionality (sidecars), major application updates or minor non-backwards compatible changes
59+
* Patch: App version patch updates, backwards compatible optional chart features
1860

1961
### Immutability
2062

2163
Each release for each chart must be immutable. Any change to a chart (even just documentation) requires a version bump. Trying to release the same version twice will result in an error.
2264

65+
### Chart Versioning
66+
67+
Currently we require a chart version bump for every change to a chart, including updating information for older verions. This may change in the future.
2368

2469
### Artifact Hub Annotations
2570

2671
Since we release our charts on Artifact Hub we encourage making use of the provided chart annotations for Artifact Hub.
2772

28-
* [https://artifacthub.io/docs/topics/annotations/helm/](https://artifacthub.io/docs/topics/annotations/helm/)
73+
* [https://artifacthub.io/docs/topics/annotations/helm/](https://artifacthub.io/docs/topics/annotations/helm/)
2974

3075
#### Changelog
3176

3277
We want to deliver transparent chart releases for our chart consumers. Therefore we require a changelog per new chart release.
3378

34-
Changes on a chart must be documented in a chart specific changelog in the `Chart.yaml` [Annotation Section](https://helm.sh/docs/topics/charts/#the-chartyaml-file). For every new release the entire `artifacthub.io/changes` needs to be rewritten. Each change requires a new bullet point following the pattern `- "[{type}]: {description}"`. You can use the following template:
35-
36-
```
37-
name: argo-cd
38-
version: 3.4.1
39-
...
40-
annotations:
41-
artifacthub.io/changes: |
42-
- "[Added]: Something New was added"
43-
- "[Changed]: Changed Something within this chart"
44-
- "[Changed]: Changed Something else within this chart"
45-
- "[Deprecated]: Something deprecated"
46-
- "[Removed]: Something was removed"
47-
- "[Fixed]: Something was fixed"
48-
- "[Security]": Some Security Patch was included"
49-
```
50-
51-
## Documentation
79+
Changes on a chart must be documented in a chart specific changelog in the `Chart.yaml` [Annotation Section](https://helm.sh/docs/topics/charts/#the-chartyaml-file).
5280

53-
The documentation for each chart is done with [helm-docs](https://github.com/norwoodj/helm-docs). This way we can ensure that values are consistent with the chart documentation.
81+
A new `artifacthub.io/changes` needs to be written covering only the changes since the previous release.
5482

55-
We have a script on the repository which will execute the helm-docs docker container, so that you don't have to worry about downloading the binary etc. Simply execute the script (Bash compatible, might require sudo privileges):
83+
Each change requires a new bullet point following the pattern. See more information [Artifact Hub annotations in Helm Chart.yaml file](https://artifacthub.io/docs/topics/annotations/helm/).
5684

57-
```
58-
bash scripts/helm-docs.sh
85+
```yaml
86+
- kind: {type}
87+
description: {description}
5988
```
6089
61-
**NOTE**: When creating your own `README.md.gotmpl`, don't forget to add it to your `.helmignore` file.
90+
You can use the following template:
6291
63-
64-
65-
# Testing
66-
67-
## Testing Argo Workflows Changes
92+
```yaml
93+
name: argo-cd
94+
version: 5.19.12
95+
...
96+
annotations:
97+
artifacthub.io/changes: |
98+
- kind: added
99+
description: Something New was added
100+
- kind: changed
101+
description: Changed Something within this chart
102+
- kind: changed
103+
description: Changed Something else within this chart
104+
- kind: deprecated
105+
description: Something deprecated
106+
- kind: removed
107+
description: Something was removed
108+
- kind: fixed
109+
description: Something was fixed
110+
- kind: security
111+
description: Some Security Patch was included
112+
```
113+
114+
## Testing
115+
116+
### Testing Argo Workflows Changes
68117
69118
Minimally:
70119
71-
```
120+
```shell
72121
helm install charts/argo-workflows -n argo
73122
argo version
74123
```
75124

76-
Follow this instructions for running a hello world workflow.
125+
Follow [these](https://argoproj.github.io/argo-workflows/quick-start/#submitting-an-example-workflow) instructions for running a hello world workflow.
77126

78-
## Testing Argo CD Changes
127+
### Testing Argo CD Changes
79128

80129
Clean-up:
81130

82-
```
131+
```shell
83132
helm delete argo-cd --purge
84133
kubectl delete crd -l app.kubernetes.io/part-of=argocd
85134
```
86135

87136
Pre-requisites:
88-
```
137+
138+
```shell
89139
helm repo add redis-ha https://dandydeveloper.github.io/charts/
90140
helm dependency update
91141
```
92142

93143
Minimally:
94144

95-
```
145+
```shell
96146
helm install argocd argo/argo-cd -n argocd --create-namespace
97147
kubectl port-forward service/argo-cd-argocd-server -n argocd 8080:443
98148
```
99149

100150
In a new terminal:
101151

102-
```
152+
```shell
103153
argocd version --server localhost:8080 --insecure
104154
# reset password to 'Password1!'
105155
kubectl -n argocd patch secret argocd-secret \
106156
-p '{"stringData": {
107-
"admin.password": "$2a$10$hDj12Tw9xVmvybSahN1Y0.f9DZixxN8oybyA32Uy/eqWklFU4Mo8O",
108-
"admin.passwordMtime": "'$(date +%FT%T%Z)'"
157+
"admin.password": "$2a$10$hDj12Tw9xVmvybSahN1Y0.f9DZixxN8oybyA32Uy/eqWklFU4Mo8O",
158+
"admin.passwordMtime": "'$(date +%FT%T%Z)'"
109159
}}'
110160
argocd login localhost:8080 --username admin --password 'Password1!'
111161

@@ -114,38 +164,25 @@ argocd login localhost:8080 --username admin --password 'Password1!'
114164

115165
Create and sync app:
116166

117-
```
167+
```shell
118168
argocd app create guestbook --dest-namespace default --dest-server https://kubernetes.default.svc --path guestbook --project default --repo https://github.com/argoproj/argocd-example-apps.git
119169
argocd app sync guestbook
120170
```
121171

122-
## New Application Versions
123-
124-
When raising application versions ensure you make the following changes:
125-
126-
- `values.yaml`: Bump all instances of the container image version
127-
- `Chart.yaml`: Ensure `appVersion` matches the above container image and bump `version`
128-
129-
Please ensure chart version changes adhere to semantic versioning standards:
130-
131-
- Patch: App version patch updates, backwards compatible optional chart features
132-
- Minor: New chart functionality (sidecars), major application updates or minor non-backwards compatible changes
133-
- Major: Large chart rewrites, major non-backwards compatible or destructive changes
134-
135-
## Testing Charts
172+
### Testing Charts
136173

137174
As part of the Continuous Integration system we run Helm's [Chart Testing](https://github.com/helm/chart-testing) tool.
138175

139-
The checks for this tool are stricter than the standard Helm requirements, where fields normally considered optional like `maintainer` are required in the standard spec and must be valid GitHub usernames.
176+
The checks for Chart Testing are stricter than the standard Helm requirements. For example, fields normally considered optional like `maintainer` are required in the standard spec and must be valid GitHub usernames.
140177

141178
Linting configuration can be found in [ct-lint.yaml](./.github/configs/ct-lint.yaml)
142179

143180
The linting can be invoked manually with the following command:
144181

145-
```
182+
```shell
146183
./scripts/lint.sh
147184
```
148185

149186
## Publishing Changes
150187

151-
Changes are automatically publish whenever a commit is merged to main. The CI job (see `./.github/workflows/publish.yml`).
188+
Changes are automatically publish whenever a commit is merged to the `main` branch by the CI job (see `./.github/workflows/publish.yml`).

README.md

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,42 @@
11
# Argo Helm Charts
22

3+
[![Slack](https://img.shields.io/badge/slack-%23argo--helm--charts-brightgreen.svg?logo=slack)](https://argoproj.github.io/community/join-slack)
34
[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
45
[![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)
56
[![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/argo)](https://artifacthub.io/packages/search?repo=argo)
67
[![CLOMonitor](https://img.shields.io/endpoint?url=https://clomonitor.io/api/projects/cncf/argo/badge)](https://clomonitor.io/projects/cncf/argo)
78

89
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:
910

10-
```
11+
```bash
1112
helm repo add argo https://argoproj.github.io/argo-helm
1213
```
1314

1415
## Contributing
1516

1617
We'd love to have you contribute! Please refer to our [contribution guidelines](CONTRIBUTING.md) for details.
1718

19+
### Custom resource definitions
20+
21+
Some users would prefer to install the CRDs _outside_ of the chart. You can disable the CRD installation of the main four charts (argo-cd, argo-workflows, argo-events, argo-rollouts) by using `--set crds.install=false` when installing the chart.
22+
23+
Helm cannot upgrade custom resource definitions in the `<chart>/crds` folder [by design](https://helm.sh/docs/chart_best_practices/custom_resource_definitions/#some-caveats-and-explanations). Our CRDs have been moved to `<chart>/templates` to address this design decision.
24+
25+
If you are using versions of a chart that have the CRDs in the root of the chart or have elected to manage the Argo Workflows CRDs outside of the chart, please use `kubectl` to upgrade CRDs manually from [templates/crds](templates/crds/) folder or via the manifests from the upstream project repo:
26+
27+
Example:
28+
29+
```bash
30+
kubectl apply -k "https://github.com/argoproj/argo-cd/manifests/crds?ref=<appVersion>"
31+
32+
# Eg. version v2.4.9
33+
kubectl apply -k "https://github.com/argoproj/argo-cd/manifests/crds?ref=v2.4.9"
34+
```
35+
1836
### Security Policy
1937

2038
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).
2139

2240
### Changelog
2341

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).
42+
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.3
5-
digest: sha256:ef6269e4e073dad10c230ccfb069fc013608111c895c5e7568450bb3967cf195
6-
generated: "2022-11-03T12:04:33.673857+09:00"
4+
version: 4.22.4
5+
digest: sha256:5df60910862b364ebfb82cba2b2f0951c39ad36446647fb3f501bdeadc92fbd7
6+
generated: "2022-12-26T22:58:11.561184+09:00"

charts/argo-cd/Chart.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apiVersion: v2
2-
appVersion: v2.5.5-cap-CR-16950
2+
appVersion: v2.6.0-cap-CR-17237
33
description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
44
name: argo-cd
5-
version: 5.16.0-2-cap-CR-16950
5+
version: 5.27.1-1-cap-CR-17237
66
kubeVersion: ">=1.22.0-0"
77
home: https://github.com/argoproj/argo-helm
88
icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
@@ -18,9 +18,10 @@ maintainers:
1818
url: https://argoproj.github.io/
1919
dependencies:
2020
- name: redis-ha
21-
version: 4.22.3
21+
version: 4.22.4
2222
repository: https://dandydeveloper.github.io/charts/
2323
condition: redis-ha.enabled
2424
annotations:
2525
artifacthub.io/changes: |
26-
- "[Added]: Ability to annotate Deployment and Statefulset objects for all components"
26+
- kind: changed
27+
description: Upgrade Argo CD to v2.6.6

0 commit comments

Comments
 (0)