feat: update divi-hub chart

elegantthemes · Jun 19, 2024 · 07f7569 · 07f7569
1 parent e1d3f62
commit 07f7569
Show file tree

Hide file tree

Showing 4 changed files with 89 additions and 9 deletions.
diff --git a/charts/hub-server/Chart.yaml b/charts/hub-server/Chart.yaml
@@ -5,4 +5,4 @@ maintainers:
   - email: dustin@elegantthemes.com
     name: Elegant Themes
 name: hub-server
-version: 1.1.3
+version: 1.1.4
diff --git a/charts/hub-server/templates/_helpers.tpl b/charts/hub-server/templates/_helpers.tpl
@@ -0,0 +1,36 @@
+{{ define "hub.container.worker" }}
+        - name: worker-{{ .index }}
+          env:
+            - name: NODE_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: spec.nodeName
+            - name: HUB_SERVER_PATH
+              value: {{ .Values.HUB_SERVER_PATH | squote }}
+            - name: VIRTUAL_HOST
+              value: {{ .Values.VIRTUAL_HOST | squote }}
+            - name: HUB_SERVER_REPO_URL
+              value: {{ .Values.HUB_SERVER_REPO_URL | squote }}
+            - name: IMAGE_VERSION
+              value: {{ .Values.HUB_SERVER_VERSION | squote }}
+            - name: HUB_SERVER_WORKER
+              value: '1'
+            - name: PHP_OPCACHE_FILE_CACHE
+              value: {{ ternary "/var/cache/php" "" (eq "production" .Values.HUB_SERVER_ENV) | squote }}
+            - name: PHP_OPCACHE_VALIDATE_TIMESTAMPS
+              value: {{ ternary "false" "true" (eq "production" .Values.HUB_SERVER_ENV) | squote }}
+          image: {{ .Values.HUB_SERVER_IMAGE | squote }}
+          resources:
+            requests:
+              cpu: 100m
+              memory: 100Mi
+            limits:
+              cpu: '4'
+              memory: 4G
+          volumeMounts:
+            - name: wordpress
+              mountPath: /srv
+            - name: config
+              mountPath: /config
+              readOnly: true
+{{ end }}
diff --git a/charts/hub-server/templates/hub-server.yml b/charts/hub-server/templates/hub-server.yml
@@ -67,16 +67,53 @@ spec:
               namespaces:
                 - dc-screenshot
               topologyKey: kubernetes.io/hostname
+      initContainers:
+        - name: init
+          env:
+            - name: NODE_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: spec.nodeName
+            - name: HUB_SERVER_PATH
+              value: {{ .Values.HUB_SERVER_PATH | squote }}
+            - name: VIRTUAL_HOST
+              value: {{ .Values.VIRTUAL_HOST | squote }}
+            - name: HUB_SERVER_REPO_URL
+              value: {{ .Values.HUB_SERVER_REPO_URL | squote }}
+            - name: IMAGE_VERSION
+              value: {{ .Values.HUB_SERVER_VERSION | squote }}
+            - name: HUB_SERVER_INIT
+              value: '1'
+            - name: PHP_OPCACHE_FILE_CACHE
+              value: {{ ternary "/var/cache/php" "" (eq "production" .Values.WP_ENV) | squote }}
+            - name: PHP_OPCACHE_VALIDATE_TIMESTAMPS
+              value: {{ ternary "false" "true" (eq "production" .Values.WP_ENV) | squote }}
+          image: {{ .Values.HUB_SERVER_IMAGE | squote }}
+          command: [ '/etc/cont-init.d/init' ]
+          resources:
+            requests:
+              cpu: 100m
+              memory: 100Mi
+            limits:
+              cpu: '4'
+              memory: 2G
+          volumeMounts:
+            - name: wordpress
+              mountPath: /srv
+            - name: config
+              mountPath: /config
+              readOnly: true
+
       containers:
-        - name: {{ .Release.Name }}
+        - name: app
           image: {{ .Values.HUB_SERVER_IMAGE | squote }}
           env:
             - name: NODE_NAME
               valueFrom:
                 fieldRef:
                   fieldPath: spec.nodeName
-            - name: INSTALL_PATH
-              value: {{ .Values.INSTALL_PATH | squote }}
+            - name: HUB_SERVER_PATH
+              value: {{ .Values.HUB_SERVER_PATH | squote }}
             - name: VIRTUAL_HOST
               value: {{ .Values.VIRTUAL_HOST | squote }}
             - name: PHP_MEMORY_LIMIT
@@ -93,7 +130,7 @@ spec:
                 - 'bash'
                 - '-c'
                 - 'SCRIPT_NAME=/healthz'
-                - 'SCRIPT_FILENAME={{ .Values.INSTALL_PATH }}/public/healthz.php'
+                - 'SCRIPT_FILENAME={{ .Values.HUB_SERVER_PATH }}/public/healthz.php'
                 - 'REQUEST_METHOD=GET'
                 - 'cgi-fcgi'
                 - '-bind'
@@ -109,7 +146,7 @@ spec:
                 - 'bash'
                 - '-c'
                 - 'SCRIPT_NAME=/healthz'
-                - 'SCRIPT_FILENAME={{ .Values.INSTALL_PATH }}/public/healthz.php'
+                - 'SCRIPT_FILENAME={{ .Values.HUB_SERVER_PATH }}/public/healthz.php'
                 - 'REQUEST_METHOD=GET'
                 - 'cgi-fcgi'
                 - '-bind'
@@ -122,17 +159,22 @@ spec:
               memory: 100Mi
             limits:
               cpu: 5000m
-              memory: 3G
+              memory: 2G
           startupProbe:
             exec:
               command:
                 - cat
-                - {{ .Values.INSTALL_PATH }}/public/healthz.php
+                - {{ .Values.HUB_SERVER_PATH }}/public/healthz.php
             failureThreshold: 30
             periodSeconds: 10
           volumeMounts:
             - name: wordpress
               mountPath: /srv
+
+{{ range $_, $index := untilStep 1 (int .Values.HUB_SERVER_WORKERS) 1 }}
+{{ include "hub.container.worker" (dict "Values" $.Values "index" $index) }}
+{{ end }}
+
       tolerations:
         - key: node.kubernetes.io/disk-pressure
           operator: Exists

diff --git a/charts/hub-server/values.yaml b/charts/hub-server/values.yaml
@@ -7,7 +7,9 @@ HUB_SERVER_ENV:
 HUB_SERVER_IMAGE:
 HUB_SERVER_REPO_URL:
 HUB_SERVER_VERSION:
-INSTALL_PATH:
+HUB_SERVER_WORKERS:
+HUB_SERVER_PATH:
+PHP_MEMORY_LIMIT:
 PUBLIC_KEY:
 REDIS_HOSTNAME:
 REDIS_SENTINEL_SERVICE: