Merge pull request #206 from yubingjiaocn/main

feat: Add persist option for MySQL and RabbitMQ
aws-containers · Apr 13, 2023 · 5e40033 · 5e40033
2 parents 6a8ff17 + 2e486c0
commit 5e40033
Show file tree

Hide file tree

Showing 5 changed files with 132 additions and 1 deletion.
diff --git a/deploy/kubernetes/charts/catalog/templates/mysql-statefulset.yaml b/deploy/kubernetes/charts/catalog/templates/mysql-statefulset.yaml
@@ -43,6 +43,11 @@ spec:
                 secretKeyRef:
                   name: {{ .Values.mysql.secret.name }}
                   key: password
+          args:
+            - "--ignore-db-dir=lost+found"
+          volumeMounts:
+            - name: data
+              mountPath: /var/lib/mysql
           ports:
             - name: mysql
               containerPort: 3306
@@ -59,4 +64,34 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+{{- if .Values.mysql.persistentVolume.enabled }}
+  volumeClaimTemplates:
+    - metadata:
+        name: data
+        {{- if .Values.mysql.persistentVolume.annotations }}
+        annotations:
+{{ toYaml .Values.mysql.persistentVolume.annotations | indent 10 }}
+        {{- end }}
+        {{- if .Values.mysql.persistentVolume.labels }}
+        labels:
+{{ toYaml .Values.mysql.persistentVolume.labels | indent 10 }}
+        {{- end }}
+      spec:
+        accessModes:
+{{ toYaml .Values.mysql.persistentVolume.accessModes | indent 8 }}
+        resources:
+          requests:
+            storage: "{{ .Values.mysql.persistentVolume.size }}"
+      {{- if .Values.mysql.persistentVolume.storageClass }}
+      {{- if (eq "-" .Values.mysql.persistentVolume.storageClass) }}
+        storageClassName: ""
+      {{- else }}
+        storageClassName: "{{ .Values.mysql.persistentVolume.storageClass }}"
+      {{- end }}
+      {{- end }}
+{{- else }}
+      volumes:
+      - name: data
+        emptyDir: {}
+{{- end }}
 {{- end }}
diff --git a/deploy/kubernetes/charts/catalog/values.yaml b/deploy/kubernetes/charts/catalog/values.yaml
@@ -103,6 +103,15 @@ mysql:
 
   affinity: {}
 
+  persistentVolume:
+    enabled: true
+    annotations: {}
+    labels: {}
+    accessModes:
+    - ReadWriteOnce
+    size: 10Gi
+    # storageClass: gp2
+
 securityGroups:
   create: false
 

diff --git a/deploy/kubernetes/charts/orders/templates/mysql-statefulset.yaml b/deploy/kubernetes/charts/orders/templates/mysql-statefulset.yaml
@@ -43,6 +43,11 @@ spec:
                 secretKeyRef:
                   name: {{ .Values.mysql.secret.name }}
                   key: password
+          args:
+            - "--ignore-db-dir=lost+found"
+          volumeMounts:
+            - name: data
+              mountPath: /var/lib/mysql
           ports:
             - name: mysql
               containerPort: 3306
@@ -59,4 +64,34 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+{{- if .Values.mysql.persistentVolume.enabled }}
+  volumeClaimTemplates:
+    - metadata:
+        name: data
+        {{- if .Values.mysql.persistentVolume.annotations }}
+        annotations:
+{{ toYaml .Values.mysql.persistentVolume.annotations | indent 10 }}
+        {{- end }}
+        {{- if .Values.mysql.persistentVolume.labels }}
+        labels:
+{{ toYaml .Values.mysql.persistentVolume.labels | indent 10 }}
+        {{- end }}
+      spec:
+        accessModes:
+{{ toYaml .Values.mysql.persistentVolume.accessModes | indent 8 }}
+        resources:
+          requests:
+            storage: "{{ .Values.mysql.persistentVolume.size }}"
+      {{- if .Values.mysql.persistentVolume.storageClass }}
+      {{- if (eq "-" .Values.mysql.persistentVolume.storageClass) }}
+        storageClassName: ""
+      {{- else }}
+        storageClassName: "{{ .Values.mysql.persistentVolume.storageClass }}"
+      {{- end }}
+      {{- end }}
+{{- else }}
+      volumes:
+      - name: data
+        emptyDir: {}
+{{- end }}
 {{- end }}
diff --git a/deploy/kubernetes/charts/orders/templates/rabbitmq-statefulset.yaml b/deploy/kubernetes/charts/orders/templates/rabbitmq-statefulset.yaml
@@ -35,6 +35,9 @@ spec:
           - name: http
             containerPort: 15672
             protocol: TCP
+          volumeMounts:
+          - name: data
+            mountPath: "/var/lib/rabbitmq/mnesia"
       {{- with .Values.rabbitmq.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
@@ -47,4 +50,35 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+
+{{- if .Values.rabbitmq.persistentVolume.enabled }}
+  volumeClaimTemplates:
+    - metadata:
+        name: data
+        {{- if .Values.rabbitmq.persistentVolume.annotations }}
+        annotations:
+{{ toYaml .Values.rabbitmq.persistentVolume.annotations | indent 10 }}
+        {{- end }}
+        {{- if .Values.rabbitmq.persistentVolume.labels }}
+        labels:
+{{ toYaml .Values.rabbitmq.persistentVolume.labels | indent 10 }}
+        {{- end }}
+      spec:
+        accessModes:
+{{ toYaml .Values.rabbitmq.persistentVolume.accessModes | indent 8 }}
+        resources:
+          requests:
+            storage: "{{ .Values.rabbitmq.persistentVolume.size }}"
+      {{- if .Values.rabbitmq.persistentVolume.storageClass }}
+      {{- if (eq "-" .Values.rabbitmq.persistentVolume.storageClass) }}
+        storageClassName: ""
+      {{- else }}
+        storageClassName: "{{ .Values.rabbitmq.persistentVolume.storageClass }}"
+      {{- end }}
+      {{- end }}
+{{- else }}
+      volumes:
+      - name: data
+        emptyDir: {}
+{{- end }}
 {{- end }}
diff --git a/deploy/kubernetes/charts/orders/values.yaml b/deploy/kubernetes/charts/orders/values.yaml
@@ -108,11 +108,20 @@ mysql:
 
   affinity: {}
 
+  persistentVolume:
+    enabled: true
+    annotations: {}
+    labels: {}
+    accessModes:
+    - ReadWriteOnce
+    size: 10Gi
+    # storageClass: gp2
+
 rabbitmq:
   create: true
 
   address: ""
-  
+
   secret:
     create: true
     name: orders-rabbitmq
@@ -139,6 +148,15 @@ rabbitmq:
 
   affinity: {}
 
+  persistentVolume:
+    enabled: true
+    annotations: {}
+    labels: {}
+    accessModes:
+    - ReadWriteOnce
+    size: 10Gi
+    # storageClass: gp2
+
 securityGroups:
   create: false