Merge branch 'dev'

Author: fl0ppy-d1sk

charts/bunkerweb/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.0.0
+version: 1.0.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

charts/bunkerweb/templates/_helpers.tpl

@@ -90,19 +90,23 @@ REDIS settings
 {{- end }}
 {{- if .Values.redis.enabled }}
 - name: REDIS_HOST
+  {{- if .Values.settings.redis.redisHost }}
+  value: "{{ .Values.settings.redis.redisHost }}"
+  {{- else }}
   value: "redis-{{ include "bunkerweb.fullname" . }}"
+  {{- end }}
 - name: REDIS_USERNAME
   value: ""
 - name: REDIS_PASSWORD
-    {{- if not (empty .Values.settings.existingSecret) }}
+  {{- if not (empty .Values.settings.existingSecret) }}
   valueFrom:
     secretKeyRef:
       name: "{{ .Values.settings.existingSecret }}"
       key: redis-password
-    {{- else }}
-  value: "{{ .Values.redis.config.password }}"
-    {{- end }}
   {{- else }}
+  value: "{{ .Values.redis.config.password }}"
+  {{- end }}
+{{- else }}
 - name: REDIS_HOST
   value: "{{ .Values.settings.redis.redisHost }}"
 - name: REDIS_USERNAME
@@ -123,5 +127,5 @@ REDIS settings
     {{- else }}
   value: "{{ .Values.settings.redis.redisPassword }}"
     {{- end }}
-  {{- end }}
+{{- end }}
 {{- end }}

charts/bunkerweb/templates/scheduler-deployment.yaml

@@ -34,14 +34,10 @@ spec:
           securityContext:
             {{- toYaml . | nindent 12}}
           {{- end }}
-          {{- with .Values.bunkerweb.livenessProbe }}
+          {{- with .Values.scheduler.livenessProbe }}
           livenessProbe:
             {{- toYaml . | nindent 12}}
           {{- end }}
-          {{- with .Values.bunkerweb.readinessProbe }}
-          readinessProbe:
-            {{- toYaml . | nindent 12}}
-          {{- end }}
           env:
             # Mandatory for k8s integration
             - name: KUBERNETES_MODE

charts/bunkerweb/values.yaml

@@ -63,7 +63,7 @@ bunkerweb:
   replicas: 1
   repository: bunkerity/bunkerweb
   pullPolicy: Always
-  tag: 1.6.1
+  tag: 1.6.2
   ## RECOMMENDED RESOURCES
   ## If you want to set resources for the bunkerweb, uncomment the following lines and adjust the values as needed.
   # resources:
@@ -104,7 +104,7 @@ bunkerweb:
 scheduler:
   repository: bunkerity/bunkerweb-scheduler
   pullPolicy: Always
-  tag: 1.6.1
+  tag: 1.6.2
   ## RECOMMENDED RESOURCES
   ## If you want to set resources for the Scheduler, uncomment the following lines and adjust the values as needed.
   # resources:
@@ -125,22 +125,14 @@ scheduler:
         - ALL
   extraEnvs: []
   # Probes
-  # livenessProbe:
-  #   exec:
-  #     command:
-  #       - /usr/share/bunkerweb/helpers/healthcheck-scheduler.sh
-  #   initialDelaySeconds: 30
-  #   periodSeconds: 5
-  #   timeoutSeconds: 1
-  #   failureThreshold: 3
-  # readinessProbe:
-  #   exec:
-  #     command:
-  #       - /usr/share/bunkerweb/helpers/healthcheck-scheduler.sh
-  #   initialDelaySeconds: 30
-  #   periodSeconds: 1
-  #   timeoutSeconds: 1
-  #   failureThreshold: 3
+  livenessProbe:
+    exec:
+      command:
+        - /usr/share/bunkerweb/helpers/healthcheck-scheduler.sh
+    initialDelaySeconds: 30
+    periodSeconds: 5
+    timeoutSeconds: 1
+    failureThreshold: 3
   # PRO Features only
   proLicenseKey: ""
   usePrometheusExporter: false
@@ -150,7 +142,7 @@ controller:
   enabled: true
   repository: bunkerity/bunkerweb-autoconf
   pullPolicy: Always
-  tag: 1.6.1
+  tag: 1.6.2
   ## RECOMMENDED RESOURCES
   ## If you want to set resources for the Controller, uncomment the following lines and adjust the values as needed.
   # resources:
@@ -192,7 +184,7 @@ ui:
   enabled: true
   repository: bunkerity/bunkerweb-ui
   pullPolicy: Always
-  tag: 1.6.1
+  tag: 1.6.2
   ## RECOMMENDED RESOURCES
   ## If you want to set resources for the UI, uncomment the following lines and adjust the values as needed.
   # resources: