update openshift docs and rename CMD to CO_CMD and NAMESPACE to CO_NAMESPACE

Jeff McCormick · Jeff McCormick · commit 2273bef11a76 · 2017-06-20T16:55:28.000-04:00
diff --git a/docs/build.asciidoc b/docs/build.asciidoc
@@ -87,14 +87,27 @@ see the following links for examples:
 https://gitlab.com/gitlab-org/gitlab-ce/issues/24557
 https://docs.openshift.org/latest/admin_guide/manage_scc.html#use-the-hostpath-volume-plugin
 
+You will need to allow your openshift user (e.g. jeff)  permissions to view
+the ThirdPartyResources, this is done by the following command
+as the openshift admin user:
+....
+oc adm policy add-cluster-role-to-user cluster-admin jeff
+....
+
 To test on an Origin system, you will need to specify
-a CMD environment variable with the value of *oc* as follows:
+a CO_CMD environment variable with the value of *oc* as follows:
+....
+export CO_CMD=oc
+....
+
+Also, you can set the namespace to use for deploying the operator
+as follows, if not set, the namespace is set to *default*:
 ....
-export CMD=oc
+export CO_NAMESPACE=myproject
 ....
 
 This will cause the *oc* command to be used within the operator
-startup script.
+startup script and deploy the operator to the *myproject* namespace or project.
 
 == Create Project and Clone 
 In your .bashrc file, include the following:
diff --git a/examples/operator/cleanup.sh b/examples/operator/cleanup.sh
@@ -14,7 +14,7 @@
 
 $CMD delete configmap operator-conf
 
-$CMD --namespace=$NAMESPACE delete deployment postgres-operator
+$CMD --namespace=$CO_NAMESPACE delete deployment postgres-operator
 
 sleep 10
 
diff --git a/examples/operator/create-pv.sh b/examples/operator/create-pv.sh
@@ -20,6 +20,6 @@ for i in {1..60}
 do
    	echo "creating PV crunchy-pv$i"
 	export COUNTER=$i
-	kubectl --namespace=$NAMESPACE delete pv crunchy-pv$i
-	envsubst < $DIR/crunchy-pv.json | kubectl --namespace=$NAMESPACE create -f -
+	kubectl --namespace=$CO_NAMESPACE delete pv crunchy-pv$i
+	envsubst < $DIR/crunchy-pv.json | kubectl --namespace=$CO_NAMESPACE create -f -
 done
diff --git a/examples/operator/run.sh b/examples/operator/run.sh
@@ -16,23 +16,23 @@
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 
-if [ -z "$NAMESPACE" ]; then
-	echo "NAMESPACE not set, using default"
-	export NAMESPACE=default
+if [ -z "$CO_NAMESPACE" ]; then
+	echo "CO_NAMESPACE not set, using default"
+	export CO_NAMESPACE=default
 fi
-if [ -z "$CMD" ]; then
-	echo "CMD not set, using kubectl"
-	export CMD=kubectl
+if [ -z "$CO_CMD" ]; then
+	echo "CO_CMD not set, using kubectl"
+	export CO_CMD=kubectl
 fi
 
 $DIR/cleanup.sh
 
-$CMD --namespace=$NAMESPACE get pvc crunchy-pvc
+$CO_CMD --namespace=$CO_NAMESPACE get pvc crunchy-pvc
 rc=$?
 
 if [ ! $rc -eq 0 ]; then
 	echo "crunchy-pvc does not exist...creating crunchy-pvc "
-	$CMD --namespace=$NAMESPACE create -f $DIR/crunchy-pvc.json
+	$CO_CMD --namespace=$CO_NAMESPACE create -f $DIR/crunchy-pvc.json
 	$DIR/create-pv.sh
 else
 	echo "crunchy-pvc already exists..."
@@ -44,12 +44,12 @@ if [ ! -d /data ]; then
 	sudo chmod 777 /data
 fi
 
-$CMD create configmap operator-conf \
+$CO_CMD create configmap operator-conf \
 	--from-file=$COROOT/conf/postgres-operator/backup-job.json \
 	--from-file=$COROOT/conf/postgres-operator/pvc.json \
 	--from-file=$COROOT/conf/postgres-operator/cluster/1
 
-envsubst < $DIR/deployment.json | $CMD --namespace=$NAMESPACE create -f -
+envsubst < $DIR/deployment.json | $CO_CMD --namespace=$CO_NAMESPACE create -f -
 
 sleep 3
-$CMD get pod --selector=name=postgres-operator
+$CO_CMD get pod --selector=name=postgres-operator
