Merge pull request #79 from Helene/namespace

rework openshift_deployment_scripts

Author: Helene

examples/openshift_deployment_scripts/grafana_datasource_deployment/README.md

@@ -1,13 +1,22 @@
 # Example deployment of a GrafanaDataSource instance in a k8s/OCP environment
 
 
-Using the scripts in this folder you can deploy a GrafanaDataSource instance for the IBM Spectrum Scale Performance Monitoring Bridge for Grafana running in container
+Using the scripts in this folder you can deploy a GrafanaDataSource instance for the IBM Spectrum Scale Performance Monitoring Bridge for Grafana running in in the project 'grafana-for-cnsa'
 
+```
+NAMESPACE=grafana-for-cnsa
+```
+```
+echo $NAMESPACE
+```
 ```
 oc adm policy add-cluster-role-to-user ibm-spectrum-scale-operator -z grafana-serviceaccount
-oc apply -f grafana-bridge-datasource.yaml
-oc describe GrafanaDataSource bridge-grafanadatasource
-
+```
+```
+oc apply -f grafana-bridge-datasource.yaml --namespace=$NAMESPACE
+```
+```
+oc describe GrafanaDataSource bridge-grafanadatasource --namespace=$NAMESPACE
 ```
 
 For complete deployment examples please check the project [Wiki](https://github.com/IBM/ibm-spectrum-scale-bridge-for-grafana/wiki)

examples/openshift_deployment_scripts/grafana_datasource_deployment/grafana-bridge-datasource.yaml

@@ -2,7 +2,6 @@
 kind: GrafanaDataSource
 metadata:
   name: bridge-grafanadatasource
-  namespace: grafana-for-cnsa
 spec:
   datasources:
     - access: proxy

examples/openshift_deployment_scripts/grafana_deployment/README.md

@@ -4,11 +4,22 @@
 Using the scripts in this folder you can deploy a Grafana instance in the project 'grafana-for-cnsa'
 
 ```
-oc new-project grafana-for-cnsa
-oc apply -f operator-group.yaml
-oc apply -f grafana-operator-subscription.yaml
-oc apply -f grafana-instance-for-cnsa.yaml
-
+NAMESPACE=grafana-for-cnsa
+```
+```
+echo $NAMESPACE
+```
+```
+oc new-project $NAMESPACE
+```
+```
+oc apply -f operator-group.yaml --namespace=$NAMESPACE
+```
+```
+oc apply -f grafana-operator-subscription.yaml --namespace=$NAMESPACE
+```
+```
+oc apply -f grafana-instance-for-cnsa.yaml --namespace=$NAMESPACE
 ```
 
 Alternatively you can install a Grafana instance using the OpenShift Container Platform web console. Please check the instructions described in the deployment examples stored in the project [Wiki](/docs/grafana_deployment_ocp.md)

examples/openshift_deployment_scripts/grafana_deployment/grafana-instance-for-cnsa.yaml

@@ -1,7 +1,6 @@
 apiVersion: integreatly.org/v1alpha1
 kind: Grafana
 metadata:
-  namespace: grafana-for-cnsa
   name: grafana-for-cnsa
 spec:
   config:

examples/openshift_deployment_scripts/grafana_deployment/grafana-operator-subscription.yaml

@@ -2,7 +2,6 @@ apiVersion: operators.coreos.com/v1alpha1
 kind: Subscription
 metadata:
   name: grafana-operator-subscription
-  namespace: grafana-for-cnsa
 spec:
   channel: v4 
   name: grafana-operator 

examples/openshift_deployment_scripts/grafana_deployment/operator-group.yaml

@@ -2,7 +2,6 @@ apiVersion: operators.coreos.com/v1
 kind: OperatorGroup
 metadata:
   name: ibm-spectrum-scale-operators-group
-  namespace: grafana-for-cnsa
 spec:
   targetNamespaces:
   - grafana-for-cnsa

examples/openshift_deployment_scripts/provision_dashboard/README.md

@@ -4,6 +4,11 @@
 Using the scripts in this folder you can provision an example dashboard to the Grafana instance running in the project 'grafana-for-cnsa'
 
 ```
-oc apply -f cnsa-cluster-simple-dashboard.yaml -n grafana-for-cnsa
-
+NAMESPACE=grafana-for-cnsa
+```
+```
+echo $NAMESPACE
+```
+```
+oc apply -f cnsa-cluster-simple-dashboard.yaml --namespace=$NAMESPACE
 ```

examples/openshift_deployment_scripts/provision_dashboard/cnsa-cluster-simple-dashboard.yaml

@@ -4,7 +4,6 @@ metadata:
   name: cnsa-cluster-simple-dashboard
   labels:
     app: grafana
-  namespace: grafana-for-cnsa
 spec:
   customFolderName: "examples"
   allowUiUpdates: true