update all remaining references to use new namespace

Signed-off-by: Jaideep Rao <[email protected]>

Author: jaideepr97

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

@@ -62,24 +62,24 @@ function print_help() {
 function check_pod_status_ready() {
   # Wait for the deployment rollout to complete before trying to list the pods
   # to ensure that only pods corresponding to the new version is considered.
-  ${KUBECTL} rollout status deploy -n ${NAMESPACE_PREFIX}system --timeout=5m
+  ${KUBECTL} rollout status deploy -n openshift-gitops-operator --timeout=5m
   if [ $? -ne 0 ]; then
     echo "[INFO] Deployments did not reach healthy state within 5m. Rolling back"
   else
     echo "[INFO] Deployments reached healthy state."
     return 0
   fi
 
-  pod_name=$(${KUBECTL} get pods --no-headers --field-selector="status.phase!=Succeeded" -o custom-columns=":metadata.name" -n ${NAMESPACE_PREFIX}system | grep "${1}");
+  pod_name=$(${KUBECTL} get pods --no-headers --field-selector="status.phase!=Succeeded" -o custom-columns=":metadata.name" -n openshift-gitops-operator | grep "${1}");
   if [ -z "$pod_name" ]; then
     echo "[WARN] Ignoring empty pod name"
     return 0
   fi
   echo "[DEBUG] Pod name : $pod_name";
-  ${KUBECTL} wait pod --for=condition=Ready $pod_name -n ${NAMESPACE_PREFIX}system --timeout=150s;
+  ${KUBECTL} wait pod --for=condition=Ready $pod_name -n ${NAMESPACE} --timeout=150s;
   if [ $? -ne 0 ]; then
     echo "[INFO] Pod '$pod_name' failed to become Ready in desired time. Logs from the pod:"
-    ${KUBECTL} logs $pod_name -n ${NAMESPACE_PREFIX}system --all-containers;
+    ${KUBECTL} logs $pod_name -n ${NAMESPACE} --all-containers;
     echo "[ERROR] Install/Upgrade failed. Performing rollback";
     rollback
     return 1
@@ -455,7 +455,7 @@ function migrate_olm_installation() {
   fi
   apply_kustomize_manifests
   # Check pod status if it becomes ready
-  check_pod_status_ready gitops-operator-controller-manager
+  check_pod_status_ready openshift-gitops-operator-controller-manager
 
   if [ $? -eq 0 ]; then
     # Non OLM installation is successful and its safe to remove the OLM specific
@@ -469,20 +469,20 @@ function migrate_olm_installation() {
 # When migrating from OLM to non OLM installation, deployment created by the OLM operator
 # must be scaled down to avoid 2 conflicting operators operating on the same CR.
 function scale_down_olm_deploy() {
-  ${KUBECTL} scale deploy/gitops-operator-controller-manager -n openshift-operators --replicas=0
+  ${KUBECTL} scale deploy/openshift-gitops-operator-controller-manager -n ${NAMESPACE} --replicas=0
 }
 
 # If migration to non OLM installation fails, revert to OLM based installation
 # by scaling back the OLM created deployments from 0 to 1.
 # Note: Rollback is possible only if the corresponding Subscription and ClusterServiceVersion objects are available.
 function rollback_to_olm() {
-  ${KUBECTL} scale deploy/gitops-operator-controller-manager -n openshift-operators --replicas=1
+  ${KUBECTL} scale deploy/openshift-gitops-operator-controller-manager -n ${NAMESPACE} --replicas=1
 }
 
 # Deletes the subscription for openshift-gitops-operator
 function remove_subscription() {
   #Delete the gitops subscription
-  ${KUBECTL} delete subscription openshift-gitops-operator -n openshift-operators
+  ${KUBECTL} delete subscription openshift-gitops-operator -n ${NAMESPACE}
 }
 
 # Deletes the ClusterServiceVersion Object from the system
@@ -493,21 +493,21 @@ function remove_installed_csv() {
     echo "[INFO] No installed CSV in Subscription"
     return
   fi
-  ${KUBECTL} delete clusterserviceversion ${installedCSV} -n openshift-operators
+  ${KUBECTL} delete clusterserviceversion ${installedCSV} -n ${NAMESPACE}
 }
 
 # Waits till the OLM removal is successful.
 function wait_for_olm_removal() {
   # Wait till the operator deployment is completely removed.
-  ${KUBECTL} wait --for=delete deploy/gitops-operator-controller-manager -n openshift-operators --timeout=60s
+  ${KUBECTL} wait --for=delete deploy/openshift-gitops-operator-controller-manager -n ${NAMESPACE} --timeout=60s
 }
 
 # Extract the custom configuration set in the Subscription and
 # store the env settings in a file which can be sourced when running
 # the non-OLM installation.
 function extract_custom_env_in_subscription() {
   # Get the GitOps subscription object as yaml
-  ${KUBECTL} get subscription openshift-gitops-operator -n openshift-operators -o yaml > ${WORK_DIR}/subscription.yaml
+  ${KUBECTL} get subscription openshift-gitops-operator -n ${NAMESPACE} -o yaml > ${WORK_DIR}/subscription.yaml
   # check if config.env element is present
   element=$(${YQ} '.spec.config.env' ${WORK_DIR}/subscription.yaml)
   if [ "${element}" == "null" ]; then

hack/scripts/run-non-olm-kuttl-test.sh

@@ -54,7 +54,7 @@ done
 
 #replace the namespace for assert in test file
 
-sed -i 's/openshift-operators/gitops-operator-system/g' $temp_dir/sequential/1-018_validate_disable_default_instance/02-assert.yaml \
+sed -i 's/openshift-operators/openshift-gitops-operator/g' $temp_dir/sequential/1-018_validate_disable_default_instance/02-assert.yaml \
   $temp_dir/sequential/1-035_validate_argocd_secret_repopulate/04-check_controller_pod_status.yaml
 
 cleanup() {

test/openshift/e2e/ignore-tests/sequential/1-018_validate_disable_default_instance/02-patch-subscription.yaml

@@ -4,7 +4,7 @@ commands:
 # patches the subscription to set an environment variable
 - script: |
     if ! [ -z $NON_OLM ]; then
-      oc patch deployment gitops-operator-controller-manager -n gitops-operator-system \
+      oc patch deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator \
         -p '{"spec":{"template":{"spec":{"containers":[{"name":"manager","env":[{"name":"DISABLE_DEFAULT_ARGOCD_INSTANCE","value":"true"}]}]}}}}'
     
     elif [ -z $CI ]; then 

test/openshift/e2e/ignore-tests/sequential/1-018_validate_disable_default_instance/04-patch-subscription.yaml

@@ -4,7 +4,7 @@ commands:
 # patches the subscription to set an environment variable
 - script: |
     if ! [ -z $NON_OLM ]; then
-      oc patch deployment gitops-operator-controller-manager -n gitops-operator-system \
+      oc patch deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator \
         -p '{"spec":{"template":{"spec":{"containers":[{"name":"manager","env":[{"name":"DISABLE_DEFAULT_ARGOCD_INSTANCE","value":null}]}]}}}}'
 
     elif [ -z $CI ]; then 

test/openshift/e2e/sequential/1-034_validate_custom_roles/02-patch-subscription.yaml

@@ -5,12 +5,12 @@ commands:
 - script: |
 
     if ! [ -z $NON_OLM ]; then       
-        oc patch deployment gitops-operator-controller-manager -n gitops-operator-system \
+        oc patch deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator \
           -p '{"spec":{"template":{"spec":{"containers":[{"name":"manager","env":[{"name":"CONTROLLER_CLUSTER_ROLE","value":"custom-argocd-role"},{"name":"SERVER_CLUSTER_ROLE", "value":"custom-argocd-role"}]}]}}}}'
      
     elif ! [ -z $CI ]; then    
       
-      oc patch -n openshift-operators subscription `subscription=gitops-operator- && oc get subscription --all-namespaces | grep $subscription | head -1 | awk '{print $2}'`\
+      oc patch -n openshift-gitops-operator subscription `subscription=gitops-operator- && oc get subscription --all-namespaces | grep $subscription | head -1 | awk '{print $2}'`\
         --type merge --patch '{"spec": {"config": {"env": [{"name": "CONTROLLER_CLUSTER_ROLE", "value": "custom-argocd-role"},{"name": "SERVER_CLUSTER_ROLE", "value": "custom-argocd-role"}]}}}'
 
     else

test/openshift/e2e/sequential/1-034_validate_custom_roles/06-revert-patch.yaml

@@ -3,11 +3,11 @@ kind: TestStep
 commands:
 - script: |
     if ! [ -z $NON_OLM ]; then       
-        oc patch deployment gitops-operator-controller-manager -n gitops-operator-system \
+        oc patch deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator \
           -p '{"spec":{"template":{"spec":{"containers":[{"name":"manager","env":[{"name":"CONTROLLER_CLUSTER_ROLE","value":null},{"name":"SERVER_CLUSTER_ROLE", "value":null}]}]}}}}'
      
     elif ! [ -z $CI ]; then 
-        oc patch -n openshift-operators subscription `subscription=gitops-operator- && oc get subscription --all-namespaces | grep $subscription | head -1 | awk '{print $2}'` --type json --patch='[ { "op": "remove", "path": "/spec/config" } ]'
+        oc patch -n openshift-gitops-operator subscription `subscription=gitops-operator- && oc get subscription --all-namespaces | grep $subscription | head -1 | awk '{print $2}'` --type json --patch='[ { "op": "remove", "path": "/spec/config" } ]'
     else
         oc patch subscription/openshift-gitops-operator -n openshift-gitops-operator --type json --patch='[ { "op": "remove", "path": "/spec/config" } ]'
     fi

test/openshift/e2e/sequential/1-050_validate_sso_config/04-disable-dex-through-sub.yaml

@@ -3,7 +3,7 @@ kind: TestStep
 commands:
 - script: |
     if ! [ -z $NON_OLM ]; then 
-      oc patch deployment gitops-operator-controller-manager -n gitops-operator-system \
+      oc patch deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator \
         -p '{"spec":{"template":{"spec":{"containers":[{"name":"manager","env":[{"name":"DISABLE_DEX","value":"true"}]}]}}}}'
     
     elif [ -z $CI ]; then 

test/openshift/e2e/sequential/1-050_validate_sso_config/05-unset-disable-dex-env-var.yaml

@@ -3,7 +3,7 @@ kind: TestStep
 commands:
 - script: |
     if ! [ -z $NON_OLM ]; then 
-      oc patch deployment gitops-operator-controller-manager -n gitops-operator-system \
+      oc patch deployment gitops-operator-controller-manager -n openshift-gitops-operator \
         -p '{"spec":{"template":{"spec":{"containers":[{"name":"manager","env":[{"name":"DISABLE_DEX","value":""}]}]}}}}'
    
     elif [ -z $CI ]; then 

test/openshift/e2e/sequential/1-056_validate_managed-by/04-add_env.yaml

@@ -6,7 +6,7 @@ commands:
     set -e
 
     if ! [ -z $NON_OLM ]; then       
-        oc patch deployment gitops-operator-controller-manager -n gitops-operator-system \
+        oc patch deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator \
           -p '{"spec":{"template":{"spec":{"containers":[{"name":"manager","env":[{"name":"REMOVE_MANAGED_BY_LABEL_ON_ARGOCD_DELETION","value":"true"}]}]}}}}'     
     
     elif [ -z $CI ]; then 

test/openshift/e2e/sequential/1-056_validate_managed-by/05-check.yaml

@@ -3,15 +3,15 @@ kind: TestStep
 commands:
 - script: |
     if ! [ -z $NON_OLM ]; then
-      label_value=$(oc get  deployment gitops-operator-controller-manager -n gitops-operator-system -o json | jq '.spec.template.spec.containers[]|select(.name=="manager")|.env[] | select(.name=="REMOVE_MANAGED_BY_LABEL_ON_ARGOCD_DELETION")|.value')
+      label_value=$(oc get  deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator -o json | jq '.spec.template.spec.containers[]|select(.name=="manager")|.env[] | select(.name=="REMOVE_MANAGED_BY_LABEL_ON_ARGOCD_DELETION")|.value')
       if [ -z $label_value ]; then
         echo "REMOVE_MANAGED_BY_LABEL_ON_ARGOCD_DELETION not set"
         exit 1
       else
         exit 0
       fi
     elif [ -z $CI ]; then
-      label_value=$(oc get  subscriptions openshift-gitops-operator -n openshift-operators -o json | jq '.spec.config.env[]|select(.name=="REMOVE_MANAGED_BY_LABEL_ON_ARGOCD_DELETION").value')
+      label_value=$(oc get  subscriptions openshift-gitops-operator -n openshift-gitops-operator -o json | jq '.spec.config.env[]|select(.name=="REMOVE_MANAGED_BY_LABEL_ON_ARGOCD_DELETION").value')
       if [ -z $label_value ]; then
         echo "REMOVE_MANAGED_BY_LABEL_ON_ARGOCD_DELETION not set"
         exit 1

test/openshift/e2e/sequential/1-056_validate_managed-by/08-remove_env.yaml

@@ -4,10 +4,10 @@ commands:
 # patches the subscription to set an environment variable
 - script: |
     if ! [ -z $NON_OLM ]; then       
-        oc patch deployment gitops-operator-controller-manager -n gitops-operator-system \
+        oc patch deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator \
           -p '{"spec":{"template":{"spec":{"containers":[{"name":"manager","env":[{"name":"REMOVE_MANAGED_BY_LABEL_ON_ARGOCD_DELETION","value":null}]}]}}}}'    
     elif [ -z $CI ]; then
-      oc patch -n openshift-operators subscription openshift-gitops-operator \
+      oc patch -n openshift-gitops-operator subscription openshift-gitops-operator \
         --type json --patch '[{"op": "remove", "path": "/spec/config"}]'
     else
       oc patch -n openshift-gitops-operator subscription `subscription=gitops-operator- && oc get subscription --all-namespaces | grep $subscription | head -1 | awk '{print $2}'` \

test/openshift/e2e/sequential/1-078_validate_default_argocd_consoleLink/02-add_env.yaml

@@ -3,10 +3,10 @@ kind: TestStep
 commands:
 - script: |
     if ! [ -z $NON_OLM ]; then
-      oc patch deployment gitops-operator-controller-manager -n gitops-operator-system \
+      oc patch deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator \
         -p '{"spec":{"template":{"spec":{"containers":[{"name":"manager","env":[{"name":"DISABLE_DEFAULT_ARGOCD_CONSOLELINK","value":"true"}]}]}}}}'
     elif [ -z $CI ]; then
-      oc patch -n openshift-operators subscription openshift-gitops-operator \
+      oc patch -n openshift-gitops-operator subscription openshift-gitops-operator \
         --type merge --patch '{"spec": {"config": {"env": [{"name": "DISABLE_DEFAULT_ARGOCD_CONSOLELINK", "value": "true"}]}}}'
     else
       oc patch -n openshift-gitops-operator subscription `subscription=gitops-operator- && oc get subscription --all-namespaces | grep $subscription | head -1 | awk '{print $2}'` \

test/openshift/e2e/sequential/1-078_validate_default_argocd_consoleLink/03-check-env.yaml

@@ -3,7 +3,7 @@ kind: TestStep
 commands:
 - script: |
     if ! [ -z $NON_OLM ]; then
-      label_value=$(oc get  deployment gitops-operator-controller-manager -n gitops-operator-system -o json | jq '.spec.template.spec.containers[]|select(.name=="manager")|.env[] | select(.name=="DISABLE_DEFAULT_ARGOCD_CONSOLELINK")|.value')
+      label_value=$(oc get  deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator -o json | jq '.spec.template.spec.containers[]|select(.name=="manager")|.env[] | select(.name=="DISABLE_DEFAULT_ARGOCD_CONSOLELINK")|.value')
       if ! [[ "${label_value}" == '"true"' ]]; then
         echo "Label value: $label_value"
         echo "DISABLE_DEFAULT_ARGOCD_CONSOLELINK not set"
@@ -12,7 +12,7 @@ commands:
         exit 0
       fi
     elif [ -z $CI ]; then
-      label_value=$(oc get  subscriptions openshift-gitops-operator -n openshift-operators -o json | jq '.spec.config.env[]|select(.name=="DISABLE_DEFAULT_ARGOCD_CONSOLELINK").value')
+      label_value=$(oc get  subscriptions openshift-gitops-operator -n openshift-gitops-operator -o json | jq '.spec.config.env[]|select(.name=="DISABLE_DEFAULT_ARGOCD_CONSOLELINK").value')
       if ! [[ "${label_value}" == '"true"' ]]; then
         echo "Label value: $label_value"
         echo "DISABLE_DEFAULT_ARGOCD_CONSOLELINK not set"

test/openshift/e2e/sequential/1-078_validate_default_argocd_consoleLink/04-disable-env.yaml

@@ -3,11 +3,11 @@ kind: TestStep
 commands:
 - script: |
     if ! [ -z $NON_OLM ]; then
-      oc patch deployment gitops-operator-controller-manager -n gitops-operator-system \
+      oc patch deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator \
         -p '{"spec":{"template":{"spec":{"containers":[{"name":"manager","env":[{"name":"DISABLE_DEFAULT_ARGOCD_CONSOLELINK","value":"false"}]}]}}}}'
     
     elif [ -z $CI ]; then
-      oc patch -n openshift-operators subscription openshift-gitops-operator \
+      oc patch -n openshift-gitops-operator subscription openshift-gitops-operator \
         --type merge --patch '{"spec": {"config": {"env": [{"name": "DISABLE_DEFAULT_ARGOCD_CONSOLELINK", "value": "false"}]}}}'
     else
       oc patch -n openshift-gitops-operator subscription `subscription=gitops-operator- && oc get subscription --all-namespaces | grep $subscription | head -1 | awk '{print $2}'` \

test/openshift/e2e/sequential/1-078_validate_default_argocd_consoleLink/05-check-env.yaml

@@ -3,7 +3,7 @@ kind: TestStep
 commands:
 - script: |
     if ! [ -z $NON_OLM ]; then
-      label_value=$(oc get  deployment gitops-operator-controller-manager -n gitops-operator-system -o json | jq '.spec.template.spec.containers[]|select(.name=="manager")|.env[] | select(.name=="DISABLE_DEFAULT_ARGOCD_CONSOLELINK")|.value')
+      label_value=$(oc get  deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator -o json | jq '.spec.template.spec.containers[]|select(.name=="manager")|.env[] | select(.name=="DISABLE_DEFAULT_ARGOCD_CONSOLELINK")|.value')
       if ! [[ "${label_value}" == '"false"' ]]; then
         echo "Label value: $label_value"
         echo "DISABLE_DEFAULT_ARGOCD_CONSOLELINK set"
@@ -12,7 +12,7 @@ commands:
         exit 0
       fi
     elif [ -z $CI ]; then
-      label_value=$(oc get  subscriptions openshift-gitops-operator -n openshift-operators -o json | jq '.spec.config.env[]|select(.name=="DISABLE_DEFAULT_ARGOCD_CONSOLELINK").value')
+      label_value=$(oc get  subscriptions openshift-gitops-operator -n openshift-gitops-operator -o json | jq '.spec.config.env[]|select(.name=="DISABLE_DEFAULT_ARGOCD_CONSOLELINK").value')
 
       if ! [[ "${label_value}" == '"false"' ]]; then
         echo "DISABLE_DEFAULT_ARGOCD_CONSOLELINK set"

test/openshift/e2e/sequential/1-078_validate_default_argocd_consoleLink/06-empty-valued-env.yaml

@@ -3,11 +3,11 @@ kind: TestStep
 commands:
 - script: |
     if ! [ -z $NON_OLM ]; then
-      oc patch deployment gitops-operator-controller-manager -n gitops-operator-system \
+      oc patch deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator \
         -p '{"spec":{"template":{"spec":{"containers":[{"name":"manager","env":[{"name":"DISABLE_DEFAULT_ARGOCD_CONSOLELINK","value":""}]}]}}}}'
     
     elif [ -z $CI ]; then
-      oc patch -n openshift-operators subscription openshift-gitops-operator \
+      oc patch -n openshift-gitops-operator subscription openshift-gitops-operator \
         --type merge --patch '{"spec": {"config": {"env": [{"name": "DISABLE_DEFAULT_ARGOCD_CONSOLELINK", "value": ""}]}}}'
     else
       oc patch -n openshift-gitops-operator subscription `subscription=gitops-operator- && oc get subscription --all-namespaces | grep $subscription | head -1 | awk '{print $2}'` \

test/openshift/e2e/sequential/1-078_validate_default_argocd_consoleLink/07-check-env.yaml

@@ -3,15 +3,15 @@ kind: TestStep
 commands:
 - script: |
     if ! [ -z $NON_OLM ]; then
-      label_value=$(oc get  deployment gitops-operator-controller-manager -n gitops-operator-system -o json | jq -r '.spec.template.spec.containers[]|select(.name=="manager")|.env[] | select(.name=="DISABLE_DEFAULT_ARGOCD_CONSOLELINK")|.value')
+      label_value=$(oc get  deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator -o json | jq -r '.spec.template.spec.containers[]|select(.name=="manager")|.env[] | select(.name=="DISABLE_DEFAULT_ARGOCD_CONSOLELINK")|.value')
       if ! [[ "${label_value}" == null ]]; then
         echo "DISABLE_DEFAULT_ARGOCD_CONSOLELINK is set to ${label_value}"
         exit 1
       else
         exit 0
       fi
     elif [ -z $CI ]; then
-      label_value=$(oc get  subscriptions openshift-gitops-operator -n openshift-operators -o json | jq '.spec.config.env[]|select(.name=="DISABLE_DEFAULT_ARGOCD_CONSOLELINK").value')
+      label_value=$(oc get  subscriptions openshift-gitops-operator -n openshift-gitops-operator -o json | jq '.spec.config.env[]|select(.name=="DISABLE_DEFAULT_ARGOCD_CONSOLELINK").value')
 
       if ! [[ "${label_value}" == '""' ]]; then
         echo "DISABLE_DEFAULT_ARGOCD_CONSOLELINK is set to ${label_value}"

test/openshift/e2e/sequential/1-078_validate_default_argocd_consoleLink/08-remove-env.yaml

@@ -3,11 +3,11 @@ kind: TestStep
 commands:
 - script: |
     if ! [ -z $NON_OLM ]; then
-      oc patch deployment gitops-operator-controller-manager -n gitops-operator-system \
+      oc patch deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator \
         -p '{"spec":{"template":{"spec":{"containers":[{"name":"manager","env":[{"name":"DISABLE_DEFAULT_ARGOCD_CONSOLELINK","value":null}]}]}}}}'
     
     elif [ -z $CI ]; then
-        oc -n openshift-operators patch subscription openshift-gitops-operator --type='json' -p='[{"op": "remove", "path": "/spec/config" }]'
+        oc -n openshift-gitops-operator patch subscription openshift-gitops-operator --type='json' -p='[{"op": "remove", "path": "/spec/config" }]'
     else
         oc -n openshift-gitops-operator patch subscription `subscription=gitops-operator- && oc get subscription --all-namespaces | grep $subscription | head -1 | awk '{print $2}'` --type='json' -p='[{"op": "remove", "path": "/spec/config" }]'
     fi