Merge branch 'master' into action-menu

argoproj · Nov 7, 2022 · 2faf05c · 2faf05c
2 parents ddf9af6 + 4d6d204
commit 2faf05c
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 9 deletions.
diff --git a/USERS.md b/USERS.md
@@ -67,6 +67,7 @@ Currently, the following organizations are **officially** using Argo CD:
 1. [END.](https://www.endclothing.com/)
 1. [Energisme](https://energisme.com/)
 1. [enigmo](https://enigmo.co.jp/)
+1. [Envoy](https://envoy.com/)
 1. [Faro](https://www.faro.com/)
 1. [Fave](https://myfave.com)
 1. [Flip](https://flip.id)
@@ -144,6 +145,7 @@ Currently, the following organizations are **officially** using Argo CD:
 1. [Nextdoor](https://nextdoor.com/)
 1. [Nikkei](https://www.nikkei.co.jp/nikkeiinfo/en/)
 1. [Nitro](https://gonitro.com)
+1. [Objective](https://www.objective.com.br/)
 1. [OCCMundial](https://occ.com.mx)
 1. [Octadesk](https://octadesk.com)
 1. [omegaUp](https://omegaUp.com)

diff --git a/docs/operator-manual/declarative-setup.md b/docs/operator-manual/declarative-setup.md
@@ -178,7 +178,7 @@ Consider using [bitnami-labs/sealed-secrets](https://github.com/bitnami-labs/sea
 Each repository must have a `url` field and, depending on whether you connect using HTTPS, SSH, or GitHub App, `username` and `password` (for HTTPS), `sshPrivateKey` (for SSH), or `githubAppPrivateKey` (for GitHub App).
 
 !!!warning
-    When using [bitnami-labs/sealed-secrets](https://github.com/bitnami-labs/sealed-secrets) the labels will be removed and have to be readded as descibed here: https://github.com/bitnami-labs/sealed-secrets#sealedsecrets-as-templates-for-secrets
+    When using [bitnami-labs/sealed-secrets](https://github.com/bitnami-labs/sealed-secrets) the labels will be removed and have to be readded as described here: https://github.com/bitnami-labs/sealed-secrets#sealedsecrets-as-templates-for-secrets
 
 Example for HTTPS:
 

diff --git a/docs/user-guide/helm.md b/docs/user-guide/helm.md
@@ -128,7 +128,7 @@ Unsupported hooks are ignored. In Argo CD, hooks are created by using `kubectl a
 * Annotate  `pre-install` and `post-install` with `hook-weight: "-1"`. This will make sure it runs to success before any upgrade hooks.
 * Annotate `pre-upgrade` and `post-upgrade` with `hook-delete-policy: before-hook-creation` to make sure it runs on every sync.
 
-Read more about [Argo hooks](resource_hooks.md) and [Helm hooks](https://github.com/helm/helm/blob/dev-v2/docs/charts_hooks.md).
+Read more about [Argo hooks](resource_hooks.md) and [Helm hooks](https://helm.sh/docs/topics/charts_hooks/).
 
 ## Random Data
 

diff --git a/util/helm/testdata/redis/README.md b/util/helm/testdata/redis/README.md
@@ -94,7 +94,7 @@ The following table lists the configurable parameters of the Redis chart and the
 | `master.args`                              | Redis master command-line args                                                                                 | []                                                   |
 | `master.disableCommands`                   | Comma-separated list of Redis commands to disable (master)                                                     | `FLUSHDB,FLUSHALL`                                   |
 | `master.extraFlags`                        | Redis master additional command line flags                                                                     | []                                                   |
-| `master.nodeSelector`                      | Redis master Node labels for pod assignment                                                                    | {"beta.kubernetes.io/arch": "amd64"}                 |
+| `master.nodeSelector`                      | Redis master Node labels for pod assignment                                                                    | {"kubernetes.io/arch": "amd64"}                 |
 | `master.tolerations`                       | Toleration labels for Redis master pod assignment                                                              | []                                                   |
 | `master.affinity   `                       | Affinity settings for Redis master pod assignment                                                              | []                                                   |
 | `master.schedulerName`                     | Name of an alternate scheduler                                                                                 | `nil`                                                |

diff --git a/util/helm/testdata/redis/values-production.yaml b/util/helm/testdata/redis/values-production.yaml
@@ -41,7 +41,7 @@ metrics:
     # pullSecrets:
     #   - myRegistrKeySecretName
   ## Metrics exporter labels and tolerations for pod assignment
-  # nodeSelector: {"beta.kubernetes.io/arch": "amd64"}
+  # nodeSelector: {"kubernetes.io/arch": "amd64"}
   # tolerations: []
   ## Metrics exporter pod Annotation and Labels
   # podLabels: {}
@@ -128,7 +128,7 @@ master:
   ## Redis Master Node labels and tolerations for pod assignment
   ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector
   ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#taints-and-tolerations-beta-feature
-  # nodeSelector: {"beta.kubernetes.io/arch": "amd64"}
+  # nodeSelector: {"kubernetes.io/arch": "amd64"}
   # tolerations: []
   ## Redis Master pod annotations
   podAnnotations: {}
@@ -243,7 +243,7 @@ slave:
   #     cpu: 100m
 
   ## Redis slave labels and tolerations for pod assignment
-  # nodeSelector: {"beta.kubernetes.io/arch": "amd64"}
+  # nodeSelector: {"kubernetes.io/arch": "amd64"}
   # tolerations: []
 
   ## Redis slave pod Annotation and Labels

diff --git a/util/helm/testdata/redis/values.yaml b/util/helm/testdata/redis/values.yaml
@@ -46,7 +46,7 @@ metrics:
     #   - myRegistrKeySecretName
 
   ## Metrics exporter labels and tolerations for pod assignment
-  # nodeSelector: {"beta.kubernetes.io/arch": "amd64"}
+  # nodeSelector: {"kubernetes.io/arch": "amd64"}
   # tolerations: []
 
   ## Metrics exporter pod Annotation and Labels
@@ -170,7 +170,7 @@ master:
   ## Redis Master Node labels and tolerations for pod assignment
   ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector
   ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#taints-and-tolerations-beta-feature
-  # nodeSelector: {"beta.kubernetes.io/arch": "amd64"}
+  # nodeSelector: {"kubernetes.io/arch": "amd64"}
   # tolerations: []
   ## Redis Master pod/node affinity/anti-affinity
   affinity: {}
@@ -286,7 +286,7 @@ slave:
   #     cpu: 100m
 
   ## Redis slave labels and tolerations for pod assignment
-  # nodeSelector: {"beta.kubernetes.io/arch": "amd64"}
+  # nodeSelector: {"kubernetes.io/arch": "amd64"}
   # tolerations: []
 
   ## Use an alternate scheduler, e.g. "stork".