From c1cfd1ee5bc3dd90799a626d2cf2a67860f4c8a4 Mon Sep 17 00:00:00 2001 From: Valentin T <389922+AngryDeveloper@users.noreply.github.com> Date: Mon, 9 Mar 2020 12:19:46 -0400 Subject: [PATCH 1/7] Allow mounting of NFS volumes instead of using st2packs for pack management --- CHANGELOG.md | 1 + templates/_helpers.tpl | 18 +++++++++++++ templates/deployments.yaml | 54 ++++++++++++++++++-------------------- templates/jobs.yaml | 3 ++- values.yaml | 12 +++++++++ 5 files changed, 58 insertions(+), 30 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b97af99a..c93ff15f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ * Change ingress name from `-ingress` to -st2web-ingress, useful when using `stackstorm-ha` as a requirement for another chart. (#112) (by @erenatas) * Fix st2web ingress which should have been defined as an Integer instead of a String (#111) (by @erenatas) * Add an option to inject hostAliases in the st2actionrunner containers (#114) +* Add an option to mount NFS volumes instead of using the `st2packs` image (#18) (by @AngryDevelopper) ## v0.24.0 * Fix st2web ingress to use `/` path by default instead of `/*`, useful for nginx ingress controller (#103) (by @erenatas) diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl index 8ade21f0..8f4a4bef 100644 --- a/templates/_helpers.tpl +++ b/templates/_helpers.tpl @@ -57,3 +57,21 @@ stackstorm {{ $mongo_fullname }}-{{ $index0 }}.{{ $mongo_fullname }}{{ if ne $index1 $replicas }},{{ end }} {{- end -}} {{- end -}} + +{{- define "packs-volumes" -}} +{{- if .Values.st2.packs.image.repository }} +- name: st2-packs-vol + emptyDir: {} +- name: st2-virtualenvs-vol + emptyDir: {} +{{- else if .Values.st2.packs.nfs.server }} +- name: st2-packs-vol + nfs: + server: {{ .Values.st2.packs.nfs.server }} + path: {{ .Values.st2.packs.nfs.packsPath }} +- name: st2-virtualenvs-vol + nfs: + server: {{ .Values.st2.packs.nfs.server }} + path: {{ .Values.st2.packs.nfs.virtualenvsPath }} +{{- end }} +{{- end -}} diff --git a/templates/deployments.yaml b/templates/deployments.yaml index 4afbe21c..15cad6a3 100644 --- a/templates/deployments.yaml +++ b/templates/deployments.yaml @@ -201,13 +201,17 @@ spec: - name: st2-config-vol mountPath: /etc/st2/st2.user.conf subPath: st2.user.conf - {{- if .Values.st2.packs.image.repository }} + {{- if (.Values.st2.packs.image.repository) or (.Values.st2.packs.nfs.server) }} - name: st2-packs-vol mountPath: /opt/stackstorm/packs + {{- if .Values.st2.packs.image.repository }} readOnly: true + {{- end }} - name: st2-virtualenvs-vol mountPath: /opt/stackstorm/virtualenvs + {{- if .Values.st2.packs.image.repository }} readOnly: true + {{- end }} {{- end }} resources: {{ toYaml .Values.st2api.resources | indent 10 }} @@ -215,12 +219,7 @@ spec: - name: st2-config-vol configMap: name: {{ .Release.Name }}-st2-config - {{- if .Values.st2.packs.image.repository }} - - name: st2-packs-vol - emptyDir: {} - - name: st2-virtualenvs-vol - emptyDir: {} - {{- end }} + {{- include "packs-volumes" . | indent 8 }} {{- with .Values.st2api.nodeSelector }} nodeSelector: {{ toYaml . | indent 8 }} @@ -876,13 +875,17 @@ spec: - name: st2-config-vol mountPath: /etc/st2/st2.user.conf subPath: st2.user.conf - {{- if $.Values.st2.packs.image.repository }} + {{- if ($.Values.st2.packs.image.repository) or ($.Values.st2.packs.nfs.server) }} - name: st2-packs-vol mountPath: /opt/stackstorm/packs + {{- if $.Values.st2.packs.image.repository }} readOnly: true + {{- end }} - name: st2-virtualenvs-vol mountPath: /opt/stackstorm/virtualenvs + {{- if $.Values.st2.packs.image.repository }} readOnly: true + {{- end }} {{- end }} resources: {{ toYaml .resources | indent 10 }} @@ -890,13 +893,8 @@ spec: - name: st2-config-vol configMap: name: {{ $.Release.Name }}-st2-config - {{- if $.Values.st2.packs.image.repository }} - - name: st2-packs-vol - emptyDir: {} - - name: st2-virtualenvs-vol - emptyDir: {} - {{- end }} - {{- with .nodeSelector }} + {{- include "packs-volumes" $ | indent 8}} + {{- with .nodeSelector }} nodeSelector: {{ toYaml . | indent 8 }} {{- end }} @@ -1010,13 +1008,17 @@ spec: - name: st2-ssh-key-vol mountPath: /home/stanley/.ssh/ readOnly: true - {{- if .Values.st2.packs.image.repository }} + {{- if (.Values.st2.packs.image.repository) or (.Values.st2.packs.nfs.server) }} - name: st2-packs-vol mountPath: /opt/stackstorm/packs + {{- if .Values.st2.packs.image.repository }} readOnly: true + {{- end }} - name: st2-virtualenvs-vol mountPath: /opt/stackstorm/virtualenvs + {{- if .Values.st2.packs.image.repository }} readOnly: true + {{- end }} {{- end }} resources: {{ toYaml .Values.st2actionrunner.resources | indent 10 }} @@ -1032,12 +1034,7 @@ spec: path: stanley_rsa # 0400 file permission mode: 256 - {{- if .Values.st2.packs.image.repository }} - - name: st2-packs-vol - emptyDir: {} - - name: st2-virtualenvs-vol - emptyDir: {} - {{- end }} + {{- include "packs-volumes" . | indent 8 }} {{- with .Values.st2actionrunner.nodeSelector }} nodeSelector: {{ toYaml . | indent 8 }} @@ -1267,13 +1264,17 @@ spec: - name: st2-ssh-key-vol mountPath: /home/stanley/.ssh/ readOnly: true - {{- if .Values.st2.packs.image.repository }} + {{- if (.Values.st2.packs.image.repository) or (.Values.st2.packs.nfs.server) }} - name: st2-packs-vol mountPath: /opt/stackstorm/packs + {{- if .Values.st2.packs.image.repository }} readOnly: true + {{- end }} - name: st2-virtualenvs-vol mountPath: /opt/stackstorm/virtualenvs + {{- if .Values.st2.packs.image.repository }} readOnly: true + {{- end }} {{- end }} command: - 'bash' @@ -1312,12 +1313,7 @@ spec: path: stanley_rsa # 0400 file permission mode: 256 - {{- if .Values.st2.packs.image.repository }} - - name: st2-packs-vol - emptyDir: {} - - name: st2-virtualenvs-vol - emptyDir: {} - {{- end }} + {{- include "packs-volumes" . | indent 8 }} {{ if .Values.st2chatops.enabled -}} --- diff --git a/templates/jobs.yaml b/templates/jobs.yaml index 695a7b12..46340137 100644 --- a/templates/jobs.yaml +++ b/templates/jobs.yaml @@ -282,7 +282,7 @@ spec: secret: secretName: {{ .Release.Name }}-st2-kv restartPolicy: OnFailure - +{{- if .Values.st2.packs.image.repository }} --- apiVersion: batch/v1 kind: Job @@ -398,3 +398,4 @@ spec: emptyDir: {} {{- end }} restartPolicy: OnFailure +{{- end }} diff --git a/values.yaml b/values.yaml index 371ef200..f9e0f508 100644 --- a/values.yaml +++ b/values.yaml @@ -86,6 +86,18 @@ st2: # Optional name of the imagePullSecret if your custom packs image is hosted by a private Docker registry behind the auth #pullSecret: st2packs-auth + # Custom packs and virtualenvs can be mounted using NFS. + # Disclaimer: if you chose to use an NFS mount, be advised that the responsibility of installing and registering the + # packs is deferred to you. + # If both st2.packs.image.repository and st2.packs.nfs.server are set, the st2packs image will be used + nfs: + # Uncommend the following block to enabled NFS mounting of the packs + #server: 0.0.0.0 + # Required. This should point to a directory containing all the packs folders + virtualenvsPath: /var/nfsshare/packs + # Required. This should point to an empty directoy, or a directory containing pre built venvs for the packs + packsPath: /var/nfsshare/virtualenvs + # https://docs.stackstorm.com/reference/ha.html#st2sensorcontainer # It is possible to run st2sensorcontainer in HA mode by running one process on each compute instance. # Each sensor node needs to be provided with proper partition information to share work with other sensor From e9bd1bf5f34727cea83ded2955603777ddfa349d Mon Sep 17 00:00:00 2001 From: Valentin T <389922+AngryDeveloper@users.noreply.github.com> Date: Mon, 9 Mar 2020 16:04:05 -0400 Subject: [PATCH 2/7] reenabled registercontent job --- templates/jobs.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/templates/jobs.yaml b/templates/jobs.yaml index 46340137..63a38540 100644 --- a/templates/jobs.yaml +++ b/templates/jobs.yaml @@ -282,7 +282,6 @@ spec: secret: secretName: {{ .Release.Name }}-st2-kv restartPolicy: OnFailure -{{- if .Values.st2.packs.image.repository }} --- apiVersion: batch/v1 kind: Job @@ -398,4 +397,3 @@ spec: emptyDir: {} {{- end }} restartPolicy: OnFailure -{{- end }} From 9195a793fe7807e871d6e65d5a34db7c14015d3a Mon Sep 17 00:00:00 2001 From: Valentin T <389922+AngryDeveloper@users.noreply.github.com> Date: Wed, 11 Mar 2020 11:33:06 -0400 Subject: [PATCH 3/7] more obvious volume mounting conditions --- templates/deployments.yaml | 44 +++++++++++++++++++++----------------- templates/jobs.yaml | 22 ++++++++++--------- values.yaml | 4 ++-- 3 files changed, 38 insertions(+), 32 deletions(-) diff --git a/templates/deployments.yaml b/templates/deployments.yaml index 15cad6a3..f595bfc0 100644 --- a/templates/deployments.yaml +++ b/templates/deployments.yaml @@ -201,17 +201,18 @@ spec: - name: st2-config-vol mountPath: /etc/st2/st2.user.conf subPath: st2.user.conf - {{- if (.Values.st2.packs.image.repository) or (.Values.st2.packs.nfs.server) }} + {{- if .Values.st2.packs.image.repository }} - name: st2-packs-vol mountPath: /opt/stackstorm/packs - {{- if .Values.st2.packs.image.repository }} readOnly: true - {{- end }} - name: st2-virtualenvs-vol mountPath: /opt/stackstorm/virtualenvs - {{- if .Values.st2.packs.image.repository }} readOnly: true - {{- end }} + {{- else if .Values.st2.packs.nfs.server }} + - name: st2-packs-vol + mountPath: /opt/stackstorm/packs + - name: st2-virtualenvs-vol + mountPath: /opt/stackstorm/virtualenvs {{- end }} resources: {{ toYaml .Values.st2api.resources | indent 10 }} @@ -875,17 +876,18 @@ spec: - name: st2-config-vol mountPath: /etc/st2/st2.user.conf subPath: st2.user.conf - {{- if ($.Values.st2.packs.image.repository) or ($.Values.st2.packs.nfs.server) }} + {{- if $.Values.st2.packs.image.repository }} - name: st2-packs-vol mountPath: /opt/stackstorm/packs - {{- if $.Values.st2.packs.image.repository }} readOnly: true - {{- end }} - name: st2-virtualenvs-vol mountPath: /opt/stackstorm/virtualenvs - {{- if $.Values.st2.packs.image.repository }} readOnly: true - {{- end }} + {{- else if $.Values.st2.packs.nfs.server }} + - name: st2-packs-vol + mountPath: /opt/stackstorm/packs + - name: st2-virtualenvs-vol + mountPath: /opt/stackstorm/virtualenvs {{- end }} resources: {{ toYaml .resources | indent 10 }} @@ -1008,17 +1010,18 @@ spec: - name: st2-ssh-key-vol mountPath: /home/stanley/.ssh/ readOnly: true - {{- if (.Values.st2.packs.image.repository) or (.Values.st2.packs.nfs.server) }} + {{- if .Values.st2.packs.image.repository }} - name: st2-packs-vol mountPath: /opt/stackstorm/packs - {{- if .Values.st2.packs.image.repository }} readOnly: true - {{- end }} - name: st2-virtualenvs-vol mountPath: /opt/stackstorm/virtualenvs - {{- if .Values.st2.packs.image.repository }} readOnly: true - {{- end }} + {{- else if .Values.st2.packs.nfs.server }} + - name: st2-packs-vol + mountPath: /opt/stackstorm/packs + - name: st2-virtualenvs-vol + mountPath: /opt/stackstorm/virtualenvs {{- end }} resources: {{ toYaml .Values.st2actionrunner.resources | indent 10 }} @@ -1264,17 +1267,18 @@ spec: - name: st2-ssh-key-vol mountPath: /home/stanley/.ssh/ readOnly: true - {{- if (.Values.st2.packs.image.repository) or (.Values.st2.packs.nfs.server) }} + {{- if .Values.st2.packs.image.repository }} - name: st2-packs-vol mountPath: /opt/stackstorm/packs - {{- if .Values.st2.packs.image.repository }} readOnly: true - {{- end }} - name: st2-virtualenvs-vol mountPath: /opt/stackstorm/virtualenvs - {{- if .Values.st2.packs.image.repository }} readOnly: true - {{- end }} + {{- else if .Values.st2.packs.nfs.server }} + - name: st2-packs-vol + mountPath: /opt/stackstorm/packs + - name: st2-virtualenvs-vol + mountPath: /opt/stackstorm/virtualenvs {{- end }} command: - 'bash' diff --git a/templates/jobs.yaml b/templates/jobs.yaml index 63a38540..69fbb173 100644 --- a/templates/jobs.yaml +++ b/templates/jobs.yaml @@ -323,8 +323,8 @@ spec: {{- if .Values.st2.packs.image.pullSecret }} - name: {{ .Values.st2.packs.image.pullSecret }} {{- end }} - {{- if .Values.st2.packs.image.repository }} initContainers: + {{- if .Values.st2.packs.image.repository }} # Merge packs and virtualenvs from st2actionrunner with those from the st2.packs image # Custom packs - name: st2-custom-packs @@ -341,6 +341,7 @@ spec: - | /bin/cp -aR /opt/stackstorm/packs/. /opt/stackstorm/packs-shared && /bin/cp -aR /opt/stackstorm/virtualenvs/. /opt/stackstorm/virtualenvs-shared + {{ end }} # System packs - name: st2-system-packs image: "{{ template "imageRepository" . }}/st2actionrunner{{ template "enterpriseSuffix" . }}:{{ .Chart.AppVersion }}" @@ -354,7 +355,6 @@ spec: - | /bin/cp -aR /opt/stackstorm/packs/. /opt/stackstorm/packs-shared && /bin/cp -aR /opt/stackstorm/virtualenvs/. /opt/stackstorm/virtualenvs-shared - {{ end }} containers: - name: st2-register-content image: "{{ template "imageRepository" . }}/st2actionrunner{{ template "enterpriseSuffix" . }}:{{ .Chart.AppVersion }}" @@ -377,9 +377,16 @@ spec: mountPath: /opt/stackstorm/configs/ {{- if .Values.st2.packs.image.repository }} - name: st2-packs-vol - mountPath: /opt/stackstorm/packs/ + mountPath: /opt/stackstorm/packs + readOnly: true + - name: st2-virtualenvs-vol + mountPath: /opt/stackstorm/virtualenvs + readOnly: true + {{- else if .Values.st2.packs.nfs.server }} + - name: st2-packs-vol + mountPath: /opt/stackstorm/packs - name: st2-virtualenvs-vol - mountPath: /opt/stackstorm/virtualenvs/ + mountPath: /opt/stackstorm/virtualenvs {{- end }} # TODO: Find out default resource limits for this specific service (#5) #resources: @@ -390,10 +397,5 @@ spec: - name: st2-pack-configs-vol configMap: name: {{ .Release.Name }}-st2-pack-configs - {{- if .Values.st2.packs.image.repository }} - - name: st2-packs-vol - emptyDir: {} - - name: st2-virtualenvs-vol - emptyDir: {} - {{- end }} + {{- include "packs-volumes" . | indent 8 }} restartPolicy: OnFailure diff --git a/values.yaml b/values.yaml index f9e0f508..67c380a4 100644 --- a/values.yaml +++ b/values.yaml @@ -94,9 +94,9 @@ st2: # Uncommend the following block to enabled NFS mounting of the packs #server: 0.0.0.0 # Required. This should point to a directory containing all the packs folders - virtualenvsPath: /var/nfsshare/packs + virtualenvsPath: /var/nfsshare/virtualenvs # Required. This should point to an empty directoy, or a directory containing pre built venvs for the packs - packsPath: /var/nfsshare/virtualenvs + packsPath: /var/nfsshare/packs # https://docs.stackstorm.com/reference/ha.html#st2sensorcontainer # It is possible to run st2sensorcontainer in HA mode by running one process on each compute instance. From 2c44aef9dc181286b14a6b10ea9e54b9bec576a2 Mon Sep 17 00:00:00 2001 From: Valentin T <389922+AngryDeveloper@users.noreply.github.com> Date: Wed, 11 Mar 2020 14:34:15 -0400 Subject: [PATCH 4/7] exec system packs install only if a packs volume is mounted --- templates/jobs.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/jobs.yaml b/templates/jobs.yaml index 69fbb173..8bf54165 100644 --- a/templates/jobs.yaml +++ b/templates/jobs.yaml @@ -342,6 +342,7 @@ spec: /bin/cp -aR /opt/stackstorm/packs/. /opt/stackstorm/packs-shared && /bin/cp -aR /opt/stackstorm/virtualenvs/. /opt/stackstorm/virtualenvs-shared {{ end }} + {{- if (.Values.st2.packs.image.repository) or (.Values.st2.packs.nfs.server) }} # System packs - name: st2-system-packs image: "{{ template "imageRepository" . }}/st2actionrunner{{ template "enterpriseSuffix" . }}:{{ .Chart.AppVersion }}" @@ -355,6 +356,7 @@ spec: - | /bin/cp -aR /opt/stackstorm/packs/. /opt/stackstorm/packs-shared && /bin/cp -aR /opt/stackstorm/virtualenvs/. /opt/stackstorm/virtualenvs-shared + {{ end }} containers: - name: st2-register-content image: "{{ template "imageRepository" . }}/st2actionrunner{{ template "enterpriseSuffix" . }}:{{ .Chart.AppVersion }}" From 03e2c3a32dafd682650507e7ea95e2b8cda6f023 Mon Sep 17 00:00:00 2001 From: Valentin T <389922+AngryDeveloper@users.noreply.github.com> Date: Wed, 11 Mar 2020 14:59:59 -0400 Subject: [PATCH 5/7] added nfs packs mounting documentation --- README.md | 59 +++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 46 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index b6adab45..013a9dd2 100644 --- a/README.md +++ b/README.md @@ -191,14 +191,57 @@ StackStorm employs etcd as a distributed coordination backend, required for st2 As any other Helm dependency, it's possible to further configure it for specific scaling needs via `values.yaml`. ## Install custom st2 packs in the cluster -In distributed environment of the Kubernetes cluster `st2 pack install` won’t work. -Instead, you need to bake the packs into a custom docker image, push it to a private or public docker registry and reference that image in Helm values. +There are two ways of installing packs in the cluster. Using a dedicated packs image or using NFS volumes. + +### Using a docker image +You need to bake the packs into a custom docker image, push it to a private or public docker registry and reference that image in Helm values. Helm chart will take it from there, sharing `/opt/stackstorm/{packs,virtualenvs}` via a sidecar container in pods which require access to the packs. +In this mode the packs and virtualenvs volume are mounted read only, so `st2 pack install` won't work -### Building st2packs image +#### Building st2packs image For your convenience, we created a new `st2-pack-install ` utility and included it in a container that will help to install custom packs during the Docker build process without relying on live DB and MQ connection. Please see https://github.com/StackStorm/st2packs-dockerfiles/ for instructions on how to build your custom `st2packs` image. +#### Pull st2packs from a private Docker registry +If you need to pull your custom packs Docker image from a private repository, create a Kubernetes Docker registry secret and pass it to Helm values. +See [K8s documentation](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/) for more info. +``` +# Create a Docker registry secret called 'st2packs-auth' +kubectl create secret docker-registry st2packs-auth --docker-server= --docker-username= --docker-password= +``` +Once secret created, reference its name in helm value: `st2.packs.image.pullSecret`. + +### Using an NFS mount +You can also mount an NFS export inside the cluster, using the provided `st2.packs.nfs.*` configurations variables. +A very simple example would be to create two exports as follow on your NFS server: +```shell script +$ cat /etc/exports +/var/nfsshare/packs *(rw,sync,no_root_squash,no_all_squash) +/var/nfsshare/virtualenvs *(rw,sync,no_root_squash,no_all_squash) +``` + +Then setup stackstorm-ha to mount those exports: +```yaml +st2: + packs: + nfs: YOUR_NFS_SERVER_ADDRESS + virtualenvsPath: /var/nfsshare/virtualenvs + packsPath: /var/nfsshare/packs +``` +You can now either copy your custom packs directly inside the exported `/var/nfsshare/packs` directory, or use stackstorm's +API to install packs from Stackstorm Exchange + +#### NFS caveats +Manually copied packs are not automatically registered nor installed, you'll need to trigger the process through the st2's API using +the following endpoints: [install](https://api.stackstorm.com/api/v1/packs/#/packs_controller.install.post), +[registration](https://api.stackstorm.com/api/v1/packs/#/packs_controller.register.post) + +You will have to repeat the process each time the packs code is modified. + +On first provisionning of the Stackstorm deployment, the system packs will be copied and registered. + + + ### How to provide custom pack configs Update the `st2.packs.configs` section of Helm values: @@ -215,16 +258,6 @@ For example: ``` Don't forget running Helm upgrade to apply new changes. -### Pull st2packs from a private Docker registry -If you need to pull your custom packs Docker image from a private repository, create a Kubernetes Docker registry secret and pass it to Helm values. -See [K8s documentation](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/) for more info. -``` -# Create a Docker registry secret called 'st2packs-auth' -kubectl create secret docker-registry st2packs-auth --docker-server= --docker-username= --docker-password= -``` -Once secret created, reference its name in helm value: `st2.packs.image.pullSecret`. - - ## Tips & Tricks Grab all logs for entire StackStorm cluster with dependent services in Helm release: ``` From 1e2b6ad4cf9b399220a9e949bd79813d806f0f45 Mon Sep 17 00:00:00 2001 From: Valentin T <389922+AngryDeveloper@users.noreply.github.com> Date: Thu, 12 Mar 2020 11:10:47 -0400 Subject: [PATCH 6/7] Update CHANGELOG.md Co-Authored-By: Eugen C. --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c93ff15f..4c92ec79 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ * Change ingress name from `-ingress` to -st2web-ingress, useful when using `stackstorm-ha` as a requirement for another chart. (#112) (by @erenatas) * Fix st2web ingress which should have been defined as an Integer instead of a String (#111) (by @erenatas) * Add an option to inject hostAliases in the st2actionrunner containers (#114) -* Add an option to mount NFS volumes instead of using the `st2packs` image (#18) (by @AngryDevelopper) +* Add an option to mount NFS volumes instead of using the `st2packs` image (#118) (by @AngryDevelopper) ## v0.24.0 * Fix st2web ingress to use `/` path by default instead of `/*`, useful for nginx ingress controller (#103) (by @erenatas) From fed07271da02b647ef25b0b9e5094939fe3916fb Mon Sep 17 00:00:00 2001 From: Valentin T <389922+AngryDeveloper@users.noreply.github.com> Date: Fri, 27 Mar 2020 15:51:01 -0400 Subject: [PATCH 7/7] always install system packs --- templates/jobs.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/templates/jobs.yaml b/templates/jobs.yaml index 8bf54165..69fbb173 100644 --- a/templates/jobs.yaml +++ b/templates/jobs.yaml @@ -342,7 +342,6 @@ spec: /bin/cp -aR /opt/stackstorm/packs/. /opt/stackstorm/packs-shared && /bin/cp -aR /opt/stackstorm/virtualenvs/. /opt/stackstorm/virtualenvs-shared {{ end }} - {{- if (.Values.st2.packs.image.repository) or (.Values.st2.packs.nfs.server) }} # System packs - name: st2-system-packs image: "{{ template "imageRepository" . }}/st2actionrunner{{ template "enterpriseSuffix" . }}:{{ .Chart.AppVersion }}" @@ -356,7 +355,6 @@ spec: - | /bin/cp -aR /opt/stackstorm/packs/. /opt/stackstorm/packs-shared && /bin/cp -aR /opt/stackstorm/virtualenvs/. /opt/stackstorm/virtualenvs-shared - {{ end }} containers: - name: st2-register-content image: "{{ template "imageRepository" . }}/st2actionrunner{{ template "enterpriseSuffix" . }}:{{ .Chart.AppVersion }}"