Forward merge release/kubernetes-agent/v1 (#361)

OctopusDeploy · Dec 17, 2024 · b7d8fe8 · b7d8fe8
2 parents 2cc0682 + bb63d4b
commit b7d8fe8
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 10 deletions.
diff --git a/.changeset/famous-seals-serve.md b/.changeset/famous-seals-serve.md
@@ -0,0 +1,5 @@
+---
+"kubernetes-agent": patch
+---
+
+Forward merge from release/kubernetes-agent/v1 version `1.19.2`. Includes all changes in `1.19.2`
diff --git a/.github/workflows/kubernetes-agent-publish-chart.yaml b/.github/workflows/kubernetes-agent-publish-chart.yaml
@@ -106,7 +106,7 @@ jobs:
     - name: Package Chart
       run: helm package './charts/kubernetes-agent' --version '${{ steps.version.outputs.CHART_VERSION }}'
 
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       name: Upload packaged chart
       with:
         name: '${{ steps.version.outputs.PACKAGE_NAME }}'
@@ -122,7 +122,7 @@ jobs:
       id-token: write # This is required to obtain an ID token from GitHub Actions for the job
     steps:
     - name: Download packaged chart
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: '${{ needs.version_and_package.outputs.PACKAGE_NAME }}'
 

diff --git a/charts/kubernetes-agent/CHANGELOG.md b/charts/kubernetes-agent/CHANGELOG.md
@@ -143,6 +143,12 @@ Version 2 has breaking changes and upgrading from Version 1 requires manual migr
 
 - 05fa04c: Creating Kubernetes Agent v2 alpha prerelease
 
+## 1.19.2
+
+### Patch Changes
+
+- 897f59b: Fix scriptPods.image.pullPolicy not working
+
 ## 1.19.1
 
 ### Patch Changes

diff --git a/charts/kubernetes-agent/templates/_helpers.tpl b/charts/kubernetes-agent/templates/_helpers.tpl
@@ -160,15 +160,15 @@ The Env-var block required to set image name, tag and pullpolicy
 {{- define "kubernetes-agent.scriptPodEnvVars" -}}
 {{- if .repository }}
 - name: "OCTOPUS__K8STENTACLE__SCRIPTPODIMAGE"
-  value: {{ .repository | quote}}
+  value: {{ .repository | quote }}
 {{- end }}
 {{- if .tag }}
 - name: "OCTOPUS__K8STENTACLE__SCRIPTPODIMAGETAG"
-  value: {{ .tag | quote}}
+  value: {{ .tag | quote }}
 {{- end }}
 {{- if .pullPolicy }}
-- name: "OCTOPUS__K8STENTACLE__SCRIPTPODIMAGEPULLPOLICY"
-  value: {{ .pullPolicy | quote}}
+- name: "OCTOPUS__K8STENTACLE__SCRIPTPODPULLPOLICY"
+  value: {{ .pullPolicy | quote }}
 {{- end }}
 {{- end }}
 

diff --git a/charts/kubernetes-agent/templates/tentacle-deployment.yaml b/charts/kubernetes-agent/templates/tentacle-deployment.yaml
@@ -88,7 +88,7 @@ spec:
             - name: "OCTOPUS__K8STENTACLE__PODSERVICEACCOUNTNAME"
               value: {{ include "kubernetes-agent.scriptPodServiceAccountName" . | quote }}
             - name: "OCTOPUS__K8STENTACLE__PODVOLUMECLAIMNAME"
-              value: {{ (include "kubernetes-agent.pvcName" .)  | quote}}
+              value: {{ (include "kubernetes-agent.pvcName" .)  | quote }}
             - name: "OCTOPUS__K8STENTACLE__HELMRELEASENAME"
               value: {{ .Release.Name | quote}}
             - name: "OCTOPUS__K8STENTACLE__HELMCHARTVERSION"

diff --git a/charts/kubernetes-agent/tests/tentacle-deployment-container-env-vars_test.yaml b/charts/kubernetes-agent/tests/tentacle-deployment-container-env-vars_test.yaml
@@ -407,7 +407,7 @@ tests:
         path: spec.template.spec.containers[0].env[?(@.name == 'OCTOPUS__K8STENTACLE__SCRIPTPODIMAGETAG')].value
         value: "1.0.0-deploymentTarget"
     - equal:
-        path: spec.template.spec.containers[0].env[?(@.name == 'OCTOPUS__K8STENTACLE__SCRIPTPODIMAGEPULLPOLICY')].value
+        path: spec.template.spec.containers[0].env[?(@.name == 'OCTOPUS__K8STENTACLE__SCRIPTPODPULLPOLICY')].value
         value: "Always"
 
 - it: "Sets Image Pod from Worker Values if Worker is enabled"
@@ -430,7 +430,7 @@ tests:
         path: spec.template.spec.containers[0].env[?(@.name == 'OCTOPUS__K8STENTACLE__SCRIPTPODIMAGETAG')].value
         value: "1.0.0-worker"
     - equal:
-        path: spec.template.spec.containers[0].env[?(@.name == 'OCTOPUS__K8STENTACLE__SCRIPTPODIMAGEPULLPOLICY')].value
+        path: spec.template.spec.containers[0].env[?(@.name == 'OCTOPUS__K8STENTACLE__SCRIPTPODPULLPOLICY')].value
         value: "IfNotPresent"
 
 - it: "When running as a worker, the script-pod image fields are already populated"
@@ -445,7 +445,7 @@ tests:
         path: spec.template.spec.containers[0].env[?(@.name == 'OCTOPUS__K8STENTACLE__SCRIPTPODIMAGETAG')].value
         value: "ubuntu.22.04"
     - equal:
-        path: spec.template.spec.containers[0].env[?(@.name == 'OCTOPUS__K8STENTACLE__SCRIPTPODIMAGEPULLPOLICY')].value
+        path: spec.template.spec.containers[0].env[?(@.name == 'OCTOPUS__K8STENTACLE__SCRIPTPODPULLPOLICY')].value
         value: "IfNotPresent"
 
 - it: "When running as a deployment Target, script pod image is not set by default"