Merge pull request #133 from brancz/limitrange-rbac

fix service and limitrange rbac roles and fix order and naming
kubernetes · May 3, 2017 · e46c85b · e46c85b
2 parents 007629f + a844b25
commit e46c85b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/kubernetes/kube-state-metrics-cluster-role.yaml b/kubernetes/kube-state-metrics-cluster-role.yaml
@@ -7,8 +7,10 @@ rules:
   resources:
   - nodes
   - pods
+  - services
   - resourcequotas
   - replicationcontrollers
+  - limitranges
   verbs: ["list", "watch"]
 - apiGroups: ["extensions"]
   resources:

diff --git a/main.go b/main.go
@@ -45,23 +45,23 @@ var (
 	defaultCollectors = collectorSet{
 		"daemonsets":             struct{}{},
 		"deployments":            struct{}{},
-		"pods":                   struct{}{},
+		"limitranges":            struct{}{},
 		"nodes":                  struct{}{},
-		"resourcequotas":         struct{}{},
-		"limitrange":             struct{}{},
+		"pods":                   struct{}{},
 		"replicasets":            struct{}{},
 		"replicationcontrollers": struct{}{},
+		"resourcequotas":         struct{}{},
 		"services":               struct{}{},
 	}
 	availableCollectors = map[string]func(registry prometheus.Registerer, kubeClient clientset.Interface){
 		"daemonsets":             RegisterDaemonSetCollector,
 		"deployments":            RegisterDeploymentCollector,
-		"pods":                   RegisterPodCollector,
+		"limitranges":            RegisterLimitRangeCollector,
 		"nodes":                  RegisterNodeCollector,
-		"resourcequotas":         RegisterResourceQuotaCollector,
-		"limitrange":             RegisterLimitRangeCollector,
+		"pods":                   RegisterPodCollector,
 		"replicasets":            RegisterReplicaSetCollector,
 		"replicationcontrollers": RegisterReplicationControllerCollector,
+		"resourcequotas":         RegisterResourceQuotaCollector,
 		"services":               RegisterServiceCollector,
 	}
 )