From a813a663fee2a71b8542e3aa64796f880836d4f2 Mon Sep 17 00:00:00 2001
From: Tariq Ibrahim <tariq181290@gmail.com>
Date: Thu, 18 Jul 2019 14:35:22 -0700
Subject: [PATCH]  *: cut v1.7.1 from release-1.7

---
 CHANGELOG.md                                  | 5 +++++
 README.md                                     | 6 +++---
 VERSION                                       | 2 +-
 kubernetes/kube-state-metrics-deployment.yaml | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e1cd903bc6..d5242aacc8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## v1.7.1 / 2019-07-18
+
+* [BUGFIX] Fix crash due to missing ingress http block. #831
+* [BUGFIX] Add nil guard checks when querying VPA objects. #832
+
 ## v1.7.0 / 2019-07-17
 
 After a testing period of 7 days, there were no additional bugs found or features introduced.
diff --git a/README.md b/README.md
index cccf27b2ab..f5b5f4d328 100644
--- a/README.md
+++ b/README.md
@@ -61,7 +61,7 @@ At most, 5 kube-state-metrics and 5 [kubernetes releases](https://github.com/kub
 | **v1.4.0**         |  v8.0.0    |         ✓           |         ✓           |         -           |         -           |          -           |
 | **v1.5.0**         |  v8.0.0    |         ✓           |         ✓           |         -           |         -           |          -           |
 | **v1.6.0**         |  v11.0.0   |         ✓           |         ✓           |         ✓           |         ✓           |          -           |
-| **v1.7.0**         |  v12.0.0   |         ✓           |         ✓           |         ✓           |         ✓           |          ✓           |
+| **v1.7.1**         |  v12.0.0   |         ✓           |         ✓           |         ✓           |         ✓           |          ✓           |
 | **master**         |  v12.0.0   |         ✓           |         ✓           |         ✓           |         ✓           |          ✓           |
 - `✓` Fully supported version range.
 - `-` The Kubernetes cluster has features the client-go library can't use (additional API objects, etc).
@@ -74,8 +74,8 @@ release.
 #### Container Image
 
 The latest container image can be found at:
-* `quay.io/coreos/kube-state-metrics:v1.7.0`
-* `k8s.gcr.io/kube-state-metrics:v1.7.0`
+* `quay.io/coreos/kube-state-metrics:v1.7.1`
+* `k8s.gcr.io/kube-state-metrics:v1.7.1`
 
 **Note**:
 The recommended docker registry for kube-state-metrics is `quay.io`. kube-state-metrics on
diff --git a/VERSION b/VERSION
index bd8bf882d0..943f9cbc4e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.7.0
+1.7.1
diff --git a/kubernetes/kube-state-metrics-deployment.yaml b/kubernetes/kube-state-metrics-deployment.yaml
index 5625e9f708..09f02a5b05 100644
--- a/kubernetes/kube-state-metrics-deployment.yaml
+++ b/kubernetes/kube-state-metrics-deployment.yaml
@@ -18,7 +18,7 @@ spec:
       serviceAccountName: kube-state-metrics
       containers:
       - name: kube-state-metrics
-        image: quay.io/coreos/kube-state-metrics:v1.7.0
+        image: quay.io/coreos/kube-state-metrics:v1.7.1
         ports:
         - name: http-metrics
           containerPort: 8080