fix conflict in Changelog

Author: guzzijones

CHANGELOG.md

@@ -8,6 +8,8 @@
 * Add `st2canary` job as a Helm Hook that runs before install/upgrade to ensure `st2.packs.volumes` is configured correctly (if `st2.packs.volumes.enabled`). (#323) (by @cognifloyd)
 * Enable using existing `st2-auth` secret. This allows users to manage this secret outside of the Helm process. (#359) (by @bmarick)
 * Add terminationGracePeriodSeconds to workflow and actionrunner pods to allow adjustment of grace period in k8 (#374) (by @guzzijones12)
+* Prevent duplicate init containers on helm upgrade (#375) (by @guzzijones12)
+* Fix st2 client config issue affecting addon jobs using jobs.extra_hooks (#370) (by @cars)
 
 ## v0.110.0
 * Switch st2 to `v3.8` as a new default stable version (#347)

README.md

@@ -250,10 +250,10 @@ For example, to use persistentVolumeClaims:
     enabled: true
     packs:
       persistentVolumeClaim:
-        claim-name: pvc-st2-packs
+        claimName: pvc-st2-packs
     virtualenvs:
       persistentVolumeClaim:
-        claim-name: pvc-st2-virtualenvs
+        claimName: pvc-st2-virtualenvs
 ```
 
 Or, for example, to use NFS:
@@ -286,7 +286,7 @@ For example, to use persistentVolumeClaims:
     ... # define packs and virtualenvs volumes as shown above
     configs:
       persistentVolumeClaim:
-        claim-name: pvc-st2-pack-configs
+        claimName: pvc-st2-pack-configs
 ```
 
 Or, for example, to use NFS:

templates/_helpers.tpl

@@ -330,7 +330,7 @@ Merge packs and virtualenvs from st2 with those from st2packs images
 {{- define "stackstorm-ha.packs-initContainers" -}}
   {{- if $.Values.st2.packs.images }}
     {{- range $.Values.st2.packs.images }}
-- name: 'st2-custom-pack-{{ printf "%s-%s-%s" .repository .name .tag | sha1sum }}'
+- name: 'st2-custom-pack-{{ printf "%s-%s" .repository .name | sha1sum }}'
   image: "{{ .repository }}/{{ .name }}:{{ .tag }}"
   imagePullPolicy: {{ .pullPolicy | quote }}
   volumeMounts:

templates/jobs.yaml

@@ -661,7 +661,6 @@ spec:
           - '-ec'
           - |
             cat <<EOT > /root/.st2/config
-            [credentials]
             {{- tpl $.Values.jobs.st2clientConfig $ | nindent 12 }}
             EOT
       containers:

values.yaml

@@ -174,7 +174,7 @@ st2:
 
         # example using persistentVolumeClaim:
         #persistentVolumeClaim:
-        #  claim-name: pvc-st2-packs
+        #  claimName: pvc-st2-packs
 
         # example using NFS:
         #nfs: