Merge branch 'master' of github.com:elegantthemes/helm-charts

elegantthemes · Feb 14, 2022 · 2d7e51b · 2d7e51b
2 parents 4fbfaed + 49d2701
commit 2d7e51b
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 4 deletions.
diff --git a/charts/cloud-screenshot/Chart.yaml b/charts/cloud-screenshot/Chart.yaml
@@ -5,4 +5,4 @@ maintainers:
   - email: dustin@elegantthemes.com
     name: Elegant Themes
 name: cloud-screenshot
-version: 0.9.8
+version: 0.9.15
diff --git a/charts/cloud-screenshot/templates/cloud-screenshot.yml b/charts/cloud-screenshot/templates/cloud-screenshot.yml
@@ -20,7 +20,11 @@ metadata:
   labels:
     app: cloud-screenshot
 spec:
-  replicas: 1
+  replicas: {{ .Values.REPLICAS }}
+  strategy:
+    rollingUpdate:
+      maxSurge: 0
+      maxUnavailable: 1
   selector:
     matchLabels:
       app: cloud-screenshot
@@ -30,6 +34,20 @@ spec:
         app: cloud-screenshot
         redis-cluster-client: 'true'
     spec:
+      affinity:
+        podAntiAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            - labelSelector:
+                matchExpressions:
+                    - key: app
+                      operator: In
+                      values:
+                        - cloud-screenshot
+              topologyKey: kubernetes.io/hostname
+      hostAliases:
+        - ip: '127.0.0.1'
+          hostnames:
+            - 'cloud-screenshot.dc-screenshot.svc.cluster.local'
       initContainers:
         - name: init
           env:
@@ -156,7 +174,7 @@ spec:
               readOnly: true
               subPath: nginx.conf
 
-{{ range $index, $_ := until 10 }}
+{{ range $_, $index := untilStep 1 (int .Values.CLOUD_SCREENSHOT_WORKERS) 1 }}
 {{ include "screenshot.container.worker" (dict "Values" $.Values "index" $index) }}
 {{ end }}
 

diff --git a/charts/cloud-screenshot/values.yaml b/charts/cloud-screenshot/values.yaml
@@ -8,6 +8,7 @@ AUTH_SALT:
 CLOUD_SCREENSHOT_IMAGE:
 CLOUD_SCREENSHOT_REPO_URL:
 CLOUD_SCREENSHOT_VERSION:
+CLOUD_SCREENSHOT_WORKERS:
 
 DB_HOST_0:
 DB_HOST_1:
@@ -26,6 +27,8 @@ LOGGED_IN_SALT:
 NONCE_KEY:
 NONCE_SALT:
 
+REPLICAS:
+
 S3_BUCKET_CLOUD_ITEMS:
 S3_BUCKET_CLOUD_ITEMS_BACKUP_1:
 S3_BUCKET_CLOUD_ITEMS_BACKUP_2:

diff --git a/charts/cloud-server/Chart.yaml b/charts/cloud-server/Chart.yaml
@@ -5,4 +5,4 @@ maintainers:
   - email: dustin@elegantthemes.com
     name: Elegant Themes
 name: cloud-server
-version: 0.9.1
+version: 0.9.2
diff --git a/charts/cloud-server/templates/secrets.yml b/charts/cloud-server/templates/secrets.yml
@@ -13,6 +13,7 @@ stringData:
     AUTH_SALT='{{ .Values.AUTH_SALT }}'
     CLOUD_SERVER_PATH='{{ .Values.INSTALL_PATH }}'
     CLOUD_SERVER_REPO_URL='{{ .Values.CLOUD_SERVER_REPO_URL }}'
+    COOKIE_SALT='{{ .Values.COOKIE_SALT }}'
     DB_HOST_0='{{ .Values.DB_HOST_0 }}'
     DB_HOST_1='{{ .Values.DB_HOST_1 }}'
     DB_HOST_2='{{ .Values.DB_HOST_2 }}'

diff --git a/charts/cloud-server/values.yaml b/charts/cloud-server/values.yaml
@@ -8,6 +8,7 @@ AUTH_SALT:
 CLOUD_SERVER_IMAGE:
 CLOUD_SERVER_REPO_URL:
 CLOUD_SERVER_VERSION:
+COOKIE_SALT:
 
 DB_HOST_0:
 DB_HOST_1: