allow using st2.packs.volumes with st2.packs.images

Author: cognifloyd

templates/deployments.yaml

@@ -3,9 +3,6 @@
 {{- fail "Value st2.packs.image was renamed to st2.packs.images and is now a list of images" }}
 {{- end }}
 {{- if .Values.st2.packs.volumes.enabled }}
-  {{- if .Values.st2.packs.images }}
-{{- fail "st2.packs.images is not compatible with st2.packs.volumes.enabled. Please use only one method for setting up packs directories." }}
-  {{- end }}
   {{- if not (and .Values.st2.packs.volumes.packs .Values.st2.packs.volumes.virtualenvs) }}
 {{- fail "Volume definition(s) missing! When st2.packs.volumes.enabled, you must define volumes for both packs and virtualenvs." }}
   {{- end }}
@@ -186,7 +183,7 @@ spec:
       initContainers:
       {{- include "init-containers-wait-for-db" . | nindent 6 }}
       {{- include "init-containers-wait-for-mq" . | nindent 6 }}
-      {{- if .Values.st2.packs.images }}
+      {{- if and .Values.st2.packs.images (not .Values.st2.packs.volumes.enabled) }}
         {{- include "packs-initContainers" . | nindent 6 }}
       {{- end }}
       containers:
@@ -1039,7 +1036,7 @@ spec:
       initContainers:
       {{- include "init-containers-wait-for-db" $ | nindent 6 }}
       {{- include "init-containers-wait-for-mq" $ | nindent 6 }}
-      {{- if $.Values.st2.packs.images }}
+      {{- if and $.Values.st2.packs.images (not $.Values.st2.packs.volumes.enabled) }}
         {{- include "packs-initContainers" $ | nindent 6 }}
       {{- end }}
       containers:
@@ -1177,7 +1174,7 @@ spec:
       initContainers:
       {{- include "init-containers-wait-for-db" . | nindent 6 }}
       {{- include "init-containers-wait-for-mq" . | nindent 6 }}
-      {{- if .Values.st2.packs.images }}
+      {{- if and .Values.st2.packs.images (not .Values.st2.packs.volumes.enabled) }}
         {{- include "packs-initContainers" . | nindent 6 }}
       {{- end }}
       containers:
@@ -1399,7 +1396,7 @@ spec:
       - name: {{ .Values.image.pullSecret }}
       {{- end }}
       initContainers:
-      {{- if .Values.st2.packs.images }}
+      {{- if and .Values.st2.packs.images (not .Values.st2.packs.volumes.enabled) }}
         {{- include "packs-initContainers" . | nindent 6 }}
       {{- end }}
       # Sidecar container for generating st2client config with st2 username & password pair and sharing produced file with the main container

values.yaml

@@ -92,8 +92,6 @@ st2:
     # For each given st2packs container you can define repository, name, tag and pullPolicy for this image below.
     # Multiple pack images can help when dealing with frequent updates by only rebuilding smaller images for desired packs
     # E.g. having all desired StackStorm-Exchange packs in one image and several custom packs in additional images
-    #
-    # This must be empty if st2.packs.volumes is enabled.
     images: []
       #- repository: index.docker.io/stackstorm
       #  name: st2packs
@@ -104,15 +102,14 @@ st2:
 
     # Custom packs volumes definitions.
     #
-    # Use this instead of st2.packs.images to have StackStorm use persistent/shared/writable storage configured
-    # previously in your cluster. The choice of storage solution is cluster-dependent (it changes besed on where the
-    # cluster is hosted and which storage solutions are available in your cluster).
+    # Use this to have StackStorm use persistent/shared/writable storage configured previously in your cluster.
+    # The choice of storage solution is cluster-dependent (it changes besed on where the cluster is hosted
+    # and which storage solutions are available in your cluster).
     #
     # To use this, set enabled to true, and add cluster-specific volume definitions for at least packs and virtualenvs below.
     # Please consult the documentation for your cluster's storage solution.
     # Some generic examples are listed under st2.packs.volumes.packs below.
     volumes:
-      # to enable st2.packs.volumes, st2.packs.images must not be empty
       enabled: false
 
       packs: {}