From 17aadf3c5b360623ce4ec2885bba64a61a79f2eb Mon Sep 17 00:00:00 2001
From: Clayton Coleman <ccoleman@redhat.com>
Date: Wed, 23 Aug 2017 10:55:13 -0400
Subject: [PATCH 1/2] Guard owner.controller dereference (it can be nil)

---
 collectors/pod.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/collectors/pod.go b/collectors/pod.go
index 9f4d7e03ab..b4d5347fad 100644
--- 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")
+			}
 		}
 	}
 

From 42669430625e46438cb6660faa8581654b062e09 Mon Sep 17 00:00:00 2001
From: Frederic Branczyk <fbranczyk@gmail.com>
Date: Thu, 24 Aug 2017 10:42:04 +0200
Subject: [PATCH 2/2] *: cut v1.0.1

---
 CHANGELOG.md                                  | 4 ++++
 kubernetes/kube-state-metrics-deployment.yaml | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d00a41c652..7203e69374 100644
--- 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/kubernetes/kube-state-metrics-deployment.yaml b/kubernetes/kube-state-metrics-deployment.yaml
index 445fbf2e17..7b9b0844e1 100644
--- 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