Merge remote-tracking branch 'upstream/master'

assets/prometheus/rules/general.rules

assets/prometheus/rules/kube-apiserver.rules

assets/prometheus/rules/kube-controller-manager.rules

assets/prometheus/rules/kube-scheduler.rules

assets/prometheus/rules/kubelet.rules

assets/prometheus/rules/node.rules

manifests/grafana/grafana-deployment.yaml

...s/kube-state-metrics/kube-state-metrics-cluster-role.yaml

manifests/prometheus/prometheus-k8s-rules.yaml