From bdad68eaa7a97830f46e90ffb066ff94c29485f9 Mon Sep 17 00:00:00 2001
From: William Hearn <sylus1984@gmail.com>
Date: Thu, 9 May 2024 20:46:27 -0400
Subject: [PATCH] feat(solr): Minor updates to Solr Operator template

---
 charts/solr/Chart.yaml                    |  6 ++---
 charts/solr/templates/solrcloud/solr.yaml | 20 +++++----------
 charts/solr/values.yaml                   | 31 ++++++++++++++---------
 3 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/charts/solr/Chart.yaml b/charts/solr/Chart.yaml
index dbdf392..bd6fc31 100644
--- a/charts/solr/Chart.yaml
+++ b/charts/solr/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: solr
-description: A Helm chart for a Solr instance using the official Solr Operator
+description: A Helm chart for a Solr instance using the official Solr Operator.
 
 # A chart can be either an 'application' or a 'library' chart.
 #
@@ -15,10 +15,10 @@ 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: 0.1.7
+version: 0.1.8
 
 # 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: "8.11.1"
+appVersion: "8.11.3"
diff --git a/charts/solr/templates/solrcloud/solr.yaml b/charts/solr/templates/solrcloud/solr.yaml
index 2acb3d9..a947224 100644
--- a/charts/solr/templates/solrcloud/solr.yaml
+++ b/charts/solr/templates/solrcloud/solr.yaml
@@ -5,6 +5,7 @@ metadata:
   labels:
     {{- include "solr.labels" . | nindent 4 }}
 spec:
+  replicas: {{ .Values.solr.replicas }}
   dataStorage:
     persistent:
       reclaimPolicy: Delete
@@ -13,7 +14,6 @@ spec:
           resources:
             requests:
               storage: "{{ .Values.solr.storage.size }}"
-  replicas: {{ .Values.replicas }}
   solrImage:
     tag: "{{ default .Chart.AppVersion .Values.solr.tag }}"
   solrJavaMem: "{{ .Values.solr.solrJavaMem }}"
@@ -21,16 +21,10 @@ spec:
     authenticationType: Basic
     probesRequireAuth: true
     basicAuthSecret: {{ .Values.solr.basicAuthSecret }}
+  {{- if .Values.solr.customSolrKubeOptions }}
   customSolrKubeOptions:
-    podOptions:
-      livenessProbe:
-        timeoutSeconds: 5
-      readinessProbe:
-        timeoutSeconds: 5
-{{- if .Values.solr.resources }}
-      resources:
-{{ toYaml .Values.solr.resources | indent 8 }}
-{{- end  }}
+    {{- toYaml .Values.solr.customSolrKubeOptions | nindent 4 }}
+  {{- end }}
   zookeeperRef:
     provided:
       chroot: "/this/will/be/auto/created"
@@ -41,10 +35,10 @@ spec:
             requests:
               storage: "{{ .Values.zookeeper.storage.size }}"
       replicas: {{ .Values.replicas }}
+      {{- if .Values.zookeeper.resources }}
       zookeeperPodPolicy:
-{{- if .Values.zookeeper.resources }}
         resources:
-{{ toYaml .Values.zookeeper.resources | indent 10 }}
-{{- end  }}
+          {{- toYaml .Values.zookeeper.resources | nindent 10 }}
+      {{- end }}
   solrOpts: "-Dsolr.autoSoftCommit.maxTime=10000"
   solrGCTune: "-XX:SurvivorRatio=4 -XX:TargetSurvivorRatio=90 -XX:MaxTenuringThreshold=8"
diff --git a/charts/solr/values.yaml b/charts/solr/values.yaml
index bb78241..3b0bb7f 100644
--- a/charts/solr/values.yaml
+++ b/charts/solr/values.yaml
@@ -19,25 +19,32 @@ ingress:
 solr:
   # https://github.com/apache/solr-operator/blob/main/docs/solr-cloud/solr-cloud-crd.md#k8s-oper-user
   basicAuthSecret:
+  replicas: 1
   solrJavaMem: "-Xms1g -Xmx5g"
-  resources: {}
-    # requests:
-    #   memory: "256Mi"
-    #   cpu: "100m"
-    # limits:
-    #   memory: "1Gi"
-    #   cpu: "500m"
+  # customSolrKubeOptions:
+  #   podOptions:
+  #     livenessProbe:
+  #       periodSeconds: 15
+  #       timeoutSeconds: 5
+  #     readinessProbe:
+  #       timeoutSeconds: 5
+  #     resources:
+  #       limits:
+  #         memory: 5Gi
+  #       requests:
+  #         cpu: 250m
+  #         memory: 256Mi
   storage:
     size: 5Gi
 
 zookeeper:
   resources: {}
-    # requests:
-    #   memory: "256Mi"
-    #   cpu: "100m"
     # limits:
-    #   memory: "1Gi"
-    #   cpu: "500m"
+    #   memory: 2Gi
+    # requests:
+    #   cpu: 250m
+    #   memory: 256Mi
+
   storage:
     size: 5Gi