From e99b59908c80a6db5214edf2bc7f872893c12ab6 Mon Sep 17 00:00:00 2001
From: Michael Burman <michael.burman@datastax.com>
Date: Mon, 4 Oct 2021 17:08:16 +0300
Subject: [PATCH] Update to final version of cass-operator 1.8.0 (#1119)

* Update to final version of cass-operator 1.8.0

* Update scripts/update-helm-deps to output which chart it is upgrading
---
 CHANGELOG-1.4.md                     | 1 +
 charts/cass-operator/Chart.yaml      | 2 +-
 charts/cass-operator/README.md       | 2 +-
 charts/cass-operator/values.yaml     | 2 +-
 charts/k8ssandra-operator/Chart.yaml | 4 ++--
 charts/k8ssandra/Chart.yaml          | 2 +-
 scripts/update-helm-deps.sh          | 1 +
 7 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG-1.4.md b/CHANGELOG-1.4.md
index be2c2dd68..75118eb0d 100644
--- a/CHANGELOG-1.4.md
+++ b/CHANGELOG-1.4.md
@@ -27,3 +27,4 @@ and date `## vX.Y.Z - YYYY-MM-DD` and create a new placeholder section for  `unr
 * [ENHANCEMENT] #874 expose cass-operator AdditionalServiceConfig in k8ssandra helm chart values.yaml
 * [CHANGE] #1118 Update to Stargate 1.0.35
 * [CHANGE] #950 Update to cass-operator 1.8.0-rc.1
+* [CHANGE] Update to cass-operator v1.8.0
\ No newline at end of file
diff --git a/charts/cass-operator/Chart.yaml b/charts/cass-operator/Chart.yaml
index 11aa9b403..b1b54f2b0 100644
--- a/charts/cass-operator/Chart.yaml
+++ b/charts/cass-operator/Chart.yaml
@@ -3,7 +3,7 @@ name: cass-operator
 description: |
   Kubernetes operator which handles the provisioning and management of Apache Cassandra clusters.
 type: application
-version: 0.31.0
+version: 0.31.1
 appVersion: 1.8.0
 dependencies:
   - name: k8ssandra-common
diff --git a/charts/cass-operator/README.md b/charts/cass-operator/README.md
index 1c80a0040..1035e3b62 100644
--- a/charts/cass-operator/README.md
+++ b/charts/cass-operator/README.md
@@ -38,7 +38,7 @@ Kubernetes operator which handles the provisioning and management of Apache Cass
 | image.registry | string | `"docker.io"` | Container registry containing the repository where the image resides |
 | image.repository | string | `"k8ssandra/cass-operator"` | Docker repository for cass-operator |
 | image.pullPolicy | string | `"IfNotPresent"` | Pull policy for the operator container |
-| image.tag | string | `"v1.8.0-rc.1"` | Tag of the cass-operator image to pull from image.repository |
+| image.tag | string | `"v1.8.0"` | Tag of the cass-operator image to pull from image.repository |
 | image.registryOverride | string | `nil` | Docker registry containing all cass-operator related images. Setting this allows for usage of an internal registry without specifying serverImage, configBuilderImage, and busyboxImage on all CassandraDatacenter objects. |
 | imagePullSecrets | list | `[]` | References to secrets to use when pulling images. See: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ |
 | serviceAccount.annotations | object | `{}` | Annotations to add to the service account. |
diff --git a/charts/cass-operator/values.yaml b/charts/cass-operator/values.yaml
index ccc638288..0952c2b69 100644
--- a/charts/cass-operator/values.yaml
+++ b/charts/cass-operator/values.yaml
@@ -33,7 +33,7 @@ image:
   pullPolicy: IfNotPresent
 
   # -- Tag of the cass-operator image to pull from image.repository
-  tag: v1.8.0-rc.2
+  tag: v1.8.0
 
   # -- Docker registry containing all cass-operator related images. Setting this
   # allows for usage of an internal registry without specifying serverImage,
diff --git a/charts/k8ssandra-operator/Chart.yaml b/charts/k8ssandra-operator/Chart.yaml
index b0bf2c7ce..cc8f96439 100644
--- a/charts/k8ssandra-operator/Chart.yaml
+++ b/charts/k8ssandra-operator/Chart.yaml
@@ -3,14 +3,14 @@ name: k8ssandra-operator
 description: |
   Kubernetes operator which handles the provisioning and management of K8ssandra clusters.
 type: application
-version: 0.31.0
+version: 0.31.1
 appVersion: 1.0.0
 dependencies:
   - name: k8ssandra-common
     version: 0.28.4
     repository: file://../k8ssandra-common
   - name: cass-operator
-    version: 0.31.0
+    version: 0.31.1
     repository: file://../cass-operator
 home: https://github.com/k8ssandra/k8ssandra-operator
 sources:
diff --git a/charts/k8ssandra/Chart.yaml b/charts/k8ssandra/Chart.yaml
index 11a940176..e9c02bec9 100644
--- a/charts/k8ssandra/Chart.yaml
+++ b/charts/k8ssandra/Chart.yaml
@@ -7,7 +7,7 @@ version: 1.4.0-SNAPSHOT
 
 dependencies:
   - name: cass-operator
-    version: 0.31.0
+    version: 0.31.1
     repository: file://../cass-operator
     condition: cass-operator.enabled
 
diff --git a/scripts/update-helm-deps.sh b/scripts/update-helm-deps.sh
index 334927f9f..91d32661a 100755
--- a/scripts/update-helm-deps.sh
+++ b/scripts/update-helm-deps.sh
@@ -12,6 +12,7 @@ cd "$(dirname "$0")/.."
 # Update dependencies for each chart, order is important!
 CHARTS=("k8ssandra-common" "backup" "cass-operator" "medusa-operator" "reaper-operator" "restore" "k8ssandra" "k8ssandra-operator")
 for CHART in ${CHARTS[@]}; do
+  echo "--- Updating $CHART"
   if [[ -d "charts/$CHART" ]]; then
     helm dep update charts/$CHART
   else