chore: Upgrade Argo CD version to v.2.14.15 (#1772)

* Upgrade Argo CD version to v.2.14.15

Signed-off-by: nmirasch <neus.miras@gmail.com>

* Upgrade golangci-lint to v2.1.6

Signed-off-by: nmirasch <neus.miras@gmail.com>

* ci go version update, copied crds and updated defauls with the 2.14.15 argocd image

Signed-off-by: nmirasch <neus.miras@gmail.com>

* Revert makefile changes and run make bundle

Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>

---------

Signed-off-by: nmirasch <neus.miras@gmail.com>
Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>
Co-authored-by: Siddhesh Ghadi <sghadi1203@gmail.com>

Author: nmirasch

.github/workflows/ci-build.yaml

@@ -32,7 +32,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
+          go-version: '1.24'
 
       - name: Restore go build cache
         uses: actions/cache@v4
@@ -77,7 +77,7 @@ jobs:
       - name: Setup Golang
         uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
+          go-version: '1.24'
       - name: GH actions workaround - Kill XSP4 process
         run: |
           sudo pkill mono || true

.github/workflows/go.yml

@@ -24,7 +24,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v5
       with:
-        go-version: '1.22'
+        go-version: '1.24'
 
     - name: Build
       run: make build

.github/workflows/lint.yaml

@@ -16,9 +16,10 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
       - name: Run golangci-lint
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v8
         with:
-          version: v1.61.0
-          args: --timeout 5m --exclude SA5011
+          # renovate: datasource=go packageName=github.com/golangci/golangci-lint versioning=regex:^v(?<major>\d+)\.(?<minor>\d+)\.(?<patch>\d+)?$
+          version: v2.1.6
+          args: --timeout 5m
           only-new-issues: true
 

.github/workflows/publish.yaml

@@ -22,7 +22,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
+          go-version: '1.24'
 
       - name: Restore go build cache
         uses: actions/cache@v4

.golangci.yml

@@ -1,18 +1,38 @@
-run:
-  timeout: 2m
+version: "2"
 linters:
   enable:
+    - unconvert
+    - unparam
     - govet
     - unused
-    - goimports
-    - ineffassign
     - unconvert
-    - unparam
-issues:
-  exclude-files:
-    - ".*_test\\.go"
-  exclude-dirs:
-    - vendor/
-linters-settings:
-  goimports:
-    local-prefixes: github.com/argoproj-labs/argocd-operator
+  disable:
+    - staticcheck
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - .*_test\.go
+      - vendor/
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - goimports
+  settings:
+    goimports:
+      local-prefixes:
+        - github.com/argoproj-labs/argocd-operator
+  exclusions:
+    generated: lax
+    paths:
+      - .*_test\.go
+      - vendor/
+      - third_party$
+      - builtin$
+      - examples$

Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.22 as builder
+FROM golang:1.24 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests

Makefile

@@ -168,7 +168,7 @@ all: test install run e2e ## UnitTest, Run the operator locally and execute e2e
 
 CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
 controller-gen: ## Download controller-gen locally if necessary.
-	$(call go-install-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0)
+	$(call go-install-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.17.3)
 
 KUSTOMIZE = $(shell pwd)/bin/kustomize
 kustomize: ## Download kustomize locally if necessary.
@@ -194,12 +194,18 @@ rm -rf $$TMP_DIR ;\
 endef
 
 .PHONY: bundle
+# Detect platform and set SED_INPLACE accordingly
+ifeq ($(shell uname), Darwin)
+  SED_INPLACE = sed -i ''
+else
+  SED_INPLACE = sed -i
+endif
 bundle: operator-sdk manifests kustomize ## Generate bundle manifests and metadata, then validate generated files.
 	$(OPERATOR_SDK) generate kustomize manifests -q
 	cd config/manager && $(KUSTOMIZE) edit set image controller=$(IMG)
 	$(KUSTOMIZE) build config/manifests | $(OPERATOR_SDK) generate bundle -q --overwrite --version $(VERSION) $(BUNDLE_METADATA_OPTS)
 	$(OPERATOR_SDK) bundle validate ./bundle
-	sed -i 's/control-plane: argocd-operator/control-plane: controller-manager/g' bundle/manifests/argocd-operator-webhook-service_v1_service.yaml bundle/manifests/argocd-operator-controller-manager-metrics-service_v1_service.yaml bundle/manifests/argocd-operator.clusterserviceversion.yaml
+	$(SED_INPLACE) 's/control-plane: argocd-operator/control-plane: controller-manager/g' bundle/manifests/argocd-operator-webhook-service_v1_service.yaml bundle/manifests/argocd-operator-controller-manager-metrics-service_v1_service.yaml bundle/manifests/argocd-operator.clusterserviceversion.yaml
 	rm -fr deploy/olm-catalog/argocd-operator/$(VERSION)
 	mkdir -p deploy/olm-catalog/argocd-operator/$(VERSION)
 	cp -r bundle/manifests/* deploy/olm-catalog/argocd-operator/$(VERSION)/

build/util/Dockerfile

@@ -1,6 +1,5 @@
-# Argo CD v2.13.5
-# TODO: Pinned to 2.13.x https://github.com/argoproj-labs/argocd-operator/issues/1631#issue-2752065624
-FROM quay.io/argoproj/argocd@sha256:17c471916f3e14c01c599a534944c83a7905c1ba42a486e4ef9b87f58c788658 as argocd
+# Argo CD v2.14.15
+FROM quay.io/argoproj/argocd@sha256:3be6babe6a3248cf35f2c7816c0fcbbbdba592320d93494016ef7123031339cb as argocd
 
 # Final Image
 FROM docker.io/library/ubuntu:24.04

bundle/manifests/argocd-operator.clusterserviceversion.yaml

@@ -247,7 +247,7 @@ metadata:
     capabilities: Deep Insights
     categories: Integration & Delivery
     certified: "false"
-    createdAt: "2025-06-18T07:38:13Z"
+    createdAt: "2025-07-07T01:37:08Z"
     description: Argo CD is a declarative, GitOps continuous delivery tool for Kubernetes.
     operators.operatorframework.io/builder: operator-sdk-v1.35.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v4
@@ -441,10 +441,8 @@ spec:
         - urn:alm:descriptor:com.tectonic.ui:fieldGroup:Prometheus
         - urn:alm:descriptor:com.tectonic.ui:fieldGroup:Server
         - urn:alm:descriptor:com.tectonic.ui:booleanSwitch
-      - description: 'Deprecated: ConfigManagementPlugins field is no longer supported.
-          Argo CD now requires plugins to be defined as sidecar containers of repo
-          server component. See ''.spec.repo.sidecarContainers''. ConfigManagementPlugins
-          was previously used to specify additional config management plugins.'
+      - description: ConfigManagementPlugins is used to specify additional config
+          management plugins.
         displayName: Config Management Plugins'
         path: configManagementPlugins
         x-descriptors:
@@ -1060,10 +1058,8 @@ spec:
         - urn:alm:descriptor:com.tectonic.ui:fieldGroup:Prometheus
         - urn:alm:descriptor:com.tectonic.ui:fieldGroup:Server
         - urn:alm:descriptor:com.tectonic.ui:booleanSwitch
-      - description: 'Deprecated: ConfigManagementPlugins field is no longer supported.
-          Argo CD now requires plugins to be defined as sidecar containers of repo
-          server component. See ''.spec.repo.sidecarContainers''. ConfigManagementPlugins
-          was previously used to specify additional config management plugins.'
+      - description: ConfigManagementPlugins is used to specify additional config
+          management plugins.
         displayName: Config Management Plugins'
         path: configManagementPlugins
         x-descriptors:
@@ -1193,8 +1189,8 @@ spec:
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:fieldGroup:Import
         - urn:alm:descriptor:com.tectonic.ui:text
-      - description: 'Deprecated: InitialRepositories to configure Argo CD with upon
-          creation of the cluster.'
+      - description: InitialRepositories to configure Argo CD with upon creation of
+          the cluster.
         displayName: Initial Repositories'
         path: initialRepositories
         x-descriptors:
@@ -1701,22 +1697,14 @@ spec:
           resources:
           - configmaps
           verbs:
-          - create
-          - delete
-          - get
-          - list
-          - patch
-          - update
-          - watch
+          - '*'
         - apiGroups:
           - ""
           resources:
-          - configmaps
           - endpoints
           - events
           - namespaces
           - persistentvolumeclaims
-          - pods
           - secrets
           - serviceaccounts
           - services
@@ -1727,6 +1715,11 @@ spec:
           - ""
           resources:
           - pods
+          verbs:
+          - '*'
+        - apiGroups:
+          - ""
+          resources:
           - pods/log
           verbs:
           - get
@@ -1765,27 +1758,12 @@ spec:
           resources:
           - applications
           - appprojects
-          verbs:
-          - '*'
-        - apiGroups:
-          - argoproj.io
-          resources:
           - argocdexports
           - argocdexports/finalizers
           - argocdexports/status
-          verbs:
-          - '*'
-        - apiGroups:
-          - argoproj.io
-          resources:
           - argocds
           - argocds/finalizers
           - argocds/status
-          verbs:
-          - '*'
-        - apiGroups:
-          - argoproj.io
-          resources:
           - notificationsconfigurations
           - notificationsconfigurations/finalizers
           verbs:
@@ -1853,11 +1831,6 @@ spec:
           - rbac.authorization.k8s.io
           resources:
           - '*'
-          verbs:
-          - '*'
-        - apiGroups:
-          - rbac.authorization.k8s.io
-          resources:
           - clusterrolebindings
           - clusterroles
           verbs:

bundle/manifests/argoproj.io_argocdexports.yaml

@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.14.0
+    controller-gen.kubebuilder.io/version: v0.17.3
   creationTimestamp: null
   name: argocdexports.argoproj.io
 spec:
@@ -65,6 +65,7 @@ spec:
                         items:
                           type: string
                         type: array
+                        x-kubernetes-list-type: atomic
                       dataSource:
                         description: |-
                           dataSource field can be used to specify either:
@@ -149,33 +150,6 @@ spec:
                           status field of the claim.
                           More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources
                         properties:
-                          claims:
-                            description: |-
-                              Claims lists the names of resources, defined in spec.resourceClaims,
-                              that are used by this container.
-
-
-                              This is an alpha field and requires enabling the
-                              DynamicResourceAllocation feature gate.
-
-
-                              This field is immutable. It can only be set for containers.
-                            items:
-                              description: ResourceClaim references one entry in PodSpec.ResourceClaims.
-                              properties:
-                                name:
-                                  description: |-
-                                    Name must match the name of one entry in pod.spec.resourceClaims of
-                                    the Pod where this field is used. It makes that resource available
-                                    inside a container.
-                                  type: string
-                              required:
-                              - name
-                              type: object
-                            type: array
-                            x-kubernetes-list-map-keys:
-                            - name
-                            x-kubernetes-list-type: map
                           limits:
                             additionalProperties:
                               anyOf:
@@ -231,11 +205,13 @@ spec:
                                   items:
                                     type: string
                                   type: array
+                                  x-kubernetes-list-type: atomic
                               required:
                               - key
                               - operator
                               type: object
                             type: array
+                            x-kubernetes-list-type: atomic
                           matchLabels:
                             additionalProperties:
                               type: string
@@ -251,6 +227,21 @@ spec:
                           storageClassName is the name of the StorageClass required by the claim.
                           More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1
                         type: string
+                      volumeAttributesClassName:
+                        description: |-
+                          volumeAttributesClassName may be used to set the VolumeAttributesClass used by this claim.
+                          If specified, the CSI driver will create or update the volume with the attributes defined
+                          in the corresponding VolumeAttributesClass. This has a different purpose than storageClassName,
+                          it can be changed after the claim is created. An empty string value means that no VolumeAttributesClass
+                          will be applied to the claim but it's not allowed to reset this field to empty string once it is set.
+                          If unspecified and the PersistentVolumeClaim is unbound, the default VolumeAttributesClass
+                          will be set by the persistentvolume controller if it exists.
+                          If the resource referred to by volumeAttributesClass does not exist, this PersistentVolumeClaim will be
+                          set to a Pending state, as reflected by the modifyVolumeStatus field, until such as a resource
+                          exists.
+                          More info: https://kubernetes.io/docs/concepts/storage/volume-attributes-classes/
+                          (Beta) Using this field requires the VolumeAttributesClass feature gate to be enabled (off by default).
+                        type: string
                       volumeMode:
                         description: |-
                           volumeMode defines what type of volume is required by the claim.