Merge pull request #43 from integr8ly/grafana-latest

Grafana latest

Gopkg.toml

@@ -43,7 +43,7 @@ required = [
   name = "github.com/operator-framework/operator-sdk"
   # The version rule is used for a specific release and the master branch for in between releases.
   # branch = "v0.2.x" #osdk_branch_annotation
-  version = "=v0.2.1" #osdk_version_annotation
+  version = "=v0.8.1" #osdk_version_annotation
 
 [prune]
   go-tests = true

Makefile

@@ -3,7 +3,7 @@ NAMESPACE ?= application-monitoring
 PROJECT ?= application-monitoring-operator
 REG=quay.io
 SHELL=/bin/bash
-TAG ?= 0.0.9
+TAG ?= 0.0.10
 PKG=github.com/integr8ly/application-monitoring-operator
 TEST_DIRS?=$(shell sh -c "find $(TOP_SRC_DIRS) -name \\*_test.go -exec dirname {} \\; | sort | uniq")
 TEST_POD_NAME=application-monitoring-operator-test
@@ -18,7 +18,7 @@ setup/dep:
 .PHONY: setup/travis
 setup/travis:
 	@echo Installing Operator SDK
-	@curl -Lo operator-sdk https://github.com/operator-framework/operator-sdk/releases/download/v0.2.1/operator-sdk-v0.2.1-x86_64-linux-gnu && chmod +x operator-sdk && sudo mv operator-sdk /usr/local/bin/
+	@curl -Lo operator-sdk https://github.com/operator-framework/operator-sdk/releases/download/v0.8.1/operator-sdk-v0.8.1-x86_64-linux-gnu && chmod +x operator-sdk && sudo mv operator-sdk /usr/local/bin/
 
 .PHONY: code/run
 code/run:

deploy/operator.yaml

@@ -15,7 +15,7 @@ spec:
       serviceAccountName: application-monitoring-operator
       containers:
         - name: application-monitoring-operator
-          image: quay.io/integreatly/application-monitoring-operator:0.0.9
+          image: quay.io/integreatly/application-monitoring-operator:latest
           ports:
             - containerPort: 60000
               name: metrics

deploy/operator_roles/role.yaml

@@ -45,9 +45,12 @@ rules:
   - apiGroups:
       - integreatly.org
     resources:
+      - grafanadatasources
       - grafanadashboards
       - grafanas
       - grafanas/finalizers
+      - grafanadatasources/finalizers
+      - grafanadashboards/finalizers
     verbs:
       - '*'
   - apiGroups:
@@ -70,4 +73,16 @@ rules:
     resources:
       - ingresses
     verbs:
-      - '*'
+      - '*'
+  - apiGroups:
+      - authentication.k8s.io
+    resources:
+      - tokenreviews
+    verbs:
+      - create
+  - apiGroups:
+      - authorization.k8s.io
+    resources:
+      - subjectaccessreviews
+    verbs:
+      - create

deploy/roles/grafana-operator-clusterrole.yaml

@@ -1,22 +1,22 @@
-apiVersion: authorization.openshift.io/v1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: grafana-operator-cluster-role
+  name: grafana-operator
 rules:
   - apiGroups:
-      - ""
-    attributeRestrictions: null
+      - integreatly.org
+    resources:
+      - grafanadashboards
+    verbs: ['get', 'list', 'update', 'watch']
+  - apiGroups:
+      - authentication.k8s.io
     resources:
-      - namespaces
+      - tokenreviews
     verbs:
-      - get
-      - list
-      - watch
+      - create
   - apiGroups:
-      - integreatly.org
-    attributeRestrictions: null
+      - authorization.k8s.io
     resources:
-      - grafanadashboards
-      - grafanas
+      - subjectaccessreviews
     verbs:
-      - '*'
+      - create

deploy/roles/grafana-operator-clusterrole_binding.yaml

@@ -6,7 +6,7 @@ roleRef:
   name: grafana-operator-cluster-role
 subjects:
   - kind: ServiceAccount
-    name: grafana-serviceaccount
+    name: grafana-operator
     namespace: application-monitoring
 userNames:
-  - system:serviceaccount:application-monitoring:grafana-serviceaccount
+  - system:serviceaccount:application-monitoring:grafana-operator

deploy/roles/proxy-clusterrole.yaml

@@ -0,0 +1,17 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: grafana-proxy
+rules:
+  - apiGroups:
+      - authentication.k8s.io
+    resources:
+      - tokenreviews
+    verbs:
+      - create
+  - apiGroups:
+      - authorization.k8s.io
+    resources:
+      - subjectaccessreviews
+    verbs:
+      - create

deploy/roles/proxy-clusterrole_binding.yaml

@@ -0,0 +1,12 @@
+apiVersion: authorization.openshift.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: grafana-proxy
+roleRef:
+  name: grafana-proxy
+subjects:
+  - kind: ServiceAccount
+    name: grafana-serviceaccount
+    namespace: monitoring2
+userNames:
+  - system:serviceaccount:application-monitoring:grafana-serviceaccount