From c5da61a47116e7eebca189c06e6e2d87791348a1 Mon Sep 17 00:00:00 2001 From: Javier Salmeron Garcia Date: Mon, 20 May 2024 17:09:51 +0200 Subject: [PATCH] refactor: :recycle: Remove unused value Signed-off-by: Javier Salmeron Garcia --- bitnami/scylladb/README.md | 1 - bitnami/scylladb/templates/service.yaml | 4 ++-- bitnami/scylladb/templates/statefulset.yaml | 13 +++++-------- bitnami/scylladb/values.yaml | 3 --- 4 files changed, 7 insertions(+), 14 deletions(-) diff --git a/bitnami/scylladb/README.md b/bitnami/scylladb/README.md index f089f857a97ab8..4b890d89bf6b2c 100644 --- 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 = | `{}` | -| `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 index 4791a331fa8da6..be591008ff1aef 100644 --- 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 index 9ef0bc9fa86f28..f2aad195264b72 100644 --- 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 index 57fd62bb90ebf4..8f66c36910c750 100644 --- 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).