merge 5.27.1

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

@@ -38,8 +38,8 @@ jobs:
           changed=$(ct --config ./.github/configs/ct-lint.yaml --target-branch ${{ github.base_ref }} list-changed)
           charts=$(echo "$changed" | tr '\n' ' ' | xargs)
           if [[ -n "$changed" ]]; then
-            echo "::set-output name=changed::true"
-            echo "::set-output name=changed_charts::$charts"
+            echo "changed=true" >> $GITHUB_OUTPUT
+            echo "changed_charts=$charts" >> $GITHUB_OUTPUT
           fi
 
       - name: Run chart-testing (lint)
@@ -58,7 +58,7 @@ jobs:
           fi
 
       - name: Create kind cluster
-        uses: helm/kind-action@v1.4.0
+        uses: helm/kind-action@v1.5.0
         if: steps.list-changed.outputs.changed == 'true'
         with:
           config: .github/configs/kind-config.yaml

.github/workflows/publish.yml

@@ -40,7 +40,7 @@ jobs:
           helm package charts/argo-cd -u -d .cr-release-packages/
 
       - name: Run chart-releaser
-        uses: helm/chart-releaser-action@main
+        uses: helm/chart-releaser-action@v1.5.0
         with:
           config: "./.github/configs/cr.yaml"
           skip_packaging: true

.github/workflows/stale.yml

@@ -14,7 +14,7 @@ jobs:
       pull-requests: write  # for actions/stale to close stale PRs
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/stale@v6
+    - uses: actions/stale@v7
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         # Number of days of inactivity before an issue becomes stale

CODEOWNERS

@@ -7,7 +7,7 @@
 /charts/argo-workflows/ @stefansedich @paguos @vladlosev @yann-soubeyrand @jmeridth @yu-croco
 
 # Argo CD
-/charts/argo-cd/ @davidkarlsen @mr-sour @yann-soubeyrand @mbevc1 @mkilchhofer @yu-croco @jmeridth
+/charts/argo-cd/ @davidkarlsen @mr-sour @yann-soubeyrand @mbevc1 @mkilchhofer @yu-croco @jmeridth @pdrastil
 
 # Argo Events
 /charts/argo-events/ @jbehling @VaibhavPage @pdrastil

CONTRIBUTING.md

@@ -2,110 +2,160 @@
 
 Argo Helm is a collection of **community maintained** charts. Therefore we rely on you to test your changes sufficiently.
 
-
-# Pull Requests
+## Pull Requests
 
 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.
 
+### Pull Request Title Linting
+
+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`.
+
+## Documentation
+
+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.
+
+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):
+
+```shell
+./scripts/helm-docs.sh
+```
+
+> **Note**
+> When creating your own `README.md.gotmpl`, don't forget to add it to your `.helmignore` file.
+
+### Updating a chart README.md
+
+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:
+
+```shell
+./scripts/helm-docs.sh
+```
+
+> **Note**
+> 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.
+
 ## Versioning
 
-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).
+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 isn't considered stable, it must be released as `prerelease`.
 
 Any breaking changes to a chart (backwards incompatible) require:
 
-  * Bump of the current Major version of the chart
-  * State possible manual changes for this chart version in the `Upgrading` section of the chart's `README.md.gotmpl` ([See Upgrade](#upgrades))
+* Bump of the current Major version of the chart
+* State possible manual changes for this chart version in the `Upgrading` section of the chart's `README.md.gotmpl`
+
+### New Application Versions
+
+When selecting new application versions ensure you make the following changes:
+
+* `values.yaml`: Bump all instances of the container image version
+* `Chart.yaml`: Ensure `appVersion` matches the above container image and bump `version`
+
+Please ensure chart version changes adhere to semantic versioning standards:
+
+* Major: Large chart rewrites, major non-backwards compatible or destructive changes
+* Minor: New chart functionality (sidecars), major application updates or minor non-backwards compatible changes
+* Patch: App version patch updates, backwards compatible optional chart features
 
 ### Immutability
 
 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.
 
+### Chart Versioning
+
+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.
 
 ### Artifact Hub Annotations
 
 Since we release our charts on Artifact Hub we encourage making use of the provided chart annotations for Artifact Hub.
 
-  * [https://artifacthub.io/docs/topics/annotations/helm/](https://artifacthub.io/docs/topics/annotations/helm/)
+* [https://artifacthub.io/docs/topics/annotations/helm/](https://artifacthub.io/docs/topics/annotations/helm/)
 
 #### Changelog
 
 We want to deliver transparent chart releases for our chart consumers. Therefore we require a changelog per new chart release.
 
-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:
-
-```
-name: argo-cd
-version: 3.4.1
-...
-annotations:
-  artifacthub.io/changes: |
-    - "[Added]: Something New was added"
-    - "[Changed]: Changed Something within this chart"
-    - "[Changed]: Changed Something else within this chart"
-    - "[Deprecated]: Something deprecated"
-    - "[Removed]: Something was removed"
-    - "[Fixed]: Something was fixed"
-    - "[Security]": Some Security Patch was included"
-```
-
-## Documentation
+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).
 
-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.
+A new `artifacthub.io/changes` needs to be written covering only the changes since the previous release.
 
-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):
+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/).
 
-```
-bash scripts/helm-docs.sh
+```yaml
+- kind: {type}
+  description: {description}
 ```
 
-**NOTE**: When creating your own `README.md.gotmpl`, don't forget to add it to your `.helmignore` file.
+You can use the following template:
 
-
-
-# Testing
-
-## Testing Argo Workflows Changes
+```yaml
+name: argo-cd
+version: 5.19.12
+...
+annotations:
+  artifacthub.io/changes: |
+    - kind: added
+      description: Something New was added
+    - kind: changed
+      description: Changed Something within this chart
+    - kind: changed
+      description: Changed Something else within this chart
+    - kind: deprecated
+      description: Something deprecated
+    - kind: removed
+      description: Something was removed
+    - kind: fixed
+      description: Something was fixed
+    - kind: security
+      description: Some Security Patch was included
+```
+
+## Testing
+
+### Testing Argo Workflows Changes
 
 Minimally:
 
-```
+```shell
 helm install charts/argo-workflows -n argo
 argo version
 ```
 
-Follow this instructions for running a hello world workflow.
+Follow [these](https://argoproj.github.io/argo-workflows/quick-start/#submitting-an-example-workflow) instructions for running a hello world workflow.
 
-## Testing Argo CD Changes
+### Testing Argo CD Changes
 
 Clean-up:
 
-```
+```shell
 helm delete argo-cd --purge
 kubectl delete crd -l app.kubernetes.io/part-of=argocd
 ```
 
 Pre-requisites:
-```
+
+```shell
 helm repo add redis-ha https://dandydeveloper.github.io/charts/
 helm dependency update
 ```
 
 Minimally:
 
-```
+```shell
 helm install argocd  argo/argo-cd  -n argocd --create-namespace
 kubectl port-forward service/argo-cd-argocd-server -n argocd 8080:443
 ```
 
 In a new terminal:
 
-```
+```shell
 argocd version --server localhost:8080 --insecure
 # reset password to 'Password1!'
 kubectl -n argocd patch secret argocd-secret \
   -p '{"stringData": {
-    "admin.password": "$2a$10$hDj12Tw9xVmvybSahN1Y0.f9DZixxN8oybyA32Uy/eqWklFU4Mo8O",
-    "admin.passwordMtime": "'$(date +%FT%T%Z)'"
+      "admin.password": "$2a$10$hDj12Tw9xVmvybSahN1Y0.f9DZixxN8oybyA32Uy/eqWklFU4Mo8O",
+      "admin.passwordMtime": "'$(date +%FT%T%Z)'"
   }}'
 argocd login localhost:8080 --username admin --password 'Password1!'
 
@@ -114,38 +164,25 @@ argocd login localhost:8080 --username admin --password 'Password1!'
 
 Create and sync app:
 
-```
+```shell
 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
 argocd app sync guestbook
 ```
 
-## New Application Versions
-
-When raising application versions ensure you make the following changes:
-
-- `values.yaml`: Bump all instances of the container image version
-- `Chart.yaml`: Ensure `appVersion` matches the above container image and bump `version`
-
-Please ensure chart version changes adhere to semantic versioning standards:
-
-- Patch: App version patch updates, backwards compatible optional chart features
-- Minor: New chart functionality (sidecars), major application updates or minor non-backwards compatible changes
-- Major: Large chart rewrites, major non-backwards compatible or destructive changes
-
-## Testing Charts
+### Testing Charts
 
 As part of the Continuous Integration system we run Helm's [Chart Testing](https://github.com/helm/chart-testing) tool.
 
-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.
+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.
 
 Linting configuration can be found in [ct-lint.yaml](./.github/configs/ct-lint.yaml)
 
 The linting can be invoked manually with the following command:
 
-```
+```shell
 ./scripts/lint.sh
 ```
 
 ## Publishing Changes
 
-Changes are automatically publish whenever a commit is merged to main. The CI job (see `./.github/workflows/publish.yml`).
+Changes are automatically publish whenever a commit is merged to the `main` branch by the CI job (see `./.github/workflows/publish.yml`).

README.md

@@ -1,24 +1,42 @@
 # Argo Helm Charts
 
+[![Slack](https://img.shields.io/badge/slack-%23argo--helm--charts-brightgreen.svg?logo=slack)](https://argoproj.github.io/community/join-slack)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 [![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)
 [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/argo)](https://artifacthub.io/packages/search?repo=argo)
 [![CLOMonitor](https://img.shields.io/endpoint?url=https://clomonitor.io/api/projects/cncf/argo/badge)](https://clomonitor.io/projects/cncf/argo)
 
 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:
 
-```
+```bash
 helm repo add argo https://argoproj.github.io/argo-helm
 ```
 
 ## Contributing
 
 We'd love to have you contribute! Please refer to our [contribution guidelines](CONTRIBUTING.md) for details.
 
+### Custom resource definitions
+
+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.
+
+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.
+
+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:
+
+Example:
+
+```bash
+kubectl apply -k "https://github.com/argoproj/argo-cd/manifests/crds?ref=<appVersion>"
+
+# Eg. version v2.4.9
+kubectl apply -k "https://github.com/argoproj/argo-cd/manifests/crds?ref=v2.4.9"
+```
+
 ### Security Policy
 
 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).
 
 ### Changelog
 
-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).
+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

@@ -1,6 +1,6 @@
 dependencies:
 - name: redis-ha
   repository: https://dandydeveloper.github.io/charts/
-  version: 4.22.3
-digest: sha256:ef6269e4e073dad10c230ccfb069fc013608111c895c5e7568450bb3967cf195
-generated: "2022-11-03T12:04:33.673857+09:00"
+  version: 4.22.4
+digest: sha256:5df60910862b364ebfb82cba2b2f0951c39ad36446647fb3f501bdeadc92fbd7
+generated: "2022-12-26T22:58:11.561184+09:00"

charts/argo-cd/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: v2.5.5-cap-CR-16950
+appVersion: v2.6.0-cap-CR-17237
 description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 5.16.0-2-cap-CR-16950
+version: 5.27.1-1-cap-CR-17237
 kubeVersion: ">=1.22.0-0"
 home: https://github.com/argoproj/argo-helm
 icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
@@ -18,9 +18,10 @@ maintainers:
     url: https://argoproj.github.io/
 dependencies:
   - name: redis-ha
-    version: 4.22.3
+    version: 4.22.4
     repository: https://dandydeveloper.github.io/charts/
     condition: redis-ha.enabled
 annotations:
   artifacthub.io/changes: |
-    - "[Added]: Ability to annotate Deployment and Statefulset objects for all components"
+    - kind: changed
+      description: Upgrade Argo CD to v2.6.6