Update

Author: jgwest

.github/workflows/lint.yaml

@@ -1,4 +1,4 @@
-name: Code scans
+name: "Validation, verifications, and lints"
 on:
   pull_request:
     paths-ignore:
@@ -24,3 +24,16 @@ jobs:
       - name: Ensure there is no diff in code
         run: |
           git diff --ignore-matching-lines='.*createdAt:.*' --exit-code -- .
+
+  verify_argo_cd_has_updated_dependencies:
+    name: Verify Argo CD has updated dependencies, for the given target version
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v5
+      - name: "Call update dependencies Makefile target"
+        run: |
+          make update-dependencies
+      - name: Ensure there is no unexpected diff in repository artifacts
+        run: |
+          git diff --ignore-matching-lines='.*createdAt:.*' --exit-code -- .

Makefile

@@ -5,6 +5,13 @@
 # - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
 VERSION ?= 0.17.0
 
+# ARGO_CD_TARGET_VERSION is the target version that argocd-operator will install. 
+# Update this when you upgrade the Argo CD dependencies of the project.
+# After updating, call 'make update-dependencies'.
+# Notes:
+# - String should NOT begin with 'v' prefix, e.g. 'v3.1.1'
+ARGO_CD_TARGET_VERSION ?= 3.1.8
+
 # Try to detect Docker or Podman
 CONTAINER_RUNTIME := $(shell command -v docker 2> /dev/null || command -v podman 2> /dev/null)
 
@@ -357,3 +364,8 @@ if [ $$(printf '%s\n' $$requiredver $$currentver | sort -V | head -n1) = $$requi
 rm -rf $$TMP_DIR ;\
 }
 endef
+
+# Updates upstream dependencies throughout the repository
+.PHONY: update-dependencies
+update-dependencies:
+	"hack/update-dependencies-script/run.sh"

build/util/Dockerfile

@@ -1,5 +1,5 @@
-# Argo CD v3.1.1
-FROM quay.io/argoproj/argocd@sha256:a36ab0c0860c77159c16e04c7e786e7a282f04889ba9318052f0b8897d6d2040 AS argocd
+# Argo CD v3.1.8
+FROM quay.io/argoproj/argocd@sha256:19ba7f44cba487c4a0c98ac336327c4df04383dff84f87ea1a578972eb62dd17 as argocd
 
 # Final Image
 FROM docker.io/library/ubuntu:24.04

common/defaults.go

@@ -70,7 +70,7 @@ const (
 	ArgoCDDefaultArgoImage = "quay.io/argoproj/argocd"
 
 	// ArgoCDDefaultArgoVersion is the Argo CD container image digest to use when version not specified.
-	ArgoCDDefaultArgoVersion = "sha256:a36ab0c0860c77159c16e04c7e786e7a282f04889ba9318052f0b8897d6d2040" // v3.1.1
+	ArgoCDDefaultArgoVersion = "sha256:19ba7f44cba487c4a0c98ac336327c4df04383dff84f87ea1a578972eb62dd17" // v3.1.8
 
 	// ArgoCDDefaultBackupKeyLength is the length of the generated default backup key.
 	ArgoCDDefaultBackupKeyLength = 32

config/crd/bases/argoproj.io_applications.yaml

@@ -5887,4 +5887,4 @@ spec:
         type: object
     served: true
     storage: true
-    subresources: {}
+    subresources: {}

config/crd/bases/argoproj.io_applicationsets.yaml

@@ -17721,4 +17721,4 @@ spec:
     served: true
     storage: true
     subresources:
-      status: {}
+      status: {}

config/crd/bases/argoproj.io_appprojects.yaml

@@ -363,4 +363,4 @@ spec:
         - spec
         type: object
     served: true
-    storage: true
+    storage: true

controllers/argocd/dex_test.go

@@ -581,7 +581,7 @@ func TestReconcileArgoCD_reconcileDexDeployment_withUpdate(t *testing.T) {
 				Containers: []corev1.Container{
 					{
 						Name:  "dex",
-						Image: "ghcr.io/dexidp/dex@sha256:b08a58c9731c693b8db02154d7afda798e1888dc76db30d34c4a0d0b8a26d913",
+						Image: "ghcr.io/dexidp/dex@sha256:b08a58c9731c693b8db02154d7afda798e1888dc76db30d34c4a0d0b8a26d913", // (v2.43.0) NOTE: this value is modified by dependency update script
 						Command: []string{
 							"/shared/argocd-dex",
 							"rundex",

hack/update-dependencies-script/README.md

@@ -0,0 +1,19 @@
+# update-dependencies-script
+
+This is a simple go-based script that will upgrade the upstream dependencies in argocd-operator.
+
+## To run this script:
+
+In `(root)/Makefile`, modify `ARGO_CD_TARGET_VERSION` to target Argo CD version.
+
+Example:
+```
+ARGO_CD_TARGET_VERSION ?= 3.1.8
+```
+
+Then run the script:
+```
+make update-dependencies
+```
+
+See `hack/update-dependencies-script/main.go` for list dependencies that are updated.

hack/update-dependencies-script/go.mod

@@ -0,0 +1,9 @@
+module github.com/argoproj-labs/argocd-operator/dependency-upgrade
+
+go 1.20
+
+require (
+	github.com/google/go-github/v58 v58.0.0
+	github.com/google/go-querystring v1.1.0 // indirect
+	gopkg.in/yaml.v2 v2.4.0
+)