From b74ce469912cf54eeee0830da383aa85d35fd0cc Mon Sep 17 00:00:00 2001
From: sb89594 <147619318+sb89594@users.noreply.github.com>
Date: Wed, 3 Jul 2024 09:20:58 +0000
Subject: [PATCH 1/3] updated zookeeper dependency

---
 kubernetes/accumulo/Chart.yaml             | 4 ++--
 kubernetes/accumulo/templates/_helpers.tpl | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kubernetes/accumulo/Chart.yaml b/kubernetes/accumulo/Chart.yaml
index 34d2f203..bd0892eb 100644
--- a/kubernetes/accumulo/Chart.yaml
+++ b/kubernetes/accumulo/Chart.yaml
@@ -22,8 +22,8 @@ sources:
   - https://github.com/gchq/gaffer-docker
 dependencies:
   - name: zookeeper
-    version: 2.1.5
-    repository: https://charts.helm.sh/incubator/
+    version: 11.4.11
+    repository: https://charts.bitnami.com/bitnami/
     condition: zookeeper.enabled
   - name: hdfs
     version: ^2.2.2 # managed version
diff --git a/kubernetes/accumulo/templates/_helpers.tpl b/kubernetes/accumulo/templates/_helpers.tpl
index 6e58656e..955f7156 100644
--- a/kubernetes/accumulo/templates/_helpers.tpl
+++ b/kubernetes/accumulo/templates/_helpers.tpl
@@ -67,7 +67,7 @@ Create the name of the service account to use
 
 {{- define "accumulo.zookeepers" -}}
   {{- if .Values.zookeeper.enabled -}}
-    {{ template "accumulo.callSubChartTemplate" (list . "zookeeper" "zookeeper.fullname") }}
+    {{ template "accumulo.callSubChartTemplate" (list . "zookeeper" "zookeeper.image") }}
   {{- else -}}
     {{- required ".Values.zookeeper.enabled = false, so .Values.zookeeper.externalHosts must be set" .Values.zookeeper.externalHosts }}
   {{- end -}}

From 4b7cf516301faa916d452f419fdf7c134ffbd39d Mon Sep 17 00:00:00 2001
From: sb89594 <147619318+sb89594@users.noreply.github.com>
Date: Wed, 3 Jul 2024 10:29:41 +0000
Subject: [PATCH 2/3] added copyright header

---
 kubernetes/accumulo/templates/_helpers.tpl | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/kubernetes/accumulo/templates/_helpers.tpl b/kubernetes/accumulo/templates/_helpers.tpl
index 955f7156..964ef84d 100644
--- a/kubernetes/accumulo/templates/_helpers.tpl
+++ b/kubernetes/accumulo/templates/_helpers.tpl
@@ -1,3 +1,20 @@
+{{- /*
+
+Copyright 2020-2022 Crown Copyright
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+*/ -}}
 {{/* vim: set filetype=mustache: */}}
 {{/*
 Expand the name of the chart.

From 70a6889a8369db7a890c563937d812eda4b0a0e7 Mon Sep 17 00:00:00 2001
From: sb89594 <147619318+sb89594@users.noreply.github.com>
Date: Wed, 3 Jul 2024 10:41:50 +0000
Subject: [PATCH 3/3] updated header

---
 kubernetes/accumulo/templates/_helpers.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kubernetes/accumulo/templates/_helpers.tpl b/kubernetes/accumulo/templates/_helpers.tpl
index 964ef84d..64c9c208 100644
--- a/kubernetes/accumulo/templates/_helpers.tpl
+++ b/kubernetes/accumulo/templates/_helpers.tpl
@@ -1,6 +1,6 @@
 {{- /*
 
-Copyright 2020-2022 Crown Copyright
+Copyright 2020-2024 Crown Copyright
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.