Skip to content

Commit

Permalink
Merge branch 'master' into feat/add_patch_ms
Browse files Browse the repository at this point in the history
  • Loading branch information
gdsoumya authored Sep 20, 2023
2 parents f9ed680 + 1e490d9 commit 511c332
Show file tree
Hide file tree
Showing 167 changed files with 400 additions and 23 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/ci-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
with:
go-version: ${{ env.GOLANG_VERSION }}
- name: Restore go build cache
uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
with:
path: ~/.cache/go-build
key: ${{ runner.os }}-go-build-v1-${{ github.run_id }}
Expand Down Expand Up @@ -117,7 +117,7 @@ jobs:
run: |
echo "/usr/local/bin" >> $GITHUB_PATH
- name: Restore go build cache
uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
with:
path: ~/.cache/go-build
key: ${{ runner.os }}-go-build-v1-${{ github.run_id }}
Expand Down Expand Up @@ -184,7 +184,7 @@ jobs:
run: |
echo "/usr/local/bin" >> $GITHUB_PATH
- name: Restore go build cache
uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
with:
path: ~/.cache/go-build
key: ${{ runner.os }}-go-build-v1-${{ github.run_id }}
Expand Down Expand Up @@ -270,7 +270,7 @@ jobs:
node-version: '20.4.0'
- name: Restore node dependency cache
id: cache-dependencies
uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
with:
path: ui/node_modules
key: ${{ runner.os }}-node-dep-v2-${{ hashFiles('**/yarn.lock') }}
Expand Down Expand Up @@ -305,7 +305,7 @@ jobs:
fetch-depth: 0
- name: Restore node dependency cache
id: cache-dependencies
uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
with:
path: ui/node_modules
key: ${{ runner.os }}-node-dep-v2-${{ hashFiles('**/yarn.lock') }}
Expand Down Expand Up @@ -400,7 +400,7 @@ jobs:
sudo chmod go-r $HOME/.kube/config
kubectl version
- name: Restore go build cache
uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
with:
path: ~/.cache/go-build
key: ${{ runner.os }}-go-build-v1-${{ github.run_id }}
Expand Down
3 changes: 2 additions & 1 deletion docs/operator-manual/high_availability.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ reconciliation. In this case, we advise to use the preferred resource version in
* The controller polls Git every 3m by default. You can change this duration using the `timeout.reconciliation` setting in the `argocd-cm` ConfigMap. The value of `timeout.reconciliation` is a duration string e.g `60s`, `1m`, `1h` or `1d`.

* If the controller is managing too many clusters and uses too much memory then you can shard clusters across multiple
controller replicas. To enable sharding increase the number of replicas in `argocd-application-controller` `StatefulSet`
controller replicas. To enable sharding, increase the number of replicas in `argocd-application-controller` `StatefulSet`
and repeat the number of replicas in the `ARGOCD_CONTROLLER_REPLICAS` environment variable. The strategic merge patch below
demonstrates changes required to configure two controller replicas.

Expand All @@ -81,6 +81,7 @@ spec:
- name: ARGOCD_CONTROLLER_REPLICAS
value: "2"
```
* In order to manually set the cluster's shard number, specify the optional `shard` property when creating a cluster. If not specified, it will be calculated on the fly by the application controller.

* The shard distribution algorithm of the `argocd-application-controller` can be set by using the `--sharding-method` parameter. Supported sharding methods are : [legacy (default), round-robin]. `legacy` mode uses an `uid` based distribution (non-uniform). `round-robin` uses an equal distribution across all shards. The `--sharding-method` parameter can also be overriden by setting the key `controller.sharding.algorithm` in the `argocd-cmd-params-cm` `configMap` (preferably) or by setting the `ARGOCD_CONTROLLER_SHARDING_ALGORITHM` environment variable and by specifiying the same possible values.

Expand Down
7 changes: 7 additions & 0 deletions docs/operator-manual/rbac.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,13 @@ corresponds to the `action` path `action/extensions/DaemonSet/restart`. You can
also use glob patterns in the action path: `action/*` (or regex patterns if you have
[enabled the `regex` match mode](https://github.com/argoproj/argo-cd/blob/master/docs/operator-manual/argocd-rbac-cm.yaml)).

If the resource is not under a group (for examples, Pods or ConfigMaps), then omit the group name from your RBAC
configuration:

```csv
p, example-user, applications, action//Pod/maintenance-off, default/*, allow
```

#### The `exec` resource

`exec` is a special resource. When enabled with the `create` action, this privilege allows a user to `exec` into Pods via
Expand Down
1 change: 1 addition & 0 deletions docs/operator-manual/secret-management.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ Here are some ways people are doing GitOps secrets:
* [argocd-vault-plugin](https://github.com/argoproj-labs/argocd-vault-plugin)
* [argocd-vault-replacer](https://github.com/crumbhole/argocd-vault-replacer)
* [Kubernetes Secrets Store CSI Driver](https://github.com/kubernetes-sigs/secrets-store-csi-driver)
* [Vals-Operator](https://github.com/digitalis-io/vals-operator)

For discussion, see [#1364](https://github.com/argoproj/argo-cd/issues/1364)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# `argocd-application-controller` Command Reference

## argocd-application-controller

Run ArgoCD Application Controller
Expand Down
2 changes: 2 additions & 0 deletions docs/operator-manual/server-commands/argocd-dex.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# `argocd-dex` Command Reference

## argocd-dex

argocd-dex tools used by Argo CD
Expand Down
2 changes: 2 additions & 0 deletions docs/operator-manual/server-commands/argocd-dex_gendexcfg.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# `argocd-dex gendexcfg` Command Reference

## argocd-dex gendexcfg

Generates a dex config from Argo CD settings
Expand Down
2 changes: 2 additions & 0 deletions docs/operator-manual/server-commands/argocd-dex_rundex.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# `argocd-dex rundex` Command Reference

## argocd-dex rundex

Runs dex generating a config using settings from the Argo CD configmap and secret
Expand Down
2 changes: 2 additions & 0 deletions docs/operator-manual/server-commands/argocd-repo-server.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# `argocd-repo-server` Command Reference

## argocd-repo-server

Run ArgoCD Repository Server
Expand Down
2 changes: 2 additions & 0 deletions docs/operator-manual/server-commands/argocd-server.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# `argocd-server` Command Reference

## argocd-server

Run the ArgoCD API server
Expand Down
2 changes: 2 additions & 0 deletions docs/operator-manual/server-commands/argocd-server_version.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# `argocd-server version` Command Reference

## argocd-server version

Print version information
Expand Down
2 changes: 2 additions & 0 deletions docs/user-guide/commands/argocd.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# `argocd` Command Reference

## argocd

argocd controls a Argo CD server
Expand Down
2 changes: 2 additions & 0 deletions docs/user-guide/commands/argocd_account.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# `argocd account` Command Reference

## argocd account

Manage account settings
Expand Down
2 changes: 2 additions & 0 deletions docs/user-guide/commands/argocd_account_bcrypt.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# `argocd account bcrypt` Command Reference

## argocd account bcrypt

Generate bcrypt hash for the admin password
Expand Down
2 changes: 2 additions & 0 deletions docs/user-guide/commands/argocd_account_can-i.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# `argocd account can-i` Command Reference

## argocd account can-i

Can I
Expand Down
2 changes: 2 additions & 0 deletions docs/user-guide/commands/argocd_account_delete-token.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# `argocd account delete-token` Command Reference

## argocd account delete-token

Deletes account token
Expand Down
2 changes: 2 additions & 0 deletions docs/user-guide/commands/argocd_account_generate-token.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# `argocd account generate-token` Command Reference

## argocd account generate-token

Generate account token
Expand Down
2 changes: 2 additions & 0 deletions docs/user-guide/commands/argocd_account_get-user-info.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# `argocd account get-user-info` Command Reference

## argocd account get-user-info

Get user info
Expand Down
2 changes: 2 additions & 0 deletions docs/user-guide/commands/argocd_account_get.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# `argocd account get` Command Reference

## argocd account get

Get account details
Expand Down
2 changes: 2 additions & 0 deletions docs/user-guide/commands/argocd_account_list.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# `argocd account list` Command Reference

## argocd account list

List accounts
Expand Down
2 changes: 2 additions & 0 deletions docs/user-guide/commands/argocd_account_update-password.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# `argocd account update-password` Command Reference

## argocd account update-password

Update an account's password
Expand Down
2 changes: 2 additions & 0 deletions docs/user-guide/commands/argocd_admin.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# `argocd admin` Command Reference

## argocd admin

Contains a set of commands useful for Argo CD administrators and requires direct Kubernetes access
Expand Down
2 changes: 2 additions & 0 deletions docs/user-guide/commands/argocd_admin_app.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# `argocd admin app` Command Reference

## argocd admin app

Manage applications configuration
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# `argocd admin app diff-reconcile-results` Command Reference

## argocd admin app diff-reconcile-results

Compare results of two reconciliations and print diff.
Expand Down
2 changes: 2 additions & 0 deletions docs/user-guide/commands/argocd_admin_app_generate-spec.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# `argocd admin app generate-spec` Command Reference

## argocd admin app generate-spec

Generate declarative config for an application
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# `argocd admin app get-reconcile-results` Command Reference

## argocd admin app get-reconcile-results

Reconcile all applications and stores reconciliation summary in the specified file.
Expand Down
2 changes: 2 additions & 0 deletions docs/user-guide/commands/argocd_admin_cluster.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# `argocd admin cluster` Command Reference

## argocd admin cluster

Manage clusters configuration
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# `argocd admin cluster generate-spec` Command Reference

## argocd admin cluster generate-spec

Generate declarative config for a cluster
Expand Down
2 changes: 2 additions & 0 deletions docs/user-guide/commands/argocd_admin_cluster_kubeconfig.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# `argocd admin cluster kubeconfig` Command Reference

## argocd admin cluster kubeconfig

Generates kubeconfig for the specified cluster
Expand Down
2 changes: 2 additions & 0 deletions docs/user-guide/commands/argocd_admin_cluster_namespaces.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# `argocd admin cluster namespaces` Command Reference

## argocd admin cluster namespaces

Print information namespaces which Argo CD manages in each cluster.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# `argocd admin cluster namespaces disable-namespaced-mode` Command Reference

## argocd admin cluster namespaces disable-namespaced-mode

Disable namespaced mode for clusters which name matches to the specified pattern.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# `argocd admin cluster namespaces enable-namespaced-mode` Command Reference

## argocd admin cluster namespaces enable-namespaced-mode

Enable namespaced mode for clusters which name matches to the specified pattern.
Expand Down
2 changes: 2 additions & 0 deletions docs/user-guide/commands/argocd_admin_cluster_shards.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# `argocd admin cluster shards` Command Reference

## argocd admin cluster shards

Print information about each controller shard and portion of Kubernetes resources it is responsible for.
Expand Down
2 changes: 2 additions & 0 deletions docs/user-guide/commands/argocd_admin_cluster_stats.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# `argocd admin cluster stats` Command Reference

## argocd admin cluster stats

Prints information cluster statistics and inferred shard number
Expand Down
2 changes: 2 additions & 0 deletions docs/user-guide/commands/argocd_admin_dashboard.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# `argocd admin dashboard` Command Reference

## argocd admin dashboard

Starts Argo CD Web UI locally
Expand Down
2 changes: 2 additions & 0 deletions docs/user-guide/commands/argocd_admin_export.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# `argocd admin export` Command Reference

## argocd admin export

Export all Argo CD data to stdout (default) or a file
Expand Down
2 changes: 2 additions & 0 deletions docs/user-guide/commands/argocd_admin_import.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# `argocd admin import` Command Reference

## argocd admin import

Import Argo CD data from stdin (specify `-') or a file
Expand Down
2 changes: 2 additions & 0 deletions docs/user-guide/commands/argocd_admin_initial-password.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# `argocd admin initial-password` Command Reference

## argocd admin initial-password

Prints initial password to log in to Argo CD for the first time
Expand Down
2 changes: 2 additions & 0 deletions docs/user-guide/commands/argocd_admin_notifications.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# `argocd admin notifications` Command Reference

## argocd admin notifications

Set of CLI commands that helps manage notifications settings
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# `argocd admin notifications template` Command Reference

## argocd admin notifications template

Notification templates related commands
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# `argocd admin notifications template get` Command Reference

## argocd admin notifications template get

Prints information about configured templates
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# `argocd admin notifications template notify` Command Reference

## argocd admin notifications template notify

Generates notification using the specified template and send it to specified recipients
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# `argocd admin notifications trigger` Command Reference

## argocd admin notifications trigger

Notification triggers related commands
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# `argocd admin notifications trigger get` Command Reference

## argocd admin notifications trigger get

Prints information about configured triggers
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# `argocd admin notifications trigger run` Command Reference

## argocd admin notifications trigger run

Evaluates specified trigger condition and prints the result
Expand Down
2 changes: 2 additions & 0 deletions docs/user-guide/commands/argocd_admin_proj.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# `argocd admin proj` Command Reference

## argocd admin proj

Manage projects configuration
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# `argocd admin proj generate-allow-list` Command Reference

## argocd admin proj generate-allow-list

Generates project allow list from the specified clusterRole file
Expand Down
2 changes: 2 additions & 0 deletions docs/user-guide/commands/argocd_admin_proj_generate-spec.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# `argocd admin proj generate-spec` Command Reference

## argocd admin proj generate-spec

Generate declarative config for a project
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# `argocd admin proj update-role-policy` Command Reference

## argocd admin proj update-role-policy

Implement bulk project role update. Useful to back-fill existing project policies or remove obsolete actions.
Expand Down
2 changes: 2 additions & 0 deletions docs/user-guide/commands/argocd_admin_repo.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# `argocd admin repo` Command Reference

## argocd admin repo

Manage repositories configuration
Expand Down
2 changes: 2 additions & 0 deletions docs/user-guide/commands/argocd_admin_repo_generate-spec.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# `argocd admin repo generate-spec` Command Reference

## argocd admin repo generate-spec

Generate declarative config for a repo
Expand Down
2 changes: 2 additions & 0 deletions docs/user-guide/commands/argocd_admin_settings.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# `argocd admin settings` Command Reference

## argocd admin settings

Provides set of commands for settings validation and troubleshooting
Expand Down
2 changes: 2 additions & 0 deletions docs/user-guide/commands/argocd_admin_settings_rbac.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# `argocd admin settings rbac` Command Reference

## argocd admin settings rbac

Validate and test RBAC configuration
Expand Down
2 changes: 2 additions & 0 deletions docs/user-guide/commands/argocd_admin_settings_rbac_can.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# `argocd admin settings rbac can` Command Reference

## argocd admin settings rbac can

Check RBAC permissions for a role or subject
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# `argocd admin settings rbac validate` Command Reference

## argocd admin settings rbac validate

Validate RBAC policy
Expand Down
Loading

0 comments on commit 511c332

Please sign in to comment.