From 7d6566fcc0cd39cd19f924aab6c638531b377e50 Mon Sep 17 00:00:00 2001
From: Alexander Dejanovski <alex.dejanovski@datastax.com>
Date: Mon, 4 Oct 2021 07:40:54 +0200
Subject: [PATCH] Upgrade Stargate dependency 1.0.29 -> 1.0.35 (#1118)

Upgrade Stargate dependency from 1.0.29 to 1.0.35
---
 CHANGELOG-1.4.md             |  1 +
 charts/k8ssandra/values.yaml | 41 ++++++++++++++----------------------
 2 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/CHANGELOG-1.4.md b/CHANGELOG-1.4.md
index 0f089f815..be2c2dd68 100644
--- a/CHANGELOG-1.4.md
+++ b/CHANGELOG-1.4.md
@@ -25,4 +25,5 @@ and date `## vX.Y.Z - YYYY-MM-DD` and create a new placeholder section for  `unr
 * [BUGFIX] #1018 reaper image registry typo and jvm typo fixed
 * [BUGFIX] #1029 Do not change num_tokens when upgrading
 * [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
diff --git a/charts/k8ssandra/values.yaml b/charts/k8ssandra/values.yaml
index bfe805d1e..8ab1af27b 100644
--- a/charts/k8ssandra/values.yaml
+++ b/charts/k8ssandra/values.yaml
@@ -44,10 +44,8 @@ cassandra:
   # TODO - overriding to disable default for now, due to mgmt-api root privs required
   securityContext:
     readOnlyRootFilesystem: false
-
   # -- Security context override for pod where Cassandra container resides
   podSecurityContext: {}
-
   # -- Cassandra base init container
   baseConfig:
     # -- Security context override for base init container
@@ -141,21 +139,21 @@ cassandra:
   # Services. Note, user can override values set by cass-operator and doing so could break cass-operator functionality.
   # Avoid label "cass-operator" and anything that starts with "cassandra.datastax.com/"
   additionalServiceConfig: {}
-    # additionalSeedService:
-    #   additionalAnnotations: {}
-    #   additionalLabels: {}
-    # allpodsService:
-    #   additionalAnnotations: {}
-    #   additionalLabels: {}
-    # dcService:
-    #   additionalAnnotations: {}
-    #   additionalLabels: {}
-    # nodePortService:
-    #   additionalAnnotations: {}
-    #   additionalLabels: {}
-    # seedService:
-    #   additionalAnnotations: {}
-    #   additionalLabels: {}
+  # additionalSeedService:
+  #   additionalAnnotations: {}
+  #   additionalLabels: {}
+  # allpodsService:
+  #   additionalAnnotations: {}
+  #   additionalLabels: {}
+  # dcService:
+  #   additionalAnnotations: {}
+  #   additionalLabels: {}
+  # nodePortService:
+  #   additionalAnnotations: {}
+  #   additionalLabels: {}
+  # seedService:
+  #   additionalAnnotations: {}
+  #   additionalLabels: {}
   # -- The management-api runs as pid 1 in the cassandra container which means
   # its logs are sent to stdout and stderr. To make Cassandra's logs more
   # accessible, cass-operator deploys the server-system-logger container. You
@@ -370,7 +368,7 @@ stargate:
   enabled: true
   # -- version of Stargate to deploy. This is used in conjunction with cassandra.version to select the Stargate container image.
   # If stargate.image is set, this value has no effect.
-  version: "1.0.29"
+  version: "1.0.35"
   # -- Sets the Stargate container image. This value must be compatible
   # with the value provided for stargate.clusterVersion. If left blank (recommended),
   # k8ssandra will derive an appropriate image based on cassandra.clusterVersion.
@@ -470,7 +468,6 @@ stargate:
     cassandra:
       # -- Enables C* native protocol ingress with Traefik. Note that this is mutually exclusive with cassandra.ingress.enabled, and stargate.ingress.enabled must also be true.
       enabled: true
-
       # -- Determines which TCP-based ingress custom resources to template out. Currently only `traefik` is supported
       method: traefik
       # -- Optional hostname used to match requests. Warning: many native Cassandra clients, notably including cqlsh, initialize their connection by querying for
@@ -506,16 +503,13 @@ reaper:
   # TODO - this will be adjusted as we get the Reaper image changes in place.
   securityContext:
     readOnlyRootFilesystem: false
-
   # -- Security context override for reaper init container
   # TODO - this will be adjusted as we get the Reaper image changes in place.
   schemaInitContainerConfig:
     securityContext:
       readOnlyRootFilesystem: false
-
   # -- Security context override for reaper pod
   podSecurityContext: {}
-
   # -- When enabled, Reaper automatically sets up repair schedules for all
   # non-system keypsaces. Repear monitors the cluster so that as keyspaces are
   # added or removed repair schedules will be added or removed respectively.
@@ -592,20 +586,17 @@ medusa:
   # -- Enable Medusa resources as part of this release. If enabled,
   # `bucketName` and `storageSecret` **must** be defined.
   enabled: false
-
   # -- Security context override for Medusa container.
   # K8ssandra defaults readOnlyRootFilesystem: true
   # TODO - overriding to disable default for now, due to medusa write perm needed
   securityContext:
     readOnlyRootFilesystem: false
-
   # -- Security context override for Medusa init container.
   # K8ssandra defaults readOnlyRootFilesystem: true
   restoreInitContainerConfig:
     # TODO - overriding to disable default for now, due to medusa write perm needed
     securityContext:
       readOnlyRootFilesystem: false
-
   # Configures the Medusa image which is built from
   # https://github.com/thelastpickle/cassandra-medusa/tree/master/k8s.
   image: