Red Hat Konflux update gitops-operator (#781)

Signed-off-by: red-hat-konflux <[email protected]> Co-authored-by: red-hat-konflux <[email protected]>
redhat-developer · Oct 2, 2024 · 6687435 · 6687435
1 parent 6953e5a
commit 6687435
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/bundle/manifests/gitops-operator.clusterserviceversion.yaml b/bundle/manifests/gitops-operator.clusterserviceversion.yaml
@@ -992,6 +992,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

diff --git a/config/manager/manager.yaml b/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

diff --git a/hack/non-olm-install/install-gitops-operator.sh b/hack/non-olm-install/install-gitops-operator.sh
@@ -36,6 +36,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:-""}
@@ -222,6 +223,8 @@ spec:
           value: ${GITOPS_CONSOLE_PLUGIN_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
@@ -437,6 +440,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