Merge pull request #4 from mariadb-kester/GaleraUpdates

Galera updates

Author: mariadb-kester

charts/galera/Chart.yaml

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

charts/galera/templates/statefulset-galera-cluster.yaml

@@ -84,7 +84,7 @@ spec:
           - name: NODE_ADDRESS
             value: "eth0"
           - name: SST_METHOD
-            value: "rsync"
+            value: "mariabackup"
           - name: MARIADB_ROOT_SOCKET_AUTH
             value: "0"
 #          - name: MARIADB_DATABASE

charts/masterreplica/Chart.yaml

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

charts/masterreplica/templates/deployment-maxscale.yaml

@@ -93,6 +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 }}
           volumeMounts:
           - name: "config"
             mountPath: "/etc/maxscale.cnf"

charts/masterreplica/templates/service-maxscale.yaml

@@ -36,4 +36,23 @@ spec:
   selector:
     app.kubernetes.io/name: {{ include "masterreplica.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}-maxscale
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Values.maxscale.guiService.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 }}
+  ports:
+    - name: {{ .Values.maxscale.guiService.name }}
+      port: {{ .Values.maxscale.guiService.port }}
+      targetPort: {{ .Values.maxscale.guiService.targetPort }}
+  selector:
+    app.kubernetes.io/name: {{ include "masterreplica.name" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}-maxscale
 {{- end }}

charts/masterreplica/values.yaml

@@ -124,6 +124,11 @@ maxscaleConfigurationMaster: |-
     log_warning=on
     # Enable or disable the logging of messages whose syslog priority is debug
     log_debug=on
+    admin_enabled=1
+    admin_auth=1
+    admin_host=0.0.0.0
+    admin_gui=1
+    admin_secure_gui=false
     ############################################
     ## Settings for splitting read and writes ##
     ############################################
@@ -198,24 +203,6 @@ maxscaleConfigurationMaster: |-
     port=$DB3_PORT
     protocol=MariaDBBackend
     priority=$DB3_PRIO
-    #############################
-    ## Used for Binlog Routing ##
-    #############################
-    #[BinlogRouting-Service]
-    #type=service
-    #servers=db1,db2,db3
-    #router=binlogrouter
-    #user=$MAXSCALE_USER
-    #password=$MAXSCALE_USER_PASSWORD
-    #server_id=1001003
-    #binlogdir=/var/lib/maxscale/
-    #heartbeat=60
-    #burstsize=1M
-    #[BinlogRouting-Listener]
-    #type=listener
-    #service=BinlogRouting-Service
-    #protocol=$BINLOG_PROTOCOL
-    #port=$BINLOG_PORT
 
 maxscaleConfigurationPassive: |-
     ###############################################
@@ -239,6 +226,11 @@ maxscaleConfigurationPassive: |-
     # Enable or disable the logging of messages whose syslog priority is debug
     log_debug=on
     passive=true
+    admin_enabled=1
+    admin_auth=1
+    admin_host=0.0.0.0
+    admin_gui=1
+    admin_secure_gui=false
     ############################################
     ## Settings for splitting read and writes ##
     ############################################
@@ -313,24 +305,6 @@ maxscaleConfigurationPassive: |-
     port=$DB3_PORT
     protocol=MariaDBBackend
     priority=$DB3_PRIO
-    #############################
-    ## Used for Binlog Routing ##
-    #############################
-    #[BinlogRouting-Service]
-    #type=service
-    #servers=db1,db2,db3
-    #router=binlogrouter
-    #user=$MAXSCALE_USER
-    #password=$MAXSCALE_USER_PASSWORD
-    #server_id=1001003
-    #binlogdir=/var/lib/maxscale/
-    #heartbeat=60
-    #burstsize=1M
-    #[BinlogRouting-Listener]
-    #type=listener
-    #service=BinlogRouting-Service
-    #protocol=$BINLOG_PROTOCOL
-    #port=$BINLOG_PORT
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
@@ -380,6 +354,11 @@ maxscale:
     port: 3307
     name: rwsplit
     targetPort: 3307
+  guiService:
+    type: ClusterIP
+    port: 8989
+    name: guiservice
+    targetPort: 8989
   replicaCount: 2
   metrics:
     enabled: false