Merge pull request #1009 from flanksource/fix-grafana-rbac

fix: use correct rbac for grafana controller
flanksource · Apr 12, 2022 · 8c92c66 · 8c92c66
2 parents 7b9c145 + bd12b60
commit 8c92c66
Show file tree

Hide file tree

Showing 17 changed files with 3,965 additions and 5,496 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -51,6 +51,6 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v2
         with:
-          version: v1.36
+          version: v1.45.2
       - name: filename and manifests check
         run: go run test/linter/main.go
diff --git a/.golangci.yml b/.golangci.yml
@@ -22,14 +22,13 @@ linters:
     - goconst
     - gofmt
     - goimports
-    - golint
     - goprintffuncname
     - gosimple
     - govet
     - ineffassign
-    - interfacer
     - misspell
     - nakedret
+    - revive
     - rowserrcheck
     - staticcheck
     - structcheck

diff --git a/docs/reference/config.md b/docs/reference/config.md
@@ -1191,7 +1191,7 @@ VM captures the specifications of a virtual machine
 | disabled |  | bool |  |
 | accessKey |  | string |  |
 | secretKey |  | string |  |
-| kmsKeyId | The AWS KMS ARN Id to use to unseal vault | string |  |
+| kmsKeyId | The AWS KMS ARN ID to use to unseal vault | string |  |
 | region |  | string |  |
 | consul |  | [Consul](#consul) |  |
 

diff --git a/manifests/Makefile b/manifests/Makefile
@@ -72,6 +72,12 @@ platform-operator.yaml:
 	$(call BUILD_BASE,platform-operator)
 	$(SED) -i 's/.*TEMPLATE_MARK.*/        {{- range $$k, $$v := .platformOperator.args }}\n        - --{{$$k}}={{$$v}}\n        {{- end }}/' platform-operator.yaml
 
+.PHONY: monitoring/grafana-operator.yaml
+monitoring/grafana-operator.yaml:
+	$(call BUILD_BASE,monitoring/grafana-operator)
+	$(SED) -i 's/controller-manager/grafana-operator/' monitoring/grafana-operator.yaml
+	$(SED) -i 's/manager-role/grafana-operator-role/' monitoring/grafana-operator.yaml
+
 .PHONY: canary-checker.yaml
 canary-checker.yaml:
 	$(call BUILD_HELM_CHART,canary-checker)