refactor: ♻️ Remove unused value

Signed-off-by: Javier Salmeron Garcia <[email protected]>
bitnami · May 20, 2024 · c5da61a · c5da61a
1 parent 3f954b7
commit c5da61a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 14 deletions.
diff --git a/bitnami/scylladb/README.md b/bitnami/scylladb/README.md
@@ -451,7 +451,6 @@ As the image run as non-root by default, it is necessary to adjust the ownership
 | `sysctl.image.pullPolicy`                          | OS Shell + Utility image pull policy                                                                                                                                                                                            | `IfNotPresent`             |
 | `sysctl.image.pullSecrets`                         | OS Shell + Utility image pull secrets                                                                                                                                                                                           | `[]`                       |
 | `sysctl.sysctls`                                   | Map with sysctl settings to change. These are translated to sysctl -w <key> = <value>                                                                                                                                           | `{}`                       |
-| `sysctl.mountHostSys`                              | Mount the host `/sys` folder to `/host-sys`                                                                                                                                                                                     | `false`                    |
 | `sysctl.resourcesPreset`                           | Set container resources according to one common preset (allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge). This is ignored if sysctl.resources is set (sysctl.resources is recommended for production). | `nano`                     |
 | `sysctl.resources`                                 | Set container requests and limits for different resources like CPU or memory (essential for production workloads)                                                                                                               | `{}`                       |
 

diff --git a/bitnami/scylladb/templates/service.yaml b/bitnami/scylladb/templates/service.yaml
@@ -11,8 +11,8 @@ metadata:
   labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
     app.kubernetes.io/part-of: scylladb
     app.kubernetes.io/component: scylladb
-    {{- if and .Values.metrics.eanbled .Values.metrics.serviceMonitor.enabled }}
-    {{- /* Adding extra selector for the ServiceMonitor object to avoid duplicate targets  */ }}
+    {{- if and .Values.metrics.enabled .Values.metrics.serviceMonitor.enabled }}
+    {{- /* Adding extra selector for the ServiceMonitor object to avoid duplicate targets  */}}
     servicemonitor-scrape: true
     {{- end }}
   {{- if or .Values.service.annotations .Values.commonAnnotations }}

diff --git a/bitnami/scylladb/templates/statefulset.yaml b/bitnami/scylladb/templates/statefulset.yaml
@@ -80,7 +80,7 @@ spec:
       hostNetwork: true
       dnsPolicy: ClusterFirstWithHostNet
       {{- end }}
-      {{- if or .Values.initContainers (and .Values.podSecurityContext.enabled .Values.volumePermissions.enabled .Values.persistence.enabled) }}
+      {{- if or .Values.initContainers (and .Values.podSecurityContext.enabled .Values.volumePermissions.enabled .Values.persistence.enabled) .Values.sysctl.enabled }}
       initContainers:
         {{- if and .Values.podSecurityContext.enabled .Values.volumePermissions.enabled .Values.persistence.enabled }}
         - name: volume-permissions
@@ -157,14 +157,10 @@ spec:
           {{- else if ne .Values.sysctl.resourcesPreset "none" }}
           resources: {{- include "common.resources.preset" (dict "type" .Values.sysctl.resourcesPreset) | nindent 12 }}
           {{- end }}
-          {{- if .Values.sysctl.mountHostSys }}
           volumeMounts:
             - name: empty-dir
               mountPath: /tmp
               subPath: tmp-dir
-            - name: host-sys
-              mountPath: /host-sys
-          {{- end }}
         {{- end }}
         {{- if .Values.initContainers }}
         {{- include "common.tplvalues.render" (dict "value" .Values.initContainers "context" $) | nindent 8 }}
@@ -538,9 +534,10 @@ spec:
           readinessProbe:
             exec:
               command:
-                - pgrep
-                - -f
-                - scylla-jmx
+                - /bin/bash
+                - -ec
+                - |
+                  nodetool info | grep "Native Transport active: true"
             initialDelaySeconds: {{ .Values.jmxProxy.readinessProbe.initialDelaySeconds }}
             periodSeconds: {{ .Values.jmxProxy.readinessProbe.periodSeconds }}
             timeoutSeconds: {{ .Values.jmxProxy.readinessProbe.timeoutSeconds }}

diff --git a/bitnami/scylladb/values.yaml b/bitnami/scylladb/values.yaml
@@ -1093,9 +1093,6 @@ sysctl:
   ##
   sysctls:
     "fs.aio-max-nr": "30000000"
-  ## @param sysctl.mountHostSys Mount the host `/sys` folder to `/host-sys`
-  ##
-  mountHostSys: false
   ## Init container's resource requests and limits
   ## ref: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/
   ## @param sysctl.resourcesPreset Set container resources according to one common preset (allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge). This is ignored if sysctl.resources is set (sysctl.resources is recommended for production).