Merge branch 'main' into useAutoMem

README.md

@@ -1,4 +1,4 @@
-# Helmchart RonDB
+# RonDB Helm chart
 
 ## About RonDB
 
@@ -15,13 +15,15 @@ Being supported by the MySQL server, RonDB is inherently ACID compliant. In-memo
 
 This Helmchart is hosted on [GitHub Pages](https://logicalclocks.github.io/rondb-helm/). See the `gh_pages` branch of this repository for the source code.
 
-## Capabilities
+## Helm chart's capabilities
 
-- Create custom-size, cross-AZ cluster
+This Helm chart supports:
+
+- Creating custom-size, cross-AZ cluster
+- Scaling data node replicas
 - Horizontal auto-scaling of MySQLds & RDRS'
-- Scale data node replicas
-- Create backups & restore from backups
-- Global Replication
+- Backup & restore to and from object storage (e.g. S3)
+- Global Replication (cross-cluster replication)
 
 ## Quickstart
 
@@ -53,9 +55,9 @@ kubectl create secret generic aws-credentials \
     --from-literal "key_id=${AWS_ACCESS_KEY_ID}" \
     --from-literal "access_key=${AWS_SECRET_ACCESS_KEY}"
 
-# Run this if both:
+# Run this if:
 # - We want to use the cert-manager for TLS certificates
-# - [RDRS Ingress is enabled] OR [Any TLS is enabled]
+# - RDRS Ingress is enabled
 source ./standalone_deps.sh
 setup_deps $RONDB_NAMESPACE
 

templates/mgmd.yaml

@@ -30,6 +30,8 @@ spec:
       # Used to apply labels to all pods created by the Deployment
       labels:
         rondbService: {{ include "rondb.labels.rondbService.mgmd" $ }}
+      annotations:
+        configIniHash: {{ include "rondb.configIniHash" $ }}
     spec:
 {{- include "rondb.imagePullSecrets" . | indent 6 }}
 {{- include "rondb.nodeSelector" (dict "nodeSelector" .Values.nodeSelector.mgmd) | indent 6 }}

templates/mysqlds/binlog_servers.yaml

@@ -35,6 +35,8 @@ spec:
       # Used to apply labels to all pods created by the Deployment
       labels:
         rondbService: {{ include "rondb.labels.rondbService.binlog-servers" $ }}
+      annotations:
+        configIniHash: {{ include "rondb.configIniHash" $ }}
     spec:
 {{- include "rondb.imagePullSecrets" . | indent 6 }}
       affinity:

templates/mysqlds/mysqld.yaml

@@ -22,6 +22,8 @@ spec:
       # Used to apply labels to all pods created by the Deployment
       labels:
         rondbService: {{ include "rondb.labels.rondbService.mysqld" $ }}
+      annotations:
+        configIniHash: {{ include "rondb.configIniHash" $ }}
     spec:
 {{- include "rondb.imagePullSecrets" . | indent 6 }}
 {{- include "rondb.nodeSelector" (dict "nodeSelector" $.Values.nodeSelector.mysqld) | indent 6 }}

templates/mysqlds/replica_appliers.yaml

@@ -35,6 +35,8 @@ spec:
       # Used to apply labels to all pods created by the Deployment
       labels:
         rondbService: {{ include "rondb.labels.rondbService.replica-appliers" $ }}
+      annotations:
+        configIniHash: {{ include "rondb.configIniHash" $ }}
     spec:
 {{- include "rondb.imagePullSecrets" . | indent 6 }}
       serviceAccountName: {{ include "rondb.mysqldServiceAccountName" . }}

templates/ndbd.yaml

@@ -89,6 +89,7 @@ spec:
         nodeGroup: {{ $nodeGroup | quote }}
       # This is an easy way to restart data nodes without changing specs.
       annotations:
+        configIniHash: {{ include "rondb.configIniHash" $ }}
 {{- range $k, $v := $.Values.meta.ndbmtd.statefulSet.podAnnotations }}
         {{ $k | quote }}: {{ $v | quote }}
 {{- end }}

templates/rdrs.yaml

@@ -18,6 +18,8 @@ spec:
       # Used to apply labels to all pods created by the Deployment
       labels:
         rondbService: {{ include "rondb.labels.rondbService.rdrs" $ }}
+      annotations:
+        configIniHash: {{ include "rondb.configIniHash" $ }}
     spec:
 {{- include "rondb.imagePullSecrets" . | indent 6 }}
 {{- include "rondb.nodeSelector" (dict "nodeSelector" $.Values.nodeSelector.rdrs) | indent 6 }}

templates/shared_templates/_helpers.tpl

@@ -228,3 +228,8 @@ spec:
 ---
 {{ end }}
 {{- end }}
+
+# This is an easy way to trigger rolling restarts of all RonDB Pods
+{{- define "rondb.configIniHash" -}}
+{{ mustRegexReplaceAll "NodeActive *=.*" (tpl ($.Files.Get "files/configs/config.ini") $) "" | sha256sum }}
+{{- end -}}

test_scripts/active-passive-prod.sh

@@ -13,15 +13,13 @@ MYSQL_SECRET_NAME="mysql-passwords"
 NUM_BINLOG_SERVERS=2
 PRIMARY_CLUSTER_NUMBER=1
 
-# TODO: Fix ingress.enabled after other PR
 helm upgrade -i rondb-primary \
     --namespace=$NAMESPACE \
     --kubeconfig=$PRIMARY_KUBECONFIG . \
     --set "meta.binlogServers.externalLoadBalancers.namePrefix=$BINLOG_SERVER_LOAD_BALANCER_PREFIX" \
     --set "clusterSize.minNumRdrs=0" \
     --set "mysql.credentialsSecretName=$MYSQL_SECRET_NAME" \
     --set "mysql.supplyOwnSecret=false" \
-    --set "tls.ingress.enabled=false" \
     --set "globalReplication.clusterNumber=$PRIMARY_CLUSTER_NUMBER" \
     --set "globalReplication.primary.enabled=true" \
     --set "globalReplication.primary.numBinlogServers=$NUM_BINLOG_SERVERS" \
@@ -58,14 +56,12 @@ kubectl get secret $MYSQL_SECRET_NAME --kubeconfig=$PRIMARY_KUBECONFIG --namespa
     sed '/namespace/d; /creationTimestamp/d; /resourceVersion/d; /uid/d' |
     kubectl apply --kubeconfig=$SECONDARY_KUBECONFIG --namespace=$NAMESPACE -f -
 
-# TODO: Fix ingress.enabled after other PR
 helm upgrade -i rondb-secondary \
     --namespace=$NAMESPACE \
     --kubeconfig=$SECONDARY_KUBECONFIG . \
     --set "clusterSize.minNumRdrs=0" \
     --set "mysql.credentialsSecretName=$MYSQL_SECRET_NAME" \
     --set "mysql.supplyOwnSecret=true" \
-    --set "tls.ingress.enabled=false" \
     --set "globalReplication.clusterNumber=$((PRIMARY_CLUSTER_NUMBER + 1))" \
     --set "globalReplication.secondary.enabled=true" \
     --set "globalReplication.secondary.replicateFrom.clusterNumber=$PRIMARY_CLUSTER_NUMBER" \