Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions bundle/manifests/gitops-operator.clusterserviceversion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions config/manager/manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions hack/non-olm-install/install-gitops-operator.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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:-""}
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down