Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Mangaal/argo-cd into feat…
Browse files Browse the repository at this point in the history
…/enable-app-namespace-flag-for-argocd-app-subcommand
  • Loading branch information
Mangaal committed Mar 7, 2024
2 parents 25e95b8 + d0331ee commit 3e5a2af
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion docs/developer-guide/extensions/proxy-extensions.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ requests before forwarding to the backend service.

As proxy extension is in [Alpha][1] phase, the feature is disabled by
default. To enable it, it is necessary to configure the feature flag
in Argo CD command parameters. The easiest way to to properly enable
in Argo CD command parameters. The easiest way to properly enable
this feature flag is by adding the `server.enable.proxy.extension` key
in the existing `argocd-cmd-params-cm`. For example:

Expand Down
2 changes: 1 addition & 1 deletion docs/operator-manual/applicationset/Template.md
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ spec:
source:
repoURL: https://github.com/argoproj/argo-cd.git
targetRevision: HEAD
# This 'default' value is not used: it is is replaced by the generator's template path, above
# This 'default' value is not used: it is replaced by the generator's template path, above
path: applicationset/examples/template-override/default
destination:
server: '{{url}}'
Expand Down
2 changes: 1 addition & 1 deletion docs/proposals/applicationset-plugin-generator.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ data:
baseUrl: http://myplugin.plugin.svc.cluster.local
```

- token is used a a bearer token in the RPC request. It could be a [sensitive reference](https://argo-cd.readthedocs.io/en/stable/operator-manual/user-management/#sensitive-data-and-sso-client-secrets).
- token is used a bearer token in the RPC request. It could be a [sensitive reference](https://argo-cd.readthedocs.io/en/stable/operator-manual/user-management/#sensitive-data-and-sso-client-secrets).

### Reconciliation logic

Expand Down

0 comments on commit 3e5a2af

Please sign in to comment.