keydb: 0.9.0

Enapter · Jun 8, 2020 · 54dda72 · 54dda72
1 parent 69e2fe5
commit 54dda72
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 38 deletions.
diff --git a/keydb/Chart.yaml b/keydb/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: keydb
 description: A Helm chart for KeyDB multimaster setup
 type: application
-version: 0.8.2
+version: 0.9.0
 keywords:
 - keydb
 - redis

diff --git a/keydb/README.md b/keydb/README.md
@@ -48,5 +48,4 @@ The following table lists the configurable parameters of the KeyDB chart and the
 | `securityContext`               | K8s SecurityContext for KeyDB pods              | `{}`                          |
 | `loadBalancer.enabled`          | Create LoadBalancer service                     | `false`                       |
 | `loadBalancer.annotations`      | Annotations for LB                              | `{}`                          |
-| `loadBalancer.IP`               | Dedicated IP for LB (ex. MetalLB)               | ``                            |
-| `loadBalancer.extra`            | Additional spec for LB                          | `{}`                          |
+| `loadBalancer.extraSpec`        | Additional spec for LB                          | `{}`                          |
diff --git a/keydb/templates/svc-lb.yaml b/keydb/templates/svc-lb.yaml
@@ -0,0 +1,24 @@
+{{- if .Values.loadBalancer.enabled }}
+---
+# Load balancer service
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ template "keydb.fullname" . }}-lb
+  labels:
+{{ include "keydb.labels" . | indent 4 }}
+  annotations:
+{{ toYaml .Values.loadBalancer.annotations | indent 4 }}
+spec:
+  type: LoadBalancer
+  {{- if .Values.loadBalancer.extraSpec }}
+{{ toYaml .Values.loadBalancer.extraSpec | indent 2 }}
+  {{- end }}
+  ports:
+  - name: server
+    port: {{ .Values.port | int }}
+    protocol: TCP
+    targetPort: keydb
+  selector:
+{{ include "keydb.selectorLabels" . | indent 4 }}
+{{- end }}
diff --git a/keydb/templates/svc.yaml b/keydb/templates/svc.yaml
@@ -15,34 +15,3 @@ spec:
     targetPort: keydb
   selector:
 {{ include "keydb.selectorLabels" . | indent 4 }}
-
-
-{{- if .Values.loadBalancer.enabled }}
----
-# Load balancer service
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ template "keydb.fullname" . }}-lb
-  labels:
-{{ include "keydb.labels" . | indent 4 }}
-  {{- if .Values.loadBalancer.annotations }}
-  annotations:
-{{ toYaml .Values.loadBalancer.annotations | indent 4 }}
-  {{- end }}
-spec:
-  type: LoadBalancer
-  {{- if ne .Values.loadBalancer.IP "" }}
-  loadBalancerIP: "{{ .Values.loadBalancer.IP }}"
-  {{- end }}
-  {{- if .Values.loadBalancer.extra }}
-{{ toYaml .Values.loadBalancer.extra | indent 2 }}
-  {{- end }}
-  ports:
-  - name: server
-    port: {{ .Values.port | int }}
-    protocol: TCP
-    targetPort: keydb
-  selector:
-{{ include "keydb.selectorLabels" . | indent 4 }}
-{{- end }}
diff --git a/keydb/values.yaml b/keydb/values.yaml
@@ -43,11 +43,13 @@ securityContext: {}
 
 loadBalancer:
   enabled: false
-  IP: ""
-  annotations: {}
+
   # annotations:
   #   service.beta.kubernetes.io/aws-load-balancer-type: nlb
-  extra: {}
-  # extra:
+  annotations: {}
+
+  # extraSpec:
+  #   loadBalancerIP: "1.2.3.4"
   #   loadBalancerSourceRanges:
   #   - 1.2.3.4/32
+  extraSpec: {}