Merge pull request #5 from mariadb-kester/GaleraUpdates

Galera updates

Author: mariadb-kester

charts/masterreplica/Chart.yaml

@@ -6,5 +6,5 @@ maintainers:
   - name: kesterriley
     email: [email protected]
     url: https://github.com/mariadb-kester
-version: 0.2.15
+version: 0.2.16
 appVersion: 1.16.1

charts/masterreplica/templates/deployment-maxscale.yaml

@@ -93,8 +93,8 @@ spec:
               containerPort: {{ .Values.maxscale.masterOnlyService.port }}
             - name: {{ .Values.maxscale.rwService.name }}
               containerPort: {{ .Values.maxscale.rwService.port }}
-            - name: {{ .Values.maxscale.guiService.name }}
-              containerPort: {{ .Values.maxscale.guiService.port }}
+            - name: {{ .Values.maxscale.guiserviceactive.name }}
+              containerPort: {{ .Values.maxscale.guiserviceactive.port }}
           volumeMounts:
           - name: "config"
             mountPath: "/etc/maxscale.cnf"
@@ -223,6 +223,8 @@ spec:
               containerPort: {{ .Values.maxscale.masterOnlyService.port }}
             - name: {{ .Values.maxscale.rwService.name }}
               containerPort: {{ .Values.maxscale.rwService.port }}
+            - name: {{ .Values.maxscale.guiservicepassive.name }}
+              containerPort: {{ .Values.maxscale.guiservicepassive.port }}
           volumeMounts:
           - name: "config"
             mountPath: "/etc/maxscale.cnf"

charts/masterreplica/templates/service-maxscale.yaml

@@ -40,18 +40,37 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ .Values.maxscale.guiService.name }}
+  name: {{ .Values.maxscale.guiserviceactive.name }}
   labels:
     app.kubernetes.io/name: {{ include "masterreplica.name" . }}
     helm.sh/chart: {{ include "masterreplica.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
-  type: {{ .Values.maxscale.guiService.type }}
+  type: {{ .Values.maxscale.guiserviceactive.type }}
   ports:
-    - name: {{ .Values.maxscale.guiService.name }}
-      port: {{ .Values.maxscale.guiService.port }}
-      targetPort: {{ .Values.maxscale.guiService.targetPort }}
+    - name: {{ .Values.maxscale.guiserviceactive.name }}
+      port: {{ .Values.maxscale.guiserviceactive.port }}
+      targetPort: {{ .Values.maxscale.guiserviceactive.targetPort }}
+  selector:
+    app.kubernetes.io/name: {{ include "masterreplica.name" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}-maxscale
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Values.maxscale.guiservicepassive.name }}
+  labels:
+    app.kubernetes.io/name: {{ include "masterreplica.name" . }}
+    helm.sh/chart: {{ include "masterreplica.chart" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+spec:
+  type: {{ .Values.maxscale.guiservicepassive.type }}
+  ports:
+    - name: {{ .Values.maxscale.guiservicepassive.name }}
+      port: {{ .Values.maxscale.guiservicepassive.port }}
+      targetPort: {{ .Values.maxscale.guiservicepassive.targetPort }}
   selector:
     app.kubernetes.io/name: {{ include "masterreplica.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}-maxscale

charts/masterreplica/values.yaml

@@ -354,11 +354,16 @@ maxscale:
     port: 3307
     name: rwsplit
     targetPort: 3307
-  guiService:
+  guiserviceactive:
     type: ClusterIP
     port: 8989
-    name: guiservice
+    name: guiservice-active
     targetPort: 8989
+  guiservicepassive:
+    type: ClusterIP
+    port: 8989
+    name: guiservice-passive
+    targetPort: 8988
   replicaCount: 2
   metrics:
     enabled: false