sibling of 911a9c6

.gitattributes

@@ -5,14 +5,9 @@ docs/operator-manual/resource_actions_builtin.md linguist-generated=true
 docs/operator-manual/server-commands/argocd-*.md linguist-generated=true
 docs/user-guide/commands/argocd_*.md linguist-generated=true
 manifests/core-install.yaml linguist-generated=true
-manifests/core-install-with-hydrator.yaml linguist-generated=true
 manifests/crds/*-crd.yaml linguist-generated=true
 manifests/ha/install.yaml linguist-generated=true
-manifests/ha/install-with-hydrator.yaml linguist-generated=true
 manifests/ha/namespace-install.yaml linguist-generated=true
-manifests/ha/namespace-install-with-hydrator.yaml linguist-generated=true
 manifests/install.yaml linguist-generated=true
-manifests/install-with-hydrator.yaml linguist-generated=true
 manifests/namespace-install.yaml linguist-generated=true
-manifests/namespace-install-with-hydrator.yaml linguist-generated=true
 pkg/apis/api-rules/violation_exceptions.list linguist-generated=true

.github/workflows/ci-build.yaml

@@ -112,7 +112,7 @@ jobs:
         uses: golangci/golangci-lint-action@971e284b6050e8a5849b72094c50ab08da042db8 # v6.1.1
         with:
           # renovate: datasource=go packageName=github.com/golangci/golangci-lint versioning=regex:^v(?<major>\d+)\.(?<minor>\d+)\.(?<patch>\d+)?$
-          version: v1.63.4
+          version: v1.62.2
           args: --verbose
 
   test-go:
@@ -393,7 +393,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        uses: SonarSource/sonarqube-scan-action@bfd4e558cda28cda6b5defafb9232d191be8c203 # v4.2.1
+        uses: SonarSource/sonarqube-scan-action@1b442ee39ac3fa7c2acdd410208dcb2bcfaae6c4 # v4.1.0
         if: env.sonar_secret != ''
   test-e2e:
     name: Run end-to-end tests

.github/workflows/image-reuse.yaml

@@ -75,7 +75,7 @@ jobs:
         uses: sigstore/cosign-installer@dc72c7d5c4d10cd6bcb8cf6e3fd625a9e5e537da # v3.7.0
 
       - uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0
-      - uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0
+      - uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1
 
       - name: Setup tags for container image as a CSV type
         run: |

.gitpod.Dockerfile

@@ -1,4 +1,4 @@
-FROM gitpod/workspace-full@sha256:bec45ebdcc9b9c5ec28d5c61c16bf599200aa0d2dc1e69e2ed8ab0a424bae6db
+FROM gitpod/workspace-full@sha256:230285e0b949e6d728d384b2029a4111db7b9c87c182f22f32a0be9e36b225df
 
 USER root
 

.golangci.yaml

@@ -14,131 +14,43 @@ linters:
     - gocritic
     - gofumpt
     - goimports
-    - gomodguard
     - gosimple
     - govet
-    - importas
     - ineffassign
     - misspell
-    # Disabled because of https://github.com/argoproj/argo-cd/issues/21705
-    # - nolintlint
     - perfsprint
-    - revive
     - staticcheck
     - testifylint
     - thelper
     - unparam
     - unused
     - usestdlibvars
-    - whitespace
+    - whitespace 
 linters-settings:
   gocritic:
     disabled-checks:
       - appendAssign
-      - assignOp # Keep it disabled for readability
+      - assignOp  # Keep it disabled for readability
+      - badCond
+      - commentFormatting
       - exitAfterDefer
+      - ifElseChain
       - mapKey
+      - singleCaseSwitch
       - typeSwitchVar
   goimports:
-    local-prefixes: github.com/argoproj/argo-cd/v3
-  gomodguard:
-    blocked:
-      modules:
-        - github.com/golang-jwt/jwt/v4:
-            recommendations:
-              - github.com/golang-jwt/jwt/v5
-        - github.com/imdario/mergo:
-            recommendations:
-              - dario.cat/mergo
-            reason: '`github.com/imdario/mergo` has been renamed.'
-        - github.com/pkg/errors:
-            recommendations:
-              - errors
-  importas:
-    alias:
-      - alias: jwtgo
-        pkg: github.com/golang-jwt/jwt/v5
-      - alias: appsv1
-        pkg: k8s.io/api/apps/v1
-      - alias: corev1
-        pkg: k8s.io/api/core/v1
-      - alias: rbacv1
-        pkg: k8s.io/api/rbac/v1
-      - alias: apierrors
-        pkg: k8s.io/apimachinery/pkg/api/errors
-      - alias: metav1
-        pkg: k8s.io/apimachinery/pkg/apis/meta/v1
-      - alias: informersv1
-        pkg: k8s.io/client-go/informers/core/v1
-      - alias: stderrors
-        pkg: errors
-  nolintlint:
-    require-specific: true
+    local-prefixes: github.com/argoproj/argo-cd/v2
   perfsprint:
     # Optimizes even if it requires an int or uint type cast.
     int-conversion: true
     # Optimizes into `err.Error()` even if it is only equivalent for non-nil errors.
-    err-error: true
+    err-error: false
     # Optimizes `fmt.Errorf`.
-    errorf: true
+    errorf: false
     # Optimizes `fmt.Sprintf` with only one argument.
     sprintf1: true
     # Optimizes into strings concatenation.
-    strconcat: true
-  revive:
-    # https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md
-    rules:
-      - name: bool-literal-in-expr
-      - name: blank-imports
-        disabled: true
-      - name: context-as-argument
-        arguments:
-          - allowTypesBefore: '*testing.T,testing.TB'
-      - name: context-keys-type
-        disabled: true
-      - name: dot-imports
-        disabled: true
-      - name: duplicated-imports
-      - name: early-return
-        arguments:
-          - 'preserveScope'
-      - name: empty-block
-        disabled: true
-      - name: error-naming
-        disabled: true
-      - name: error-return
-      - name: error-strings
-        disabled: true
-      - name: errorf
-      - name: identical-branches
-      - name: if-return
-      - name: increment-decrement
-      - name: indent-error-flow
-        arguments:
-          - 'preserveScope'
-      - name: modifies-parameter
-      - name: optimize-operands-order
-      - name: range
-      - name: receiver-naming
-      - name: redefines-builtin-id
-        disabled: true
-      - name: redundant-import-alias
-      - name: superfluous-else
-        arguments:
-          - 'preserveScope'
-      - name: time-equal
-      - name: time-naming
-        disabled: true
-      - name: unexported-return
-        disabled: true
-      - name: unnecessary-stmt
-      - name: unreachable-code
-      - name: unused-parameter
-      - name: use-any
-      - name: useless-break
-      - name: var-declaration
-      - name: var-naming
-        disabled: true
+    strconcat: false
   testifylint:
     enable-all: true
     disable:

.goreleaser.yaml

@@ -16,11 +16,11 @@ builds:
     flags:
       - -v
     ldflags:
-      - -X github.com/argoproj/argo-cd/v3/common.version={{ .Version }}
-      - -X github.com/argoproj/argo-cd/v3/common.buildDate={{ .Date }}
-      - -X github.com/argoproj/argo-cd/v3/common.gitCommit={{ .FullCommit }}
-      - -X github.com/argoproj/argo-cd/v3/common.gitTreeState={{ .Env.GIT_TREE_STATE }}
-      - -X github.com/argoproj/argo-cd/v3/common.kubectlVersion={{ .Env.KUBECTL_VERSION }}
+      - -X github.com/argoproj/argo-cd/v2/common.version={{ .Version }}
+      - -X github.com/argoproj/argo-cd/v2/common.buildDate={{ .Date }}
+      - -X github.com/argoproj/argo-cd/v2/common.gitCommit={{ .FullCommit }}
+      - -X github.com/argoproj/argo-cd/v2/common.gitTreeState={{ .Env.GIT_TREE_STATE }}
+      - -X github.com/argoproj/argo-cd/v2/common.kubectlVersion={{ .Env.KUBECTL_VERSION }}
       - -extldflags="-static"
     goos:
       - linux
@@ -79,8 +79,6 @@ release:
 
     All Argo CD container images are signed by cosign.  A Provenance is generated for container images and CLI binaries which meet the SLSA Level 3 specifications. See the [documentation](https://argo-cd.readthedocs.io/en/stable/operator-manual/signed-release-assets) on how to verify.
 
-    ## Release Notes Blog Post
-    For a detailed breakdown of the key changes and improvements in this release, check out the [official blog post](https://blog.argoproj.io/argo-cd-v2-14-release-candidate-57a664791e2a)  
 
     ## Upgrading
 

.mockery.yaml

@@ -6,13 +6,13 @@ mockname: "{{.InterfaceName}}"
 with-expecter: false
 # individual interface config
 packages:
-  github.com/argoproj/argo-cd/v3/applicationset/generators:
+  github.com/argoproj/argo-cd/v2/applicationset/generators:
     interfaces:
       Generator:
-  github.com/argoproj/argo-cd/v3/applicationset/services:
+  github.com/argoproj/argo-cd/v2/applicationset/services:
     interfaces:
       Repos:
-  github.com/argoproj/argo-cd/v3/applicationset/services/scm_provider:
+  github.com/argoproj/argo-cd/v2/applicationset/services/scm_provider:
     config:
       dir: "applicationset/services/scm_provider/aws_codecommit/mocks"
     interfaces:
@@ -23,57 +23,54 @@ packages:
       dir: "applicationset/services/scm_provider/azure_devops/git/mocks"
     interfaces:
       Client:
-  github.com/argoproj/argo-cd/v3/applicationset/utils:
+  github.com/argoproj/argo-cd/v2/applicationset/utils:
     interfaces:
       Renderer:
-  github.com/argoproj/argo-cd/v3/commitserver/commit:
+  github.com/argoproj/argo-cd/v2/commitserver/commit:
     interfaces:
       RepoClientFactory:
-  github.com/argoproj/argo-cd/v3/commitserver/apiclient:
+  github.com/argoproj/argo-cd/v2/commitserver/apiclient:
     interfaces:
       CommitServiceClient:
       Clientset:
-  github.com/argoproj/argo-cd/v3/controller/cache:
+  github.com/argoproj/argo-cd/v2/controller/cache:
     interfaces:
       LiveStateCache:
-  github.com/argoproj/argo-cd/v3/reposerver/apiclient:
+  github.com/argoproj/argo-cd/v2/reposerver/apiclient:
     interfaces:
       RepoServerServiceClient:
       RepoServerService_GenerateManifestWithFilesClient:
-  github.com/argoproj/argo-cd/v3/server/application:
+  github.com/argoproj/argo-cd/v2/server/application:
     interfaces:
       Broadcaster:
-  github.com/argoproj/argo-cd/v3/server/extension:
+  github.com/argoproj/argo-cd/v2/server/extension:
     interfaces:
       ApplicationGetter:
       ExtensionMetricsRegistry:
       ProjectGetter:
       RbacEnforcer:
       SettingsGetter:
       UserGetter:
-  github.com/argoproj/argo-cd/v3/util/db:
+  github.com/argoproj/argo-cd/v2/util/db:
     interfaces:
       ArgoDB:
-  github.com/argoproj/argo-cd/v3/util/git:
+  github.com/argoproj/argo-cd/v2/util/git:
     interfaces:
       Client:
-  github.com/argoproj/argo-cd/v3/util/helm:
+  github.com/argoproj/argo-cd/v2/util/helm:
     interfaces:
       Client:
-  github.com/argoproj/argo-cd/v3/util/io:
+  github.com/argoproj/argo-cd/v2/util/io:
     interfaces:
       TempPaths:
-  github.com/argoproj/argo-cd/v3/util/notification/argocd:
+  github.com/argoproj/argo-cd/v2/util/notification/argocd:
     interfaces:
       Service:
-  github.com/argoproj/argo-cd/v3/util/workloadidentity:
-    interfaces:
-      TokenProvider:
   # These mocks are not currently used, but they are part of the public API of this package.      
-  github.com/argoproj/argo-cd/v3/pkg/apiclient/session:
+  github.com/argoproj/argo-cd/v2/pkg/apiclient/session:
     interfaces:
       SessionServiceServer:
       SessionServiceClient:
-  github.com/argoproj/argo-cd/v3/pkg/apiclient/cluster:
+  github.com/argoproj/argo-cd/v2/pkg/apiclient/cluster:
     interfaces:
-      ClusterServiceServer:
+      ClusterServiceServer: