add specified latest tag, add operatorMasterImage.yaml, fix makefile, update docs

Author: hubeadmin

Makefile

@@ -77,10 +77,17 @@ cluster/cleanup: operator/stop
 	-kubectl delete deployment grafana-deployment -n ${NAMESPACE}
 	-kubectl delete namespace ${NAMESPACE}
 
+## Deploy the latest tagged release
 .PHONY: operator/deploy
 operator/deploy: cluster/prepare/local
 	kubectl apply -f deploy/operator.yaml -n ${NAMESPACE}
-	@git checkout -- .
+	@git checkout -- deploy/cluster_roles/cluster_role_binding_grafana_operator.yaml
+
+## Deploy the latest master image
+.PHONY: operator/deploy/master
+operator/deploy/master: cluster/prepare/local
+	kubectl apply -f deploy/operatorMasterImage.yaml -n ${NAMESPACE}
+	@git checkout -- deploy/cluster_roles/cluster_role_binding_grafana_operator.yaml
 
 .PHONY: operator/stop
 operator/stop:

deploy/operator.yaml

@@ -17,7 +17,7 @@ spec:
       serviceAccountName: grafana-operator
       containers:
         - name: grafana-operator
-          image: quay.io/integreatly/grafana-operator:latest
+          image: quay.io/integreatly/grafana-operator:v3.5.0
           ports:
             - containerPort: 60000
               name: metrics

deploy/operatorMasterImage.yaml

@@ -0,0 +1,39 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: grafana-operator
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      name: grafana-operator
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      labels:
+        name: grafana-operator
+    spec:
+      serviceAccountName: grafana-operator
+      containers:
+        - name: grafana-operator
+          image: quay.io/integreatly/grafana-operator:master
+          ports:
+            - containerPort: 60000
+              name: metrics
+          command:
+            - grafana-operator
+          imagePullPolicy: Always
+          env:
+            - name: TEMPLATE_PATH
+              value: /usr/local/bin/templates
+            - name: WATCH_NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
+            - name: POD_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
+            - name: OPERATOR_NAME
+              value: "grafana-operator"

documentation/deploy_grafana.md

@@ -9,7 +9,12 @@ The first step is to install the Grafana operator to a namespace in your cluster
 There are two options for this procedure, automated via Ansible, or manually running kubectl/oc commands.
 
 ### Deploy an example grafana instance and operator
-Run `make operator/deploy` This uses the default operator.yaml and Grafana.yaml resources found in the `deploy` directories and subdirectories.
+
+Run `make operator/deploy` To deploy the latest released image of the operator, This uses the default operator.yaml and Grafana.yaml resources found in the `deploy` directories and subdirectories.
+
+***Warning:*** The following make recipe uses the latest master Image. It should only be used for testing, for production please use the tagged releases.
+
+Run `make operator/deploy/master` to deploy the image from the master branch of the operator.
 
 ### Automated Procedure