Merge pull request #289 from dprince/operator_namespace

openstack_operators namespace
openstack-k8s-operators · May 31, 2023 · b08d615 · b08d615
2 parents 1730721 + dc38c75
commit b08d615
Show file tree

Hide file tree

Showing 6 changed files with 91 additions and 79 deletions.
diff --git a/Makefile b/Makefile
diff --git a/ci/playbooks/deploy_podified_openstack.yaml b/ci/playbooks/deploy_podified_openstack.yaml
@@ -19,7 +19,8 @@
 
     - name: Make sure all Openstack operators are deployed
       ansible.builtin.shell: |
-        set -o pipefail && oc get csv -l operators.coreos.com/openstack-operator.openstack --no-headers=true | grep -i "succeeded"
+        set -o pipefail && \
+        oc get csv -l operators.coreos.com/openstack-operator.openstack-operators -n "openstack-operators" --no-headers=true | grep -i "succeeded"
       register: operator_status
       until: operator_status.rc == 0
       changed_when: false

diff --git a/scripts/gen-olm.sh b/scripts/gen-olm.sh
@@ -15,8 +15,8 @@
 # under the License.
 set -ex
 
-if [ -z "${NAMESPACE}" ]; then
-    echo "Please set NAMESPACE"; exit 1
+if [ -z "${OPERATOR_NAMESPACE}" ]; then
+    echo "Please set OPERATOR_NAMESPACE"; exit 1
 fi
 if [ -z "${OPERATOR_NAME}" ]; then
     echo "Please set OPERATOR_NAME"; exit 1
@@ -40,18 +40,15 @@ apiVersion: operators.coreos.com/v1
 kind: OperatorGroup
 metadata:
   name: openstack
-  namespace: ${NAMESPACE}
-spec:
-  targetNamespaces:
-  - ${NAMESPACE}
+  namespace: ${OPERATOR_NAMESPACE}
 EOF_CAT
 
 cat > ${OPERATOR_DIR}/catalogsource.yaml <<EOF_CAT
 apiVersion: operators.coreos.com/v1alpha1
 kind: CatalogSource
 metadata:
   name: $OPERATOR_NAME-operator-index
-  namespace: ${NAMESPACE}
+  namespace: ${OPERATOR_NAMESPACE}
 spec:
   image: ${IMAGE}
   sourceType: grpc
@@ -62,14 +59,10 @@ apiVersion: operators.coreos.com/v1alpha1
 kind: Subscription
 metadata:
   name: ${OPERATOR_NAME}-operator
-  namespace: ${NAMESPACE}
+  namespace: ${OPERATOR_NAMESPACE}
 spec:
   name: ${OPERATOR_NAME}-operator
   channel: alpha
-  config:
-    env:
-    - name: WATCH_NAMESPACE
-      value: ${NAMESPACE}
   source: ${OPERATOR_NAME}-operator-index
-  sourceNamespace: ${NAMESPACE}
+  sourceNamespace: ${OPERATOR_NAMESPACE}
 EOF_CAT
diff --git a/scripts/operator-cleanup.sh b/scripts/operator-cleanup.sh
@@ -15,8 +15,8 @@
 # under the License.
 set -x
 
-if [ -z "$NAMESPACE" ]; then
-    echo "Please set NAMESPACE"; exit 1
+if [ -z "$OPERATOR_NAMESPACE" ]; then
+    echo "Please set OPERATOR_NAMESPACE"; exit 1
 fi
 
 if [ -z "$OPERATOR_NAME" ]; then
@@ -26,7 +26,7 @@ fi
 CSV=$(oc get csv --no-headers -o custom-columns=":metadata.name" --ignore-not-found=true | grep $OPERATOR_NAME)
 
 if [ -n "$CSV" ]; then
-    oc delete -n ${NAMESPACE} csv ${CSV} --ignore-not-found=true
+    oc delete -n ${OPERATOR_NAMESPACE} csv ${CSV} --ignore-not-found=true
 fi
-oc delete -n ${NAMESPACE} subscription ${OPERATOR_NAME}-operator --ignore-not-found=true
-oc delete -n ${NAMESPACE} catalogsource ${OPERATOR_NAME}-operator-index --ignore-not-found=true
+oc delete -n ${OPERATOR_NAMESPACE} subscription ${OPERATOR_NAME}-operator --ignore-not-found=true
+oc delete -n ${OPERATOR_NAMESPACE} catalogsource ${OPERATOR_NAME}-operator-index --ignore-not-found=true
diff --git a/scripts/operator-wait.sh b/scripts/operator-wait.sh
@@ -20,16 +20,16 @@
 
 set -x
 
-if [ -z "$NAMESPACE" ]; then
-    echo "Please set NAMESPACE"; exit 1
+if [ -z "${OPERATOR_NAMESPACE}" ]; then
+    echo "Please set OPERATOR_NAMESPACE"; exit 1
 fi
 
 if [ -z "$OPERATOR_NAME" ]; then
     echo "Please set OPERATOR_NAME"; exit 1
 fi
 
 # wait for controller-manager deployment to appear
-timeout 300s bash -c 'until [ "$(oc get deployment -l openstack.org/operator-name=${OPERATOR_NAME} -n ${NAMESPACE} -o name)" != "" ]; do sleep 1; done'
+timeout 300s bash -c 'until [ "$(oc get deployment -l openstack.org/operator-name=${OPERATOR_NAME} -n ${OPERATOR_NAMESPACE} -o name)" != "" ]; do sleep 1; done'
 
 # wait for controller-manager deployment to reach available state
-oc wait deployment -l openstack.org/operator-name=${OPERATOR_NAME} -n ${NAMESPACE} --for condition=Available --timeout=300s
+oc wait deployment -l openstack.org/operator-name=${OPERATOR_NAME} -n ${OPERATOR_NAMESPACE} --for condition=Available --timeout=300s
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
@@ -13,6 +13,7 @@
       - zuul: github.com/openstack-k8s-operators/ci-framework
     vars:
       crc_parameters: "--memory 20000 --disk-size 120 --cpus 6"
+      operators_namespace: openstack-operators
       pre_pull_images:
         - registry.redhat.io/rhosp-rhel9/openstack-rabbitmq:17.0
         - quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:afa73a12a1ffd31f77b10a25c43a4d02b0fd62f927f6209c26983bd8aee021bf