Merge branch 'master' into master

argoproj · Dec 29, 2024 · 9409aae · 9409aae
2 parents f248068 + 728b31e
commit 9409aae
Show file tree

Hide file tree

Showing 63 changed files with 17,544 additions and 221 deletions.
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -14,6 +14,7 @@ linters:
     - gocritic
     - gofumpt
     - goimports
+    - gomodguard
     - gosimple
     - govet
     - ineffassign
@@ -40,6 +41,12 @@ linters-settings:
       - typeSwitchVar
   goimports:
     local-prefixes: github.com/argoproj/argo-cd/v2
+  gomodguard:
+    blocked:
+      modules:
+        - github.com/pkg/errors:
+            recommendations:
+              - errors
   perfsprint:
     # Optimizes even if it requires an int or uint type cast.
     int-conversion: true

diff --git a/assets/swagger.json b/assets/swagger.json
diff --git a/cmd/argocd/commands/repocreds.go b/cmd/argocd/commands/repocreds.go
@@ -25,7 +25,7 @@ import (
 func NewRepoCredsCommand(clientOpts *argocdclient.ClientOptions) *cobra.Command {
 	command := &cobra.Command{
 		Use:   "repocreds",
-		Short: "Manage repository connection parameters",
+		Short: "Manage credential templates for repositories",
 		Example: templates.Examples(`
 			# Add credentials with user/pass authentication to use for all repositories under the specified URL
 			argocd repocreds add URL --username USERNAME --password PASSWORD

diff --git a/common/common.go b/common/common.go
@@ -2,13 +2,13 @@ package common
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"os"
 	"path/filepath"
 	"strconv"
 	"time"
 
-	"github.com/pkg/errors"
 	"github.com/redis/go-redis/v9"
 	"github.com/sirupsen/logrus"
 	"google.golang.org/grpc/codes"

diff --git a/docs/developer-guide/toolchain-guide.md b/docs/developer-guide/toolchain-guide.md
@@ -16,7 +16,7 @@ If you want to submit a PR, please read this document carefully, as it contains
 
 As is the case with the development process, this document is under constant change. If you notice any error, or if you think this document is out-of-date, or if you think it is missing something: Feel free to submit a PR or submit a bug to our GitHub issue tracker.
 
-If you need guidance with submitting a PR, or have any other questions regarding development of Argo CD, do not hesitate to [join our Slack](https://argoproj.github.io/community/join-slack) and get in touch with us in the `#argo-contributors` channel!
+If you need guidance with submitting a PR, or have any other questions regarding development of Argo CD, do not hesitate to [join our Slack](https://argoproj.github.io/community/join-slack) and get in touch with us in the `#argo-cd-contributors` channel!
 
 ## Before you start
 

diff --git a/docs/operator-manual/declarative-setup.md b/docs/operator-manual/declarative-setup.md
@@ -71,6 +71,7 @@ See [application.yaml](application.yaml) for additional fields. As long as you h
 
 ```yaml
 spec:
+  project: default
   source:
     repoURL: https://argoproj.github.io/argo-helm
     chart: argo

diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -4,6 +4,6 @@ mkdocs==1.6.1
 mkdocs-material==7.1.8
 markdown_include==0.8.1
 pygments==2.18.0
-jinja2==3.1.4
+jinja2==3.1.5
 markdown==3.7
 pymdown-extensions==10.12
diff --git a/docs/snyk/index.md b/docs/snyk/index.md
@@ -23,16 +23,30 @@ recent minor releases.
 | [install.yaml](master/argocd-iac-install.html) | - | - | - | - |
 | [namespace-install.yaml](master/argocd-iac-namespace-install.html) | - | - | - | - |
 
+### v2.14.0-rc3
+
+|    | Critical | High | Medium | Low |
+|---:|:--------:|:----:|:------:|:---:|
+| [go.mod](v2.14.0-rc3/argocd-test.html) | 0 | 1 | 6 | 0 |
+| [ui/yarn.lock](v2.14.0-rc3/argocd-test.html) | 0 | 0 | 1 | 0 |
+| [dex:v2.41.1](v2.14.0-rc3/ghcr.io_dexidp_dex_v2.41.1.html) | 0 | 0 | 0 | 2 |
+| [haproxy:2.6.17-alpine](v2.14.0-rc3/public.ecr.aws_docker_library_haproxy_2.6.17-alpine.html) | 0 | 0 | 2 | 4 |
+| [redis:7.0.15-alpine](v2.14.0-rc3/public.ecr.aws_docker_library_redis_7.0.15-alpine.html) | 0 | 0 | 0 | 1 |
+| [argocd:v2.14.0-rc3](v2.14.0-rc3/quay.io_argoproj_argocd_v2.14.0-rc3.html) | 0 | 0 | 3 | 10 |
+| [redis:7.0.15-alpine](v2.14.0-rc3/redis_7.0.15-alpine.html) | 0 | 0 | 0 | 1 |
+| [install.yaml](v2.14.0-rc3/argocd-iac-install.html) | - | - | - | - |
+| [namespace-install.yaml](v2.14.0-rc3/argocd-iac-namespace-install.html) | - | - | - | - |
+
 ### v2.13.2
 
 |    | Critical | High | Medium | Low |
 |---:|:--------:|:----:|:------:|:---:|
-| [go.mod](v2.13.2/argocd-test.html) | 1 | 0 | 7 | 2 |
+| [go.mod](v2.13.2/argocd-test.html) | 1 | 1 | 7 | 2 |
 | [ui/yarn.lock](v2.13.2/argocd-test.html) | 0 | 0 | 1 | 0 |
 | [dex:v2.41.1](v2.13.2/ghcr.io_dexidp_dex_v2.41.1.html) | 0 | 0 | 0 | 2 |
 | [haproxy:2.6.17-alpine](v2.13.2/public.ecr.aws_docker_library_haproxy_2.6.17-alpine.html) | 0 | 0 | 2 | 4 |
 | [redis:7.0.15-alpine](v2.13.2/public.ecr.aws_docker_library_redis_7.0.15-alpine.html) | 0 | 0 | 0 | 1 |
-| [argocd:v2.13.2](v2.13.2/quay.io_argoproj_argocd_v2.13.2.html) | 0 | 0 | 3 | 10 |
+| [argocd:v2.13.2](v2.13.2/quay.io_argoproj_argocd_v2.13.2.html) | 0 | 0 | 3 | 11 |
 | [redis:7.0.15-alpine](v2.13.2/redis_7.0.15-alpine.html) | 0 | 0 | 0 | 1 |
 | [install.yaml](v2.13.2/argocd-iac-install.html) | - | - | - | - |
 | [namespace-install.yaml](v2.13.2/argocd-iac-namespace-install.html) | - | - | - | - |
@@ -41,12 +55,12 @@ recent minor releases.
 
 |    | Critical | High | Medium | Low |
 |---:|:--------:|:----:|:------:|:---:|
-| [go.mod](v2.12.8/argocd-test.html) | 1 | 0 | 8 | 2 |
+| [go.mod](v2.12.8/argocd-test.html) | 1 | 1 | 8 | 2 |
 | [ui/yarn.lock](v2.12.8/argocd-test.html) | 0 | 0 | 1 | 0 |
 | [dex:v2.38.0](v2.12.8/ghcr.io_dexidp_dex_v2.38.0.html) | 0 | 0 | 6 | 7 |
 | [haproxy:2.6.17-alpine](v2.12.8/public.ecr.aws_docker_library_haproxy_2.6.17-alpine.html) | 0 | 0 | 2 | 4 |
 | [redis:7.0.15-alpine](v2.12.8/public.ecr.aws_docker_library_redis_7.0.15-alpine.html) | 0 | 0 | 0 | 1 |
-| [argocd:v2.12.8](v2.12.8/quay.io_argoproj_argocd_v2.12.8.html) | 0 | 0 | 3 | 10 |
+| [argocd:v2.12.8](v2.12.8/quay.io_argoproj_argocd_v2.12.8.html) | 0 | 0 | 3 | 11 |
 | [redis:7.0.15-alpine](v2.12.8/redis_7.0.15-alpine.html) | 0 | 0 | 0 | 1 |
 | [install.yaml](v2.12.8/argocd-iac-install.html) | - | - | - | - |
 | [namespace-install.yaml](v2.12.8/argocd-iac-namespace-install.html) | - | - | - | - |
@@ -59,7 +73,7 @@ recent minor releases.
 | [ui/yarn.lock](v2.11.12/argocd-test.html) | 0 | 0 | 1 | 0 |
 | [dex:v2.38.0](v2.11.12/ghcr.io_dexidp_dex_v2.38.0.html) | 0 | 0 | 6 | 7 |
 | [haproxy:2.6.14-alpine](v2.11.12/haproxy_2.6.14-alpine.html) | 0 | 1 | 7 | 7 |
-| [argocd:v2.11.12](v2.11.12/quay.io_argoproj_argocd_v2.11.12.html) | 0 | 0 | 4 | 20 |
+| [argocd:v2.11.12](v2.11.12/quay.io_argoproj_argocd_v2.11.12.html) | 0 | 0 | 4 | 21 |
 | [redis:7.0.15-alpine](v2.11.12/redis_7.0.15-alpine.html) | 0 | 0 | 0 | 1 |
 | [install.yaml](v2.11.12/argocd-iac-install.html) | - | - | - | - |
 | [namespace-install.yaml](v2.11.12/argocd-iac-namespace-install.html) | - | - | - | - |
-Original file line number
+Diff line change
@@ Expand Up @@
     ```yaml
     spec:
+      project: default
       source:
         repoURL: https://argoproj.github.io/argo-helm
         chart: argo
@@ Expand Down @@