From efbb201986d3e2c8f6a4d70101d50c3e8820652f Mon Sep 17 00:00:00 2001
From: Ben Donnelly <b.w.donnelly1@googlemail.com>
Date: Thu, 8 Feb 2024 16:29:20 +0000
Subject: [PATCH 1/4] chore(deep): update app version

---
 charts/deep-distributed/Chart.yaml | 4 ++--
 charts/deep/Chart.yaml             | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/charts/deep-distributed/Chart.yaml b/charts/deep-distributed/Chart.yaml
index 674ce1d..e1c4d34 100644
--- a/charts/deep-distributed/Chart.yaml
+++ b/charts/deep-distributed/Chart.yaml
@@ -15,13 +15,13 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.0.5
+version: 1.0.6
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "1.0.4"
+appVersion: "1.0.5"
 maintainers:
   - name: Ben Donnelly
     email: b.w.donnelly1@gmail.com
diff --git a/charts/deep/Chart.yaml b/charts/deep/Chart.yaml
index aab84b8..094e983 100644
--- a/charts/deep/Chart.yaml
+++ b/charts/deep/Chart.yaml
@@ -15,13 +15,13 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.0.19
+version: 1.0.20
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "1.0.4"
+appVersion: "1.0.5"
 icon: https://raw.githubusercontent.com/intergral/deep/master/docs/docs/images/logo/logo.svg
 maintainers:
   - name: Ben Donnelly

From d4238f5b45f905635fc97afe251eac44dd6c68bb Mon Sep 17 00:00:00 2001
From: Ben Donnelly <b.w.donnelly1@googlemail.com>
Date: Thu, 8 Feb 2024 20:28:57 +0000
Subject: [PATCH 2/4] chore(deep): fix test and fix helm unittest version

---
 .github/workflows/unittest.yml                 | 2 +-
 .idea/deep-helm.iml                            | 7 +++++++
 charts/deep/unittests/serviceMonitor_test.yaml | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml
index 5a8e532..d06cdd0 100644
--- a/.github/workflows/unittest.yml
+++ b/.github/workflows/unittest.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - run: helm plugin install https://github.com/helm-unittest/helm-unittest.git
+      - run: helm plugin install https://github.com/helm-unittest/helm-unittest.git --version 0.4.1
       - name: Helm unittest
         run: |
           helm unittest -f unittests/*_test.yaml ${GITHUB_WORKSPACE}/charts/deep
diff --git a/.idea/deep-helm.iml b/.idea/deep-helm.iml
index a4de2ac..522bf33 100644
--- a/.idea/deep-helm.iml
+++ b/.idea/deep-helm.iml
@@ -9,4 +9,11 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
+  <component name="TemplatesService">
+    <option name="TEMPLATE_FOLDERS">
+      <list>
+        <option value="$MODULE_DIR$/charts/deep/templates" />
+      </list>
+    </option>
+  </component>
 </module>
\ No newline at end of file
diff --git a/charts/deep/unittests/serviceMonitor_test.yaml b/charts/deep/unittests/serviceMonitor_test.yaml
index 2f4760c..9b90963 100644
--- a/charts/deep/unittests/serviceMonitor_test.yaml
+++ b/charts/deep/unittests/serviceMonitor_test.yaml
@@ -34,6 +34,7 @@ tests:
       config:
         clusterName: "fromconfig"
       monitoring:
+        enabled: true
         serviceMonitor:
           clusterLabel: "labelfromconfig"
     template: serviceMonitor.yaml

From 86753b6af5a58c95b2ef6ea8f7293a5b5481e200 Mon Sep 17 00:00:00 2001
From: Ben Donnelly <b.w.donnelly1@googlemail.com>
Date: Thu, 8 Feb 2024 20:33:31 +0000
Subject: [PATCH 3/4] chore(update): update build action versions

---
 .github/workflows/generate_docs.yml | 6 +++---
 .github/workflows/lint-test.yml     | 4 ++--
 .github/workflows/push.yml          | 2 +-
 .github/workflows/release.yml       | 4 ++--
 .github/workflows/sync_readme.yml   | 4 ++--
 .github/workflows/unittest.yml      | 2 +-
 .idea/misc.xml                      | 6 ++++++
 7 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/generate_docs.yml b/.github/workflows/generate_docs.yml
index d161573..7662a2b 100644
--- a/.github/workflows/generate_docs.yml
+++ b/.github/workflows/generate_docs.yml
@@ -23,7 +23,7 @@ jobs:
   get_index:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: gh-pages
       - name: upload index
@@ -36,7 +36,7 @@ jobs:
     needs: get_index
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: master
       - run: pip install helm_mkdocs mkdocs-material
@@ -63,4 +63,4 @@ jobs:
     steps:
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v2
+        uses: actions/deploy-pages@v4
diff --git a/.github/workflows/lint-test.yml b/.github/workflows/lint-test.yml
index 1e1dc98..9eee3b1 100644
--- a/.github/workflows/lint-test.yml
+++ b/.github/workflows/lint-test.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -19,7 +19,7 @@ jobs:
         with:
           version: v3.12.1
 
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: '3.9'
           check-latest: true
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 5dfb11f..e845de6 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -8,7 +8,7 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Helm Lint
         run: |
           helm lint ${GITHUB_WORKSPACE}/charts/deep
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b962e7d..551049c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -20,7 +20,7 @@ jobs:
           git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
 
       - name: Run chart-releaser
-        uses: helm/chart-releaser-action@v1.5.0
+        uses: helm/chart-releaser-action@v1.6.0
         with:
           config: cr.yaml
         env:
diff --git a/.github/workflows/sync_readme.yml b/.github/workflows/sync_readme.yml
index 5f20cc5..924f9a0 100644
--- a/.github/workflows/sync_readme.yml
+++ b/.github/workflows/sync_readme.yml
@@ -12,10 +12,10 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - run: |
           cp -f README.md ${{ runner.temp }}/README.md
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           ref: gh-pages
       - run: |
diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml
index d06cdd0..d38e334 100644
--- a/.github/workflows/unittest.yml
+++ b/.github/workflows/unittest.yml
@@ -8,7 +8,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: helm plugin install https://github.com/helm-unittest/helm-unittest.git --version 0.4.1
       - name: Helm unittest
         run: |
diff --git a/.idea/misc.xml b/.idea/misc.xml
index ae697f4..fa735d7 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="ASMIdeaPluginConfiguration">
+    <asm skipDebug="false" skipFrames="false" skipCode="false" expandFrames="false" />
+    <groovy codeStyle="LEGACY" />
+  </component>
   <component name="Black">
     <option name="sdkName" value="Python 3.10 (deep-helm)" />
   </component>
@@ -14,6 +19,7 @@
         <option value="$PROJECT_DIR$/charts/pom.xml" />
       </set>
     </option>
+    <option name="workspaceImportForciblyTurnedOn" value="true" />
   </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_20" project-jdk-name="Python 3.10 (deep-helm)" project-jdk-type="Python SDK">
     <output url="file://$PROJECT_DIR$/out" />

From cee264690a53c548c483e3ef5b0e16c205559fe8 Mon Sep 17 00:00:00 2001
From: Ben Donnelly <b.w.donnelly1@googlemail.com>
Date: Thu, 8 Feb 2024 21:36:08 +0000
Subject: [PATCH 4/4] fix(single-bin): fix issue with volume claims in single
 binary mode

---
 charts/deep/templates/statefulset.yaml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/charts/deep/templates/statefulset.yaml b/charts/deep/templates/statefulset.yaml
index d5064af..c7f2a28 100644
--- a/charts/deep/templates/statefulset.yaml
+++ b/charts/deep/templates/statefulset.yaml
@@ -74,10 +74,8 @@ spec:
           name: deep-conf
         - mountPath: /runtime-config
           name: deep-runtime-conf
-        {{- if .Values.deep.persistence.enabled }}
         - mountPath: /var/deep
           name: storage
-        {{- end }}
         {{- if .Values.metricsGenerator.enabled }}
         - mountPath: /tmp
           name: tmp
@@ -109,7 +107,11 @@ spec:
         {{- if .Values.metricsGenerator.enabled }}
         - name: tmp
           emptyDir: {}
-      {{- end }}
+        {{- end }}
+        {{- if not .Values.deep.persistence.enabled }}
+        - name: storage
+          emptyDir: { }
+        {{- end }}
   updateStrategy:
     type: {{- toYaml .Values.deep.updateStrategy | nindent 6 }}
   {{- if .Values.deep.persistence.enabled }}