Merge pull request #242 from brancz/cut-1.0.1

Cut 1.0.1
kubernetes · Aug 25, 2017 · 4d77540 · 4d77540
2 parents 259497e + 4266943
commit 4d77540
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## v1.0.1 / 2017-08-24
+
+* [BUGFIX] Fix nil pointer panic when pods have an owner without controllers.
+
 ## v1.0.0 / 2017-08-09
 
 After a testing period of one week, there were no additional bugs found or features introduced.

diff --git a/collectors/pod.go b/collectors/pod.go
@@ -276,7 +276,11 @@ func (pc *podCollector) collectPod(ch chan<- prometheus.Metric, p v1.Pod) {
 		addGauge(descPodOwner, 1, "<none>", "<none>", "<none>")
 	} else {
 		for _, owner := range owners {
-			addGauge(descPodOwner, 1, owner.Kind, owner.Name, strconv.FormatBool(*owner.Controller))
+			if owner.Controller != nil {
+				addGauge(descPodOwner, 1, owner.Kind, owner.Name, strconv.FormatBool(*owner.Controller))
+			} else {
+				addGauge(descPodOwner, 1, owner.Kind, owner.Name, "false")
+			}
 		}
 	}
 

diff --git a/kubernetes/kube-state-metrics-deployment.yaml b/kubernetes/kube-state-metrics-deployment.yaml
@@ -13,7 +13,7 @@ spec:
       serviceAccountName: kube-state-metrics
       containers:
       - name: kube-state-metrics
-        image: gcr.io/google_containers/kube-state-metrics:v1.0.0
+        image: gcr.io/google_containers/kube-state-metrics:v1.0.1
         ports:
         - name: http-metrics
           containerPort: 8080