Merge branch 'master' into fix/overwrite_extensions_path

Signed-off-by: vasilegroza <[email protected]>
argoproj · Jan 26, 2025 · 2023868 · 2023868
2 parents 0102fe1 + 544aea1
commit 2023868
Show file tree

Hide file tree

Showing 826 changed files with 30,550 additions and 18,900 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -5,9 +5,14 @@ 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
diff --git a/.github/workflows/bump-major-version.yaml b/.github/workflows/bump-major-version.yaml
@@ -0,0 +1,89 @@
+name: Bump major version
+on:
+  workflow_dispatch: {}
+
+permissions: {}
+
+jobs:
+  prepare-release:
+    permissions:
+      contents: write  # for peter-evans/create-pull-request to create branch
+      pull-requests: write  # for peter-evans/create-pull-request to create a PR
+    name: Automatically update major version
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@8410ad0602e1e429cee44a835ae9f77f654a6694  # v4.0.0
+        with:
+          fetch-depth: 0
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      # Get the current major version from go.mod and save it as a variable.
+      - name: Get target version
+        id: get-target-version
+        run: |
+          set -ue
+          CURRENT_VERSION=$(grep 'module github.com/argoproj/argo-cd' go.mod | awk '{print $2}' | sed 's/.*\/v//')
+          echo "TARGET_VERSION=$((CURRENT_VERSION + 1))" >> $GITHUB_OUTPUT
+
+      - name: Copy source code to GOPATH
+        run: |
+          mkdir -p ~/go/src/github.com/argoproj
+          cp -a ../argo-cd ~/go/src/github.com/argoproj
+
+      - name: Run script to bump the version
+        run: |
+          hack/bump-major-version.sh
+        working-directory: /home/runner/go/src/github.com/argoproj/argo-cd
+
+      - name: Setup Golang
+        uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
+        with:
+          go-version: ${{ env.GOLANG_VERSION }}
+      - name: Add ~/go/bin to PATH
+        run: |
+          echo "/home/runner/go/bin" >> $GITHUB_PATH
+      - name: Add /usr/local/bin to PATH
+        run: |
+          echo "/usr/local/bin" >> $GITHUB_PATH
+      - name: Download & vendor dependencies
+        run: |
+          # We need to vendor go modules for codegen yet
+          go mod download
+          go mod vendor -v
+        working-directory: /home/runner/go/src/github.com/argoproj/argo-cd
+      - name: Install toolchain for codegen
+        run: |
+          make install-codegen-tools-local
+          make install-go-tools-local
+        working-directory: /home/runner/go/src/github.com/argoproj/argo-cd
+        # We install kustomize in the dist directory
+      - name: Add dist to PATH
+        run: |
+          echo "/home/runner/work/argo-cd/argo-cd/dist" >> $GITHUB_PATH
+      - name: Run codegen
+        run: |
+          set -x
+          export GOPATH=$(go env GOPATH)
+          make codegen-local
+        working-directory: /home/runner/go/src/github.com/argoproj/argo-cd
+
+      - name: Copy changes back
+        run: |
+          # Copy the contents back, but skip the .git directory
+          rsync -a --exclude=.git /home/runner/go/src/github.com/argoproj/argo-cd/ ../argo-cd
+
+      - name: Create pull request
+        uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f  # v7.0.5
+        with:
+          commit-message: "Bump major version to ${{ steps.get-target-version.outputs.TARGET_VERSION }}"
+          title: "Bump major version to ${{ steps.get-target-version.outputs.TARGET_VERSION }}"
+          body: |
+            Congrats! You've just bumped the major version to ${{ steps.get-target-version.outputs.TARGET_VERSION }}.
+            
+            Next steps:
+            - [ ] Merge this PR
+            - [ ] Add an upgrade guide to the docs for this version
+          branch: bump-major-version
+          branch-suffix: random
+          signoff: true
diff --git a/.github/workflows/ci-build.yaml b/.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.62.2
+          version: v1.63.4
           args: --verbose
 
   test-go:

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -195,7 +195,7 @@ jobs:
           echo "hashes=$(sha256sum /tmp/sbom.tar.gz | base64 -w0)" >> "$GITHUB_OUTPUT"
 
       - name: Upload SBOM
-        uses: softprops/action-gh-release@7b4da11513bf3f43f9999e90eabced41ab8bb048 # v2.2.0
+        uses: softprops/action-gh-release@c95fe1489396fe8a9eb87c0abf8aa5b2ef267fda # v2.2.1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:

diff --git a/.golangci.yaml b/.golangci.yaml
@@ -17,9 +17,12 @@ linters:
     - gomodguard
     - gosimple
     - govet
+    - importas
     - ineffassign
     - misspell
+    - nolintlint
     - perfsprint
+    - revive
     - staticcheck
     - testifylint
     - thelper
@@ -32,32 +35,109 @@ linters-settings:
     disabled-checks:
       - appendAssign
       - assignOp  # Keep it disabled for readability
-      - badCond
-      - commentFormatting
       - exitAfterDefer
-      - ifElseChain
       - mapKey
-      - singleCaseSwitch
       - typeSwitchVar
   goimports:
-    local-prefixes: github.com/argoproj/argo-cd/v2
+    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
   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
     # Optimizes `fmt.Errorf`.
-    errorf: false
+    errorf: true
     # 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
   testifylint:
     enable-all: true
     disable:

diff --git a/.goreleaser.yaml b/.goreleaser.yaml
@@ -16,11 +16,11 @@ builds:
     flags:
       - -v
     ldflags:
-      - -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 }}
+      - -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 }}
       - -extldflags="-static"
     goos:
       - linux
@@ -79,6 +79,8 @@ 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
 

diff --git a/.mockery.yaml b/.mockery.yaml
@@ -6,13 +6,13 @@ mockname: "{{.InterfaceName}}"
 with-expecter: false
 # individual interface config
 packages:
-  github.com/argoproj/argo-cd/v2/applicationset/generators:
+  github.com/argoproj/argo-cd/v3/applicationset/generators:
     interfaces:
       Generator:
-  github.com/argoproj/argo-cd/v2/applicationset/services:
+  github.com/argoproj/argo-cd/v3/applicationset/services:
     interfaces:
       Repos:
-  github.com/argoproj/argo-cd/v2/applicationset/services/scm_provider:
+  github.com/argoproj/argo-cd/v3/applicationset/services/scm_provider:
     config:
       dir: "applicationset/services/scm_provider/aws_codecommit/mocks"
     interfaces:
@@ -23,54 +23,57 @@ packages:
       dir: "applicationset/services/scm_provider/azure_devops/git/mocks"
     interfaces:
       Client:
-  github.com/argoproj/argo-cd/v2/applicationset/utils:
+  github.com/argoproj/argo-cd/v3/applicationset/utils:
     interfaces:
       Renderer:
-  github.com/argoproj/argo-cd/v2/commitserver/commit:
+  github.com/argoproj/argo-cd/v3/commitserver/commit:
     interfaces:
       RepoClientFactory:
-  github.com/argoproj/argo-cd/v2/commitserver/apiclient:
+  github.com/argoproj/argo-cd/v3/commitserver/apiclient:
     interfaces:
       CommitServiceClient:
       Clientset:
-  github.com/argoproj/argo-cd/v2/controller/cache:
+  github.com/argoproj/argo-cd/v3/controller/cache:
     interfaces:
       LiveStateCache:
-  github.com/argoproj/argo-cd/v2/reposerver/apiclient:
+  github.com/argoproj/argo-cd/v3/reposerver/apiclient:
     interfaces:
       RepoServerServiceClient:
       RepoServerService_GenerateManifestWithFilesClient:
-  github.com/argoproj/argo-cd/v2/server/application:
+  github.com/argoproj/argo-cd/v3/server/application:
     interfaces:
       Broadcaster:
-  github.com/argoproj/argo-cd/v2/server/extension:
+  github.com/argoproj/argo-cd/v3/server/extension:
     interfaces:
       ApplicationGetter:
       ExtensionMetricsRegistry:
       ProjectGetter:
       RbacEnforcer:
       SettingsGetter:
       UserGetter:
-  github.com/argoproj/argo-cd/v2/util/db:
+  github.com/argoproj/argo-cd/v3/util/db:
     interfaces:
       ArgoDB:
-  github.com/argoproj/argo-cd/v2/util/git:
+  github.com/argoproj/argo-cd/v3/util/git:
     interfaces:
       Client:
-  github.com/argoproj/argo-cd/v2/util/helm:
+  github.com/argoproj/argo-cd/v3/util/helm:
     interfaces:
       Client:
-  github.com/argoproj/argo-cd/v2/util/io:
+  github.com/argoproj/argo-cd/v3/util/io:
     interfaces:
       TempPaths:
-  github.com/argoproj/argo-cd/v2/util/notification/argocd:
+  github.com/argoproj/argo-cd/v3/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/v2/pkg/apiclient/session:
+  github.com/argoproj/argo-cd/v3/pkg/apiclient/session:
     interfaces:
       SessionServiceServer:
       SessionServiceClient:
-  github.com/argoproj/argo-cd/v2/pkg/apiclient/cluster:
+  github.com/argoproj/argo-cd/v3/pkg/apiclient/cluster:
     interfaces:
-      ClusterServiceServer:
+      ClusterServiceServer:
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
@@ -2,6 +2,7 @@ version: 2
 formats: all
 mkdocs:
   fail_on_warning: false
+  configuration: mkdocs.yml
 python:
   install:
     - requirements: docs/requirements.txt

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=docker.io/library/ubuntu:24.04@sha256:3f85b7caad41a95462cf5b787d8a04604c8262cdcdf9a472b8c52ef83375fe15
+ARG BASE_IMAGE=docker.io/library/ubuntu:24.04@sha256:80dd3c3b9c6cecb9f1667e9290b3bc61b78c2678c02cbdae5f0fea92cc6734ab
 ####################################################################################################
 # Builder image
 # Initial stage which pulls prepares build dependencies and CLI tooling we need for our final image