Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Forward merge release/kubernetes-agent/v1 #361

Merged
merged 7 commits into from
Dec 17, 2024
Merged

Forward merge release/kubernetes-agent/v1 #361

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
897f59b
Fix script pod image pull policy env var (#358)
APErebus Dec 16, 2024
d22cd82
Update download-artifact and upload-artifact to v4 (#360)
APErebus Dec 16, 2024
ee1648c
Version Kubernetes Agent Chart (#359)
Octobob Dec 16, 2024
f5b8142
Merge branch 'release/kubernetes-agent/v1' into ap/2024127-forward-merge
APErebus Dec 16, 2024
92e6523
Fix worker pull policy tests
APErebus Dec 16, 2024
afb6307
Fix changelog and add changeset
APErebus Dec 16, 2024
bb63d4b
Merge branch 'main' into ap/2024127-forward-merge
APErebus Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/famous-seals-serve.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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`
4 changes: 2 additions & 2 deletions .github/workflows/kubernetes-agent-publish-chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}'
Expand All @@ -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 }}'

Expand Down
6 changes: 6 additions & 0 deletions charts/kubernetes-agent/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions charts/kubernetes-agent/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

Expand Down
2 changes: 1 addition & 1 deletion charts/kubernetes-agent/templates/tentacle-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions charts/kubernetes-agent/tests/tentacle-deployment-container-env-vars_test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand Down
Loading