templates/deployment.yaml を更新

templates/deployment.yaml

@@ -1,69 +1,97 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "{{ .Chart.Name }}.fullname" . }}
+  name: {{ include "wordpress-nginx.fullname" . }}
   labels:
-    {{- include "{{ .Chart.Name }}.labels" . | nindent 4 }}
+    {{- include "wordpress-nginx.labels" . | nindent 4 }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
-      {{- include "{{ .Chart.Name }}.selectorLabels" . | nindent 6 }}
+      {{- include "wordpress-nginx.selectorLabels" . | nindent 6 }}
   template:
     metadata:
       labels:
-        {{- include "{{ .Chart.Name }}.selectorLabels" . | nindent 8 }}
+        {{- include "wordpress-nginx.selectorLabels" . | nindent 8 }}
     spec:
+      initContainers:
+        - name: wordpress-init
+          image: "{{ .Values.image.wordpress.registry }}/{{ .Values.image.wordpress.repository }}:{{ .Values.image.wordpress.tag }}"
+          imagePullPolicy: {{ .Values.image.wordpress.pullPolicy }}
+          command: ["/bin/sh", "-c"]
+          args:
+            - |
+              if [ ! -f /var/www/html/wp-config.php ]; then
+                cp -r /usr/src/wordpress/* /var/www/html/
+                chown -R www-data:www-data /var/www/html
+              fi
+          volumeMounts:
+            - name: wordpress-data
+              mountPath: /var/www/html
       containers:
         - name: nginx
           image: "{{ .Values.image.nginx.registry }}/{{ .Values.image.nginx.repository }}:{{ .Values.image.nginx.tag }}"
           imagePullPolicy: {{ .Values.image.nginx.pullPolicy }}
           ports:
-            - containerPort: 80
+            - name: http
+              containerPort: 80
+              protocol: TCP
           volumeMounts:
-            - name: app-storage
+            - name: wordpress-data
               mountPath: /var/www/html
-              subPath: html
             - name: nginx-config
-              mountPath: /etc/nginx/nginx.conf
+              mountPath: /etc/nginx/conf.d/default.conf
-              subPath: nginx.conf
+              subPath: default.conf
-        - name: app-fpm
+          {{- if .Values.healthCheck.enabled }}
-          image: "{{ .Values.image.php.registry }}/{{ .Values.image.php.repository }}:{{ .Values.image.php.tag }}"
+          livenessProbe:
-          imagePullPolicy: {{ .Values.image.php.pullPolicy }}
+            {{- toYaml .Values.healthCheck.livenessProbe | nindent 12 }}
-          ports:
+          readinessProbe:
-            - name: fpm
+            {{- toYaml .Values.healthCheck.readinessProbe | nindent 12 }}
-              containerPort: 9000  # PHP-FPMは9000ポートでリッスン
+          {{- end }}
-          volumeMounts:
+          resources:
-            - name: app-storage
+            {{- toYaml .Values.resources.nginx | nindent 12 }}
-              mountPath: /var/www/html
+        - name: wordpress
-              subPath: html
+          image: "{{ .Values.image.wordpress.registry }}/{{ .Values.image.wordpress.repository }}:{{ .Values.image.wordpress.tag }}"
+          imagePullPolicy: {{ .Values.image.wordpress.pullPolicy }}
           env:
-            - name: DB_HOST
+            - name: WORDPRESS_DB_HOST
-              value: {{ .Values.externalDatabase.host | quote }}
+              value: {{ .Values.wordpress.dbHost | quote }}
-            - name: DB_PORT
+            - name: WORDPRESS_DB_NAME
-              value: {{ .Values.externalDatabase.port | quote }}
+              value: {{ .Values.wordpress.dbName | quote }}
-            - name: DB_NAME
+            - name: WORDPRESS_DB_USER
-              value: {{ .Values.externalDatabase.database | quote }}
+              value: {{ .Values.wordpress.dbUser | quote }}
-            - name: DB_USER
+            - name: WORDPRESS_DB_PASSWORD
-              value: {{ .Values.externalDatabase.username | quote }}
-            - name: DB_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: {{ include "{{ .Chart.Name }}.fullname" . }}-db-secret
+                  name: {{ include "wordpress-nginx.fullname" . }}-secret
-                  key: {{ include "{{ .Chart.Name }}.fullname" . }}-db-key
+                  key: db-password
-      dnsPolicy: ClusterFirst
+            - name: WORDPRESS_TABLE_PREFIX
-      dnsConfig:
+              value: {{ .Values.wordpress.tablePrefix | quote }}
-        options:
+          volumeMounts:
-        - name: ndots
+            - name: wordpress-data
-          value: "1"
+              mountPath: /var/www/html
+          resources:
+            {{- toYaml .Values.resources.wordpress | nindent 12 }}
       volumes:
-        - name: app-storage
+        - name: wordpress-data
           {{- if .Values.persistence.enabled }}
           persistentVolumeClaim:
-            claimName: {{ include "{{ .Chart.Name }}.fullname" . }}-pvc
+            claimName: {{ include "wordpress-nginx.fullname" . }}-pvc
           {{- else }}
           emptyDir: {}
           {{- end }}
         - name: nginx-config
           configMap:
-            name: {{ include "{{ .Chart.Name }}.fullname" . }}-nginx-config
+            name: {{ include "wordpress-nginx.fullname" . }}-nginx-config
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}