From 40ff0dbac858fcd3d7d627db864cf3ca46a68fe6 Mon Sep 17 00:00:00 2001
From: Alex Robinson <alexdwanerobinson@gmail.com>
Date: Sun, 25 Feb 2018 14:36:43 -0500
Subject: [PATCH] Bump CockroachDB version to v1.1.5 (#3769)

Also remove two unused variables that I forgot to remove as part of
fa2ab88d8fdcf99531c61cb0a1457854140b1666
---
 stable/cockroachdb/Chart.yaml  | 4 ++--
 stable/cockroachdb/README.md   | 2 +-
 stable/cockroachdb/values.yaml | 4 +---
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/stable/cockroachdb/Chart.yaml b/stable/cockroachdb/Chart.yaml
index 76777fa616..a1feb40984 100755
--- a/stable/cockroachdb/Chart.yaml
+++ b/stable/cockroachdb/Chart.yaml
@@ -1,7 +1,7 @@
 name: cockroachdb
 home: https://www.cockroachlabs.com
-version: 0.6.2
-appVersion: 1.1.4
+version: 0.6.3
+appVersion: 1.1.5
 description: CockroachDB is a scalable, survivable, strongly-consistent SQL database.
 icon: https://raw.githubusercontent.com/cockroachdb/cockroach/master/docs/media/cockroach_db.png
 sources:
diff --git a/stable/cockroachdb/README.md b/stable/cockroachdb/README.md
index d119975933..21fb25c92f 100644
--- a/stable/cockroachdb/README.md
+++ b/stable/cockroachdb/README.md
@@ -36,7 +36,7 @@ The following tables lists the configurable parameters of the CockroachDB chart
 | ----------------------------- | ------------------------------------------ | -------------------------------------------- |
 | `Name`                        | Chart name                                 | `cockroachdb`                                |
 | `Image`                       | Container image name                       | `cockroachdb/cockroach`                      |
-| `ImageTag`                    | Container image tag                        | `v1.1.4`                                     |
+| `ImageTag`                    | Container image tag                        | `v1.1.5`                                     |
 | `ImagePullPolicy`             | Container pull policy                      | `Always`                                     |
 | `Replicas`                    | k8s statefulset replicas                   | `3`                                          |
 | `MaxUnavailable`              | k8s PodDisruptionBudget parameter          | `1`                                          |
diff --git a/stable/cockroachdb/values.yaml b/stable/cockroachdb/values.yaml
index 22557a1e90..b6c393bb8b 100644
--- a/stable/cockroachdb/values.yaml
+++ b/stable/cockroachdb/values.yaml
@@ -5,10 +5,8 @@
 
 Name: "cockroachdb"
 Image: "cockroachdb/cockroach"
-ImageTag: "v1.1.4"
+ImageTag: "v1.1.5"
 ImagePullPolicy: "Always"
-BootstrapImage: "cockroachdb/cockroach-k8s-init"
-BootstrapImageTag: "0.2"
 Replicas: 3
 MaxUnavailable: 1
 Component: "cockroachdb"