Merge pull request #1947 from mkozikowsk/issue/1936

fix missing labels in clusterrole and userrole template

Author: pepov

Makefile

@@ -164,7 +164,7 @@ list: ## List all make targets
 manager: codegen fmt vet ## Build manager binary
 	go build -o bin/manager main.go
 
-HELM_MANIFEST_OVERRIDE='s@manager-role@{{ template "logging-operator.fullname" . }}\n  annotations:\n  {{- if .Values.rbac.retainOnDelete }}\n    "helm.sh/resource-policy": keep\n  {{- end }}@'
+HELM_MANIFEST_OVERRIDE='s@manager-role@{{ template "logging-operator.fullname" . }}\n  annotations:\n  {{- if .Values.rbac.retainOnDelete }}\n    "helm.sh/resource-policy": keep\n  {{- end }}\n  labels:\n{{ include "logging-operator.labels" . | indent 4 }}@'
 
 .PHONY: manifests
 manifests: ${CONTROLLER_GEN} ## Generate manifests e.g. CRD, RBAC etc.

charts/logging-operator/templates/clusterrole.yaml

@@ -8,6 +8,8 @@ metadata:
   {{- if .Values.rbac.retainOnDelete }}
     "helm.sh/resource-policy": keep
   {{- end }}
+  labels:
+{{ include "logging-operator.labels" . | indent 4 }}
 rules:
 - apiGroups:
   - ""

charts/logging-operator/templates/userrole.yaml

@@ -7,6 +7,7 @@ metadata:
   labels:
     rbac.authorization.k8s.io/aggregate-to-admin: "true"
     rbac.authorization.k8s.io/aggregate-to-edit: "true"
+{{ include "logging-operator.labels" . | indent 4 }}
 rules:
 - apiGroups:
   - logging.banzaicloud.io