Solution:3.0

mate-academy · May 9, 2024 · d4d3f34 · d4d3f34
1 parent c584c8a
commit d4d3f34
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 14 deletions.
diff --git a/.infrastructure/helm-chart/todoapp/charts/mysql/templates/secret.yml b/.infrastructure/helm-chart/todoapp/charts/mysql/templates/secret.yml
@@ -5,6 +5,6 @@ metadata:
   namespace: {{ .Values.global.namespace }}
 type: Opaque
 data:
-{{- range $k, $v := .Values.mysql.secret }}
+{{- range $k, $v := .Values.mysql.secrets }}
   {{ $k | upper }}: {{ $v | b64enc | quote }}
-  {{- end }}
+{{- end }}
diff --git a/.infrastructure/helm-chart/todoapp/charts/mysql/templates/statefulSet.yml b/.infrastructure/helm-chart/todoapp/charts/mysql/templates/statefulSet.yml
@@ -7,7 +7,7 @@ spec:
   selector:
     matchLabels:
       app: {{ .Chart.Name }}
-  replicas: {{ .Values.mysql.statefulSet }}
+  replicas: {{ .Values.mysql.statefulSet.replicas }}
   serviceName: {{ .Chart.Name }}
   template:
     metadata:
@@ -18,14 +18,16 @@ spec:
       - name: {{ .Values.mysql.statefulSet.name }}
         image: {{ .Values.mysql.statefulSet.repository }}:{{ .Values.mysql.statefulSet.version }}
         env:
-        {{- range $k := .Values.mysql.secret }}
-        - name: {{ $k }}
+        {{- range $k := .Values.mysql.secrets }}
+        - name: {{ $k | upper }}
           valueFrom:
             secretKeyRef:
               name: mysql-secrets
-              key: {{ $k }}
+              key: {{ $k | upper }}
         {{- end }}
-          value: app_db
+        resources:
+          requests:
+            {{ .Values.mysql.statefulSet.resources.requests }}
         ports:
         - name: mysql
           containerPort: 3306
@@ -35,9 +37,6 @@ spec:
           subPath: mysql
         - name: config-map
           mountPath: /docker-entrypoint-initdb.d
-        resources:
-          requests:
-            {{ .Values.mysql.statefulSet.resources.requests }}
         livenessProbe:
           {{ .Values.mysql.statefulSet.livenessProbe }}
         readinessProbe:
@@ -47,7 +46,12 @@ spec:
         configMap:
           name: mysql
       tolerations:
-      {{ .Values.mysql.statefulSet.tolerations }}
+      {{- range .Values.mysql.statefulSet.tolerations }}
+        - key: "{{ .key }}"
+          operator: "{{ .operator }}"
+          value: "{{ .value }}"
+          effect: "{{ .effect }}"
+      {{- end }}
   volumeClaimTemplates:
   - metadata:
       name: data

diff --git a/.infrastructure/helm-chart/todoapp/charts/mysql/values.yaml b/.infrastructure/helm-chart/todoapp/charts/mysql/values.yaml
@@ -5,7 +5,7 @@ mysql:
       port: 3306
     clusterIP: None
 
-  secret:
+  secrets:
     MYSQL_ROOT_PASSWORD: "1234"
     MYSQL_USER: "app_user"
     MYSQL_PASSWORD: "1234"
@@ -19,8 +19,8 @@ mysql:
 
     resources:
       requests:
-        cpu: 500m
         memory: 1Gi
+        cpu: 500m
 
     livenessProbe:
       exec:

diff --git a/.infrastructure/helm-chart/todoapp/templates/deployment.yml b/.infrastructure/helm-chart/todoapp/templates/deployment.yml
@@ -42,7 +42,7 @@ spec:
         - name: {{ $k | upper }}
           valueFrom:
             secretKeyRef:
-              name: todoapp-secret
+              name: todoapp-secrets
               key: {{ $k | upper }}
         {{- end }}
         ports: