Update helm

Author: vainkop

pkg/helm/templates/svc-headless.yaml

@@ -9,7 +9,7 @@ metadata:
 spec:
   clusterIP: None
   ports:
-  - port: 6379
+  - port: {{ .Values.port | int }}
     targetPort: keydb
     protocol: TCP
     name: keydb

pkg/helm/templates/svc.yaml

@@ -1,23 +1,28 @@
-{{- if .Values.loadBalancer.enabled }}
 apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "keydb.fullname" . }}
-  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "keydb.labels" . | nindent 4 }}
-  {{- with .Values.loadBalancer.annotations }}
   annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
+    {{- toYaml .Values.service.annotations | nindent 4 }}
 spec:
-  type: LoadBalancer
+  type: ClusterIP
   ports:
-  - port: 6379
+  - name: keydb
+    port: {{ .Values.port | int }}
+    protocol: TCP
     targetPort: keydb
+    {{- if .Values.service.appProtocol.enabled }}
+    appProtocol: redis
+    {{- end }}
+  - name: redis-exporter
+    port: {{ .Values.exporter.port | int }}
     protocol: TCP
-    name: keydb
+    targetPort: redis-exporter
+    {{- if .Values.service.appProtocol.enabled }}
+    appProtocol: http
+    {{- end }}
   selector:
     {{- include "keydb.selectorLabels" . | nindent 4 }}
-{{- end }}
-
+  sessionAffinity: ClientIP

pkg/helm/values.yaml

@@ -7,7 +7,7 @@ imageTag: 8.2.3
 imagePullPolicy: IfNotPresent
 imagePullSecrets: []
 
-nodes: 3
+nodes: 2
 
 password: ""
 existingSecret: ""
@@ -35,9 +35,14 @@ extraContainers: []
 ## Extra volumes
 extraVolumes: []
 
+service:
+  annotations: {}
+  appProtocol:
+    enabled: false
+
 ## LoadBalancer Service
 loadBalancer:
-  enabled: true
+  enabled: false
   annotations: {}
 
 ## Internal headless service  
@@ -62,7 +67,7 @@ persistence:
   ##
   # storageClass: "-"
   accessMode: ReadWriteOnce
-  size: 1Gi
+  size: 10Gi
 
 ## Configure resource requests
 resources:
@@ -120,7 +125,8 @@ configExtraArgs: []
 ## Node labels for pod assignment
 ## Ref: https://kubernetes.io/docs/user-guide/node-selection/
 ##
-nodeSelector: {}
+nodeSelector:
+  kubernetes.io/arch: arm64
 
 ## Tolerations for pod assignment
 ## Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
@@ -165,6 +171,8 @@ exporter:
   image: oliver006/redis_exporter
   tag: latest
   pullPolicy: IfNotPresent
+  resources: {}
+  extraArgs: {}
   port: 9121
   scrapePath: /metrics
   serviceMonitor:
@@ -187,48 +195,4 @@ serviceAccount:
 ## RBAC
 ## ref: https://kubernetes.io/docs/reference/access-authn-authz/rbac/
 rbac:
-  create: false
-
-## Prometheus Exporter / Metrics
-##
-exporter:
-  enabled: false
-  image: oliver006/redis_exporter
-  imageTag: v1.48.0-alpine
-  pullPolicy: IfNotPresent
-
-  ## Prometheus exporter resource requests and limits
-  ## ref: http://kubernetes.io/docs/user-guide/compute-resources/
-  ##
-  resources: {}
-
-  ## Extra args for redis exporter
-  ##
-  extraArgs: {}
-
-  ## Service Monitor for Prometheus Operator
-  ## ref: https://github.com/coreos/prometheus-operator
-  ##
-  serviceMonitor:
-    ## If true, a ServiceMonitor CRD is created for a prometheus operator
-    ## https://github.com/coreos/prometheus-operator
-    ##
-    enabled: false
-    ## The namespace the ServiceMonitor will be created in
-    ## If left empty, the ServiceMonitor will be created in the prometheus namespace
-    # namespace: monitoring
-    ##  The name of the label to use for the service
-    selector:
-      release: prometheus
-    ## ServiceMonitor scrape interval
-    ## ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#endpoint
-    ##
-    interval: 30s
-    ## ServiceMonitor scrape timeout
-    ## ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#endpoint
-    ##
-    scrapeTimeout: 10s
-    ## ServiceMonitor annotations
-    ##
-    annotations: {}
-
+  create: false