Upgrade to Argo Rollouts operator v0.0.4.1 (#785)

Signed-off-by: Jonathan West <[email protected]>

Author: jgwest

bundle/manifests/gitops-operator.clusterserviceversion.yaml

@@ -994,6 +994,8 @@ spec:
                 env:
                 - name: ARGOCD_CLUSTER_CONFIG_NAMESPACES
                   value: openshift-gitops
+                - name: CLUSTER_SCOPED_ARGO_ROLLOUTS_NAMESPACES
+                  value: openshift-gitops
                 - name: OPERATOR_NAME
                   value: gitops-operator
                 - name: LABEL_SELECTOR

config/manager/manager.yaml

@@ -32,6 +32,8 @@ spec:
         env:
         - name: ARGOCD_CLUSTER_CONFIG_NAMESPACES
           value: openshift-gitops
+        - name: CLUSTER_SCOPED_ARGO_ROLLOUTS_NAMESPACES
+          value: openshift-gitops
         - name: OPERATOR_NAME
           value: gitops-operator
         - name : LABEL_SELECTOR

go.mod

@@ -3,7 +3,7 @@ module github.com/redhat-developer/gitops-operator
 go 1.21.0
 
 require (
-	github.com/argoproj-labs/argo-rollouts-manager v0.0.4-0.20240807084148-a96aa79b5464
+	github.com/argoproj-labs/argo-rollouts-manager v0.0.5-0.20241004094712-aea86d7ae590
 	github.com/argoproj-labs/argocd-operator v0.12.0-rc3
 	github.com/coreos/prometheus-operator v0.40.0
 	github.com/go-logr/logr v1.4.2

go.sum

@@ -620,8 +620,8 @@ github.com/apache/arrow/go/v11 v11.0.0/go.mod h1:Eg5OsL5H+e299f7u5ssuXsuHQVEGC4x
 github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
 github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
 github.com/apache/thrift v0.16.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU=
-github.com/argoproj-labs/argo-rollouts-manager v0.0.4-0.20240807084148-a96aa79b5464 h1:LTMoDmQoIjqhe+pulFiG7l80pnjjZX6WiivURO2uXsQ=
-github.com/argoproj-labs/argo-rollouts-manager v0.0.4-0.20240807084148-a96aa79b5464/go.mod h1:seR9B+tx6AbGaya+JA61HDBFciKx7FM7t/1IMhOwXlM=
+github.com/argoproj-labs/argo-rollouts-manager v0.0.5-0.20241004094712-aea86d7ae590 h1:UJWMptB+Vi1KwRmzkdr0aGkyOE4YP2VDg59Lt9S3AEI=
+github.com/argoproj-labs/argo-rollouts-manager v0.0.5-0.20241004094712-aea86d7ae590/go.mod h1:seR9B+tx6AbGaya+JA61HDBFciKx7FM7t/1IMhOwXlM=
 github.com/argoproj-labs/argocd-operator v0.12.0-rc3 h1:UqHQFeaZKWY8IqsAgLU3CwjRymcYCsJ01Wysqf7nDiY=
 github.com/argoproj-labs/argocd-operator v0.12.0-rc3/go.mod h1:+yvFAnSJZL8iOTWI3cTQ9qwXfh40lLyOI4ghDFqM8S0=
 github.com/argoproj/argo-cd/v2 v2.12.3 h1:Bi4QahHTnKl3esU5MplQP1wraGhaTpvgAV4GsMqc3Zc=

hack/non-olm-install/install-gitops-operator.sh

@@ -37,6 +37,7 @@ REGCTL_VERSION=${REGCTL_VERSION:-"v0.5.1"}
 
 # Operator configurations
 ARGOCD_CLUSTER_CONFIG_NAMESPACES=${ARGOCD_CLUSTER_CONFIG_NAMESPACES:-"openshift-gitops"}
+CLUSTER_SCOPED_ARGO_ROLLOUTS_NAMESPACES=${CLUSTER_SCOPED_ARGO_ROLLOUTS_NAMESPACES:-"openshift-gitops"}
 CONTROLLER_CLUSTER_ROLE=${CONTROLLER_CLUSTER_ROLE:-""}
 DISABLE_DEFAULT_ARGOCD_INSTANCE=${DISABLE_DEFAULT_ARGOCD_INSTANCE:-"false"}
 SERVER_CLUSTER_ROLE=${SERVER_CLUSTER_ROLE:-""}
@@ -225,6 +226,8 @@ spec:
           value: ${KAM_IMAGE}
         - name: ARGOCD_CLUSTER_CONFIG_NAMESPACES
           value: \"${ARGOCD_CLUSTER_CONFIG_NAMESPACES}\"
+        - name: CLUSTER_SCOPED_ARGO_ROLLOUTS_NAMESPACES
+          value: \"${CLUSTER_SCOPED_ARGO_ROLLOUTS_NAMESPACES}\"
         - name: CONTROLLER_CLUSTER_ROLE
           value: \"${CONTROLLER_CLUSTER_ROLE}\"
         - name: DISABLE_DEFAULT_ARGOCD_INSTANCE
@@ -442,6 +445,7 @@ function print_info() {
   echo "Operator configurations:"
   echo "------------------------"
   echo "ARGOCD_CLUSTER_CONFIG_NAMESPACES: ${ARGOCD_CLUSTER_CONFIG_NAMESPACES}"
+  echo "CLUSTER_SCOPED_ARGO_ROLLOUTS_NAMESPACES: ${CLUSTER_SCOPED_ARGO_ROLLOUTS_NAMESPACES}"
   if [ ! -z "${CONTROLLER_CLUSTER_ROLE}" ]; then
     echo "CONTROLLER_CLUSTER_ROLE: ${CONTROLLER_CLUSTER_ROLE}"
   fi

scripts/run-rollouts-e2e-tests.sh

@@ -16,7 +16,7 @@ cd "$ROLLOUTS_TMP_DIR/argo-rollouts-manager"
 
 # This commit value will be automatically updated by calling 'hack/upgrade-rollouts-manager/go-run.sh':
 # - It should always point to the same argo-rollouts-manager commit that is referenced in go.mod of gitops-operator (which will usually be the most recent argo-rollouts-manager commit)
-TARGET_ROLLOUT_MANAGER_COMMIT=a96aa79b546433ee2d68f48d424baaabed0cb2ac
+TARGET_ROLLOUT_MANAGER_COMMIT=aea86d7ae5902e2ee8d0e652a2770484d9fa09df
 
 # This commit value will be automatically updated by calling 'hack/upgrade-rollouts-manager/go-run.sh':
 # - It should always point to the same argo-rollouts-manager commit that is referenced in the version of argo-rollouts-manager that is in go.mod

test/openshift/e2e/sequential/1-100_validate_rollouts_resources_creation/01-assert.yaml

@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: argo-rollouts
+  namespace: openshift-gitops
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
@@ -33,15 +34,18 @@ kind: Secret
 apiVersion: v1
 metadata:
   name: argo-rollouts-notification-secret
+  namespace: openshift-gitops
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: argo-rollouts
+  namespace: openshift-gitops  
 status:
   readyReplicas: 1
 ---
 apiVersion: v1
 kind: Service
 metadata:
   name: argo-rollouts-metrics
+  namespace: openshift-gitops  

test/openshift/e2e/sequential/1-100_validate_rollouts_resources_creation/01-install-rolloutmanager.yaml

@@ -2,6 +2,7 @@ apiVersion: argoproj.io/v1alpha1
 kind: RolloutManager
 metadata:
   name: example-rollout-manager
+  namespace: openshift-gitops  
   labels:
     example: example-rollout-manager
 spec: {}

test/openshift/e2e/sequential/1-100_validate_rollouts_resources_creation/02-assert.yaml

@@ -3,5 +3,6 @@ apiVersion: argoproj.io/v1alpha1
 kind: RolloutManager
 metadata:
   name: example-rollout-manager
+  namespace: openshift-gitops  
 status:
   phase: Available

test/openshift/e2e/sequential/1-101_validate_rollout_policyrules/01-install-rollloutmanager.yaml

@@ -2,6 +2,7 @@ apiVersion: argoproj.io/v1alpha1
 kind: RolloutManager
 metadata:
   name: example-rollout-manager
+  namespace: openshift-gitops  
   labels:
     example: example-rollout-manager
 spec: {}