From d4e3bb236bc3c4e5768a7370be2ede79ce2bf449 Mon Sep 17 00:00:00 2001 From: team-modern-deployments-bot <124109055+team-modern-deployments-bot@users.noreply.github.com> Date: Thu, 30 Apr 2026 16:57:01 +1000 Subject: [PATCH 1/7] Version Charts (#565) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .changeset/better-paths-grow.md | 5 ----- charts/kubernetes-agent/CHANGELOG.md | 6 ++++++ charts/kubernetes-agent/package.json | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) delete mode 100644 .changeset/better-paths-grow.md diff --git a/.changeset/better-paths-grow.md b/.changeset/better-paths-grow.md deleted file mode 100644 index 266c5cb2..00000000 --- a/.changeset/better-paths-grow.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"kubernetes-agent": patch ---- - -chore: update Kubernetes Monitor subchart to 0.27.0 diff --git a/charts/kubernetes-agent/CHANGELOG.md b/charts/kubernetes-agent/CHANGELOG.md index 067ade49..d4c64cd5 100644 --- a/charts/kubernetes-agent/CHANGELOG.md +++ b/charts/kubernetes-agent/CHANGELOG.md @@ -1,5 +1,11 @@ # kubernetes-agent +## 2.38.2 + +### Patch Changes + +- 668909b: chore: update Kubernetes Monitor subchart to 0.27.0 + ## 2.38.1 ### Patch Changes diff --git a/charts/kubernetes-agent/package.json b/charts/kubernetes-agent/package.json index 986634e1..4202b211 100644 --- a/charts/kubernetes-agent/package.json +++ b/charts/kubernetes-agent/package.json @@ -1,6 +1,6 @@ { "name": "kubernetes-agent", - "version": "2.38.1", + "version": "2.38.2", "private": true, "description": "The Octopus Kubernetes Agent", "author": "Octopus Deploy Ptd Ltd", From 829d9f854b95731ef7d508a2e64c9f03bf32419b Mon Sep 17 00:00:00 2001 From: Alastair Pitts Date: Mon, 4 May 2026 11:33:34 +1000 Subject: [PATCH 2/7] Add additional code owners for repository (#572) --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 9fff82d4..6f343426 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @OctopusDeploy/team-modern-deployments +* @OctopusDeploy/team-modern-deployments @OctopusDeploy/team-sierra @OctopusDeploy/team-yosemite From 7608970a03d2f082d9d3b3e9ae9a6ef5532dab51 Mon Sep 17 00:00:00 2001 From: Alastair Pitts Date: Mon, 4 May 2026 14:11:33 +1000 Subject: [PATCH 3/7] Add pull request template (#574) --- .github/pull_request_template.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .github/pull_request_template.md diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 00000000..f07516ae --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,11 @@ +# Description + + + +# Pre-requisites + +- [ ] I have read [How we use GitHub Issues](https://github.com/OctopusDeploy/Issues/blob/main/docs/CONTRIBUTING.internal.md) for help deciding when and where it's appropriate to make an issue. +- [ ] I have added a changeset with an appropriate customer facing description. +- [ ] I have considered appropriate testing for my change. +- [ ] This PR affects all release versions and will need to be forward merged. + - See the [documentation](https://github.com/OctopusDeploy/helm-charts/blob/main/charts/kubernetes-agent/docs/forward-merging-release-branches.md) if unsure of the process. From 1af01cc6e8ebb60a297d81dda4918ed10dd4c03f Mon Sep 17 00:00:00 2001 From: Alastair Pitts Date: Mon, 4 May 2026 15:30:07 +1000 Subject: [PATCH 4/7] Upgrade kubernetes-agent-tentacle to 9.1.3852 (#571) --- .changeset/late-turtles-read.md | 8 ++++++++ charts/kubernetes-agent/Chart.yaml | 2 +- charts/kubernetes-agent/README.md | 4 ++-- .../auto-upgrader-serviceaccount_test.yaml.snap | 2 +- .../__snapshot__/pod-serviceaccount_test.yaml.snap | 2 +- .../__snapshot__/script-pod-template_test.yaml.snap | 10 +++++----- .../__snapshot__/tentacle-deployment_test.yaml.snap | 6 +++--- .../tests/__snapshot__/tentacle-pvc_test.yaml.snap | 4 ++-- .../tentacle-serviceaccount_test.yaml.snap | 2 +- .../tests/tentacle-deployment_test.yaml | 2 +- charts/kubernetes-agent/values.yaml | 2 +- 11 files changed, 26 insertions(+), 18 deletions(-) create mode 100644 .changeset/late-turtles-read.md diff --git a/.changeset/late-turtles-read.md b/.changeset/late-turtles-read.md new file mode 100644 index 00000000..01f9ba7c --- /dev/null +++ b/.changeset/late-turtles-read.md @@ -0,0 +1,8 @@ +--- +"kubernetes-agent": patch +--- + +Upgrade kubernetes-agent-tentacle to 9.1.3852 + +Includes: +- [Tone down the logging when failing to retrieve scriptpodtemplates](https://github.com/OctopusDeploy/OctopusTentacle/pull/1216) diff --git a/charts/kubernetes-agent/Chart.yaml b/charts/kubernetes-agent/Chart.yaml index d24f0cb2..f48798fd 100644 --- a/charts/kubernetes-agent/Chart.yaml +++ b/charts/kubernetes-agent/Chart.yaml @@ -17,4 +17,4 @@ dependencies: type: application version: "2.38.1" # This version number should be the same as the agent.image.tag value as this is the primary application version -appVersion: "9.1.3835" +appVersion: "9.1.3852" diff --git a/charts/kubernetes-agent/README.md b/charts/kubernetes-agent/README.md index 23ec8f84..5798a8cd 100644 --- a/charts/kubernetes-agent/README.md +++ b/charts/kubernetes-agent/README.md @@ -1,6 +1,6 @@ ## Kubernetes agent -![Version: 2.38.1](https://img.shields.io/badge/Version-2.38.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 9.1.3835](https://img.shields.io/badge/AppVersion-9.1.3835-informational?style=flat-square) ![Octopus Deploy Version: 2024.2.6580+](https://img.shields.io/badge/Octopus_Deploy-2024.2.6580%2B-2F93E0?style=flat-square&logo=octopusdeploy&logoColor=%232F93E0&logoSize=auto) +![Version: 2.38.1](https://img.shields.io/badge/Version-2.38.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 9.1.3852](https://img.shields.io/badge/AppVersion-9.1.3852-informational?style=flat-square) ![Octopus Deploy Version: 2024.2.6580+](https://img.shields.io/badge/Octopus_Deploy-2024.2.6580%2B-2F93E0?style=flat-square&logo=octopusdeploy&logoColor=%232F93E0&logoSize=auto) The Kubernetes agent is the recommended way to deploy to Kubernetes clusters using [Octopus Deploy](https://octopus.com). @@ -57,7 +57,7 @@ The Kubernetes monitor is optionally installed alongside the Kubernetes agent, [ | agent.containers.watchdog.spec | object | `{}` | Additional container spec to apply to the watchdog container - does not override any other configuration | | agent.debug.disableAutoPodCleanup | bool | `false` | Disables automatic pod cleanup | | agent.enableMetricsCapture | bool | `true` | True if events should be scraped and added to the metrics config map | -| agent.image | object | `{"pullPolicy":"IfNotPresent","repository":"octopusdeploy/kubernetes-agent-tentacle","tag":"9.1.3835","tagSuffix":""}` | The repository, pullPolicy, tag & tagSuffix to use for the agent image | +| agent.image | object | `{"pullPolicy":"IfNotPresent","repository":"octopusdeploy/kubernetes-agent-tentacle","tag":"9.1.3852","tagSuffix":""}` | The repository, pullPolicy, tag & tagSuffix to use for the agent image | | agent.logLevel | string | `"Info"` | The log level of the agent. Logs are written to the pod logs as well as to file | | agent.machinePolicyName | string | `""` | The machine policy to register the agent with | | agent.metadata | object | `{"annotations":{},"labels":{}}` | Additional metadata to add to the agent pod & container | diff --git a/charts/kubernetes-agent/tests/__snapshot__/auto-upgrader-serviceaccount_test.yaml.snap b/charts/kubernetes-agent/tests/__snapshot__/auto-upgrader-serviceaccount_test.yaml.snap index 4720425f..c07a011d 100644 --- a/charts/kubernetes-agent/tests/__snapshot__/auto-upgrader-serviceaccount_test.yaml.snap +++ b/charts/kubernetes-agent/tests/__snapshot__/auto-upgrader-serviceaccount_test.yaml.snap @@ -8,7 +8,7 @@ should match snapshot: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: octopus-agent - app.kubernetes.io/version: 9.1.3835 + app.kubernetes.io/version: 9.1.3852 helm.sh/chart: kubernetes-agent-2.38.1 name: octopus-agent-auto-upgrader namespace: NAMESPACE diff --git a/charts/kubernetes-agent/tests/__snapshot__/pod-serviceaccount_test.yaml.snap b/charts/kubernetes-agent/tests/__snapshot__/pod-serviceaccount_test.yaml.snap index cb788d4f..6c1d6961 100644 --- a/charts/kubernetes-agent/tests/__snapshot__/pod-serviceaccount_test.yaml.snap +++ b/charts/kubernetes-agent/tests/__snapshot__/pod-serviceaccount_test.yaml.snap @@ -8,7 +8,7 @@ should match snapshot: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: octopus-agent - app.kubernetes.io/version: 9.1.3835 + app.kubernetes.io/version: 9.1.3852 helm.sh/chart: kubernetes-agent-2.38.1 name: octopus-agent-scripts namespace: NAMESPACE diff --git a/charts/kubernetes-agent/tests/__snapshot__/script-pod-template_test.yaml.snap b/charts/kubernetes-agent/tests/__snapshot__/script-pod-template_test.yaml.snap index bff64b31..b90294fe 100644 --- a/charts/kubernetes-agent/tests/__snapshot__/script-pod-template_test.yaml.snap +++ b/charts/kubernetes-agent/tests/__snapshot__/script-pod-template_test.yaml.snap @@ -8,7 +8,7 @@ Should render all options when crdDisabled is true: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: octopus-agent - app.kubernetes.io/version: 9.1.3835 + app.kubernetes.io/version: 9.1.3852 helm.sh/chart: kubernetes-agent-2.38.1 name: octopus-agent-pod-template namespace: NAMESPACE @@ -49,7 +49,7 @@ should match snapshot: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: octopus-agent - app.kubernetes.io/version: 9.1.3835 + app.kubernetes.io/version: 9.1.3852 helm.sh/chart: kubernetes-agent-2.38.1 name: octopus-agent namespace: NAMESPACE @@ -80,7 +80,7 @@ should never have the containers key in the podSpec when crdDisabled is true: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: octopus-agent - app.kubernetes.io/version: 9.1.3835 + app.kubernetes.io/version: 9.1.3852 helm.sh/chart: kubernetes-agent-2.38.1 name: octopus-agent-pod-template namespace: NAMESPACE @@ -115,7 +115,7 @@ should partially render successfully: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: octopus-agent - app.kubernetes.io/version: 9.1.3835 + app.kubernetes.io/version: 9.1.3852 helm.sh/chart: kubernetes-agent-2.38.1 name: octopus-agent namespace: NAMESPACE @@ -140,7 +140,7 @@ should render a deployment when crdDisabled is true: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: octopus-agent - app.kubernetes.io/version: 9.1.3835 + app.kubernetes.io/version: 9.1.3852 helm.sh/chart: kubernetes-agent-2.38.1 name: octopus-agent-pod-template namespace: NAMESPACE diff --git a/charts/kubernetes-agent/tests/__snapshot__/tentacle-deployment_test.yaml.snap b/charts/kubernetes-agent/tests/__snapshot__/tentacle-deployment_test.yaml.snap index a09031ae..253b69a5 100644 --- a/charts/kubernetes-agent/tests/__snapshot__/tentacle-deployment_test.yaml.snap +++ b/charts/kubernetes-agent/tests/__snapshot__/tentacle-deployment_test.yaml.snap @@ -7,7 +7,7 @@ should match snapshot: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: octopus-agent - app.kubernetes.io/version: 9.1.3835 + app.kubernetes.io/version: 9.1.3852 helm.sh/chart: kubernetes-agent-2.38.1 name: octopus-agent-tentacle namespace: NAMESPACE @@ -23,7 +23,7 @@ should match snapshot: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: octopus-agent - app.kubernetes.io/version: 9.1.3835 + app.kubernetes.io/version: 9.1.3852 helm.sh/chart: kubernetes-agent-2.38.1 spec: affinity: @@ -106,7 +106,7 @@ should match snapshot: value: '{"nodeAffinity":{"requiredDuringSchedulingIgnoredDuringExecution":{"nodeSelectorTerms":[{"matchExpressions":[{"key":"kubernetes.io/os","operator":"In","values":["linux"]},{"key":"kubernetes.io/arch","operator":"In","values":["arm64","amd64"]}]}]}}}' - name: OCTOPUS__K8STENTACLE__PERSISTENTVOLUMESIZE value: 10Gi - image: octopusdeploy/kubernetes-agent-tentacle:9.1.3835 + image: octopusdeploy/kubernetes-agent-tentacle:9.1.3852 imagePullPolicy: IfNotPresent name: octopus-agent-tentacle resources: diff --git a/charts/kubernetes-agent/tests/__snapshot__/tentacle-pvc_test.yaml.snap b/charts/kubernetes-agent/tests/__snapshot__/tentacle-pvc_test.yaml.snap index c3005847..a03e79fe 100644 --- a/charts/kubernetes-agent/tests/__snapshot__/tentacle-pvc_test.yaml.snap +++ b/charts/kubernetes-agent/tests/__snapshot__/tentacle-pvc_test.yaml.snap @@ -7,7 +7,7 @@ should match snapshot when storageClassName is set: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: octopus-agent - app.kubernetes.io/version: 9.1.3835 + app.kubernetes.io/version: 9.1.3852 helm.sh/chart: kubernetes-agent-2.38.1 name: octopus-agent-RELEASE-NAME-pvc spec: @@ -26,7 +26,7 @@ should match snapshot when volumeName is set: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: octopus-agent - app.kubernetes.io/version: 9.1.3835 + app.kubernetes.io/version: 9.1.3852 helm.sh/chart: kubernetes-agent-2.38.1 name: octopus-agent-RELEASE-NAME-pvc spec: diff --git a/charts/kubernetes-agent/tests/__snapshot__/tentacle-serviceaccount_test.yaml.snap b/charts/kubernetes-agent/tests/__snapshot__/tentacle-serviceaccount_test.yaml.snap index 204affe3..f645d312 100644 --- a/charts/kubernetes-agent/tests/__snapshot__/tentacle-serviceaccount_test.yaml.snap +++ b/charts/kubernetes-agent/tests/__snapshot__/tentacle-serviceaccount_test.yaml.snap @@ -8,7 +8,7 @@ should match snapshot: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: octopus-agent - app.kubernetes.io/version: 9.1.3835 + app.kubernetes.io/version: 9.1.3852 helm.sh/chart: kubernetes-agent-2.38.1 name: octopus-agent-tentacle namespace: NAMESPACE diff --git a/charts/kubernetes-agent/tests/tentacle-deployment_test.yaml b/charts/kubernetes-agent/tests/tentacle-deployment_test.yaml index 445aed23..5cabe3c2 100644 --- a/charts/kubernetes-agent/tests/tentacle-deployment_test.yaml +++ b/charts/kubernetes-agent/tests/tentacle-deployment_test.yaml @@ -295,7 +295,7 @@ tests: asserts: - equal: path: spec.template.spec.containers[0].image - value: "octopusdeploy/kubernetes-agent-tentacle:9.1.3835-bullseye-slim" + value: "octopusdeploy/kubernetes-agent-tentacle:9.1.3852-bullseye-slim" - it: "sets custom spec properly" set: diff --git a/charts/kubernetes-agent/values.yaml b/charts/kubernetes-agent/values.yaml index fb4ef94d..fc6c534d 100644 --- a/charts/kubernetes-agent/values.yaml +++ b/charts/kubernetes-agent/values.yaml @@ -120,7 +120,7 @@ agent: image: repository: octopusdeploy/kubernetes-agent-tentacle pullPolicy: IfNotPresent - tag: "9.1.3835" + tag: "9.1.3852" tagSuffix: "" # -- Credentials used during agent-upgrade tasks. To be populated if encountering rate-limiting failures. From c166fd490a1042325387f85c584e01dc7493d71e Mon Sep 17 00:00:00 2001 From: Denys Melnyk Date: Tue, 5 May 2026 02:08:06 +0300 Subject: [PATCH 5/7] fix: action not updating versioning PR with Chart bump (#576) --- .github/workflows/create-versioning-pr.yaml | 5 ++++- .github/workflows/kubernetes-agent-publish-chart.yaml | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/create-versioning-pr.yaml b/.github/workflows/create-versioning-pr.yaml index 893540a6..6ac42bc6 100644 --- a/.github/workflows/create-versioning-pr.yaml +++ b/.github/workflows/create-versioning-pr.yaml @@ -7,6 +7,7 @@ on: - release/kubernetes-agent/v* - release/octopus-deploy/v* - octopus-v1 + - vnext/v* paths: - charts/kubernetes-agent/** - charts/octopus-deploy/** @@ -114,6 +115,8 @@ jobs: - name: 'Push changes' run: | - git push --set-upstream origin changeset-release/main + ref="${{ github.ref }}" + ref=${ref#"refs/heads/"} + git push --set-upstream origin "changeset-release/$ref" if: steps.changesets.outputs.hasChangesets == 'true' diff --git a/.github/workflows/kubernetes-agent-publish-chart.yaml b/.github/workflows/kubernetes-agent-publish-chart.yaml index f1358aa9..b070eac3 100644 --- a/.github/workflows/kubernetes-agent-publish-chart.yaml +++ b/.github/workflows/kubernetes-agent-publish-chart.yaml @@ -5,6 +5,7 @@ on: branches: - main - release/kubernetes-agent/v* + - vnext/v* pull_request: From 164152725116888d44e7c1ec3852b650cc0c86a1 Mon Sep 17 00:00:00 2001 From: team-modern-deployments-bot <124109055+team-modern-deployments-bot@users.noreply.github.com> Date: Tue, 5 May 2026 09:16:54 +1000 Subject: [PATCH 6/7] Version Charts (#575) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .changeset/late-turtles-read.md | 8 -------- charts/kubernetes-agent/CHANGELOG.md | 10 ++++++++++ charts/kubernetes-agent/Chart.yaml | 2 +- charts/kubernetes-agent/README.md | 2 +- charts/kubernetes-agent/package.json | 2 +- .../auto-upgrader-serviceaccount_test.yaml.snap | 2 +- .../__snapshot__/pod-serviceaccount_test.yaml.snap | 2 +- .../__snapshot__/script-pod-template_test.yaml.snap | 10 +++++----- .../__snapshot__/tentacle-deployment_test.yaml.snap | 6 +++--- .../tests/__snapshot__/tentacle-pvc_test.yaml.snap | 4 ++-- .../tentacle-serviceaccount_test.yaml.snap | 2 +- 11 files changed, 26 insertions(+), 24 deletions(-) delete mode 100644 .changeset/late-turtles-read.md diff --git a/.changeset/late-turtles-read.md b/.changeset/late-turtles-read.md deleted file mode 100644 index 01f9ba7c..00000000 --- a/.changeset/late-turtles-read.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -"kubernetes-agent": patch ---- - -Upgrade kubernetes-agent-tentacle to 9.1.3852 - -Includes: -- [Tone down the logging when failing to retrieve scriptpodtemplates](https://github.com/OctopusDeploy/OctopusTentacle/pull/1216) diff --git a/charts/kubernetes-agent/CHANGELOG.md b/charts/kubernetes-agent/CHANGELOG.md index d4c64cd5..ec198867 100644 --- a/charts/kubernetes-agent/CHANGELOG.md +++ b/charts/kubernetes-agent/CHANGELOG.md @@ -1,5 +1,15 @@ # kubernetes-agent +## 2.38.3 + +### Patch Changes + +- 1af01cc: Upgrade kubernetes-agent-tentacle to 9.1.3852 + + Includes: + + - [Tone down the logging when failing to retrieve scriptpodtemplates](https://github.com/OctopusDeploy/OctopusTentacle/pull/1216) + ## 2.38.2 ### Patch Changes diff --git a/charts/kubernetes-agent/Chart.yaml b/charts/kubernetes-agent/Chart.yaml index f48798fd..6a927b34 100644 --- a/charts/kubernetes-agent/Chart.yaml +++ b/charts/kubernetes-agent/Chart.yaml @@ -15,6 +15,6 @@ dependencies: condition: kubernetesMonitor.enabled alias: kubernetesMonitor type: application -version: "2.38.1" +version: "2.38.3" # This version number should be the same as the agent.image.tag value as this is the primary application version appVersion: "9.1.3852" diff --git a/charts/kubernetes-agent/README.md b/charts/kubernetes-agent/README.md index 5798a8cd..91217301 100644 --- a/charts/kubernetes-agent/README.md +++ b/charts/kubernetes-agent/README.md @@ -1,6 +1,6 @@ ## Kubernetes agent -![Version: 2.38.1](https://img.shields.io/badge/Version-2.38.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 9.1.3852](https://img.shields.io/badge/AppVersion-9.1.3852-informational?style=flat-square) ![Octopus Deploy Version: 2024.2.6580+](https://img.shields.io/badge/Octopus_Deploy-2024.2.6580%2B-2F93E0?style=flat-square&logo=octopusdeploy&logoColor=%232F93E0&logoSize=auto) +![Version: 2.38.3](https://img.shields.io/badge/Version-2.38.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 9.1.3852](https://img.shields.io/badge/AppVersion-9.1.3852-informational?style=flat-square) ![Octopus Deploy Version: 2024.2.6580+](https://img.shields.io/badge/Octopus_Deploy-2024.2.6580%2B-2F93E0?style=flat-square&logo=octopusdeploy&logoColor=%232F93E0&logoSize=auto) The Kubernetes agent is the recommended way to deploy to Kubernetes clusters using [Octopus Deploy](https://octopus.com). diff --git a/charts/kubernetes-agent/package.json b/charts/kubernetes-agent/package.json index 4202b211..55d9fd5b 100644 --- a/charts/kubernetes-agent/package.json +++ b/charts/kubernetes-agent/package.json @@ -1,6 +1,6 @@ { "name": "kubernetes-agent", - "version": "2.38.2", + "version": "2.38.3", "private": true, "description": "The Octopus Kubernetes Agent", "author": "Octopus Deploy Ptd Ltd", diff --git a/charts/kubernetes-agent/tests/__snapshot__/auto-upgrader-serviceaccount_test.yaml.snap b/charts/kubernetes-agent/tests/__snapshot__/auto-upgrader-serviceaccount_test.yaml.snap index c07a011d..35f83297 100644 --- a/charts/kubernetes-agent/tests/__snapshot__/auto-upgrader-serviceaccount_test.yaml.snap +++ b/charts/kubernetes-agent/tests/__snapshot__/auto-upgrader-serviceaccount_test.yaml.snap @@ -9,6 +9,6 @@ should match snapshot: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: octopus-agent app.kubernetes.io/version: 9.1.3852 - helm.sh/chart: kubernetes-agent-2.38.1 + helm.sh/chart: kubernetes-agent-2.38.3 name: octopus-agent-auto-upgrader namespace: NAMESPACE diff --git a/charts/kubernetes-agent/tests/__snapshot__/pod-serviceaccount_test.yaml.snap b/charts/kubernetes-agent/tests/__snapshot__/pod-serviceaccount_test.yaml.snap index 6c1d6961..7583e22c 100644 --- a/charts/kubernetes-agent/tests/__snapshot__/pod-serviceaccount_test.yaml.snap +++ b/charts/kubernetes-agent/tests/__snapshot__/pod-serviceaccount_test.yaml.snap @@ -9,6 +9,6 @@ should match snapshot: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: octopus-agent app.kubernetes.io/version: 9.1.3852 - helm.sh/chart: kubernetes-agent-2.38.1 + helm.sh/chart: kubernetes-agent-2.38.3 name: octopus-agent-scripts namespace: NAMESPACE diff --git a/charts/kubernetes-agent/tests/__snapshot__/script-pod-template_test.yaml.snap b/charts/kubernetes-agent/tests/__snapshot__/script-pod-template_test.yaml.snap index b90294fe..3b309936 100644 --- a/charts/kubernetes-agent/tests/__snapshot__/script-pod-template_test.yaml.snap +++ b/charts/kubernetes-agent/tests/__snapshot__/script-pod-template_test.yaml.snap @@ -9,7 +9,7 @@ Should render all options when crdDisabled is true: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: octopus-agent app.kubernetes.io/version: 9.1.3852 - helm.sh/chart: kubernetes-agent-2.38.1 + helm.sh/chart: kubernetes-agent-2.38.3 name: octopus-agent-pod-template namespace: NAMESPACE spec: @@ -50,7 +50,7 @@ should match snapshot: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: octopus-agent app.kubernetes.io/version: 9.1.3852 - helm.sh/chart: kubernetes-agent-2.38.1 + helm.sh/chart: kubernetes-agent-2.38.3 name: octopus-agent namespace: NAMESPACE spec: @@ -81,7 +81,7 @@ should never have the containers key in the podSpec when crdDisabled is true: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: octopus-agent app.kubernetes.io/version: 9.1.3852 - helm.sh/chart: kubernetes-agent-2.38.1 + helm.sh/chart: kubernetes-agent-2.38.3 name: octopus-agent-pod-template namespace: NAMESPACE spec: @@ -116,7 +116,7 @@ should partially render successfully: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: octopus-agent app.kubernetes.io/version: 9.1.3852 - helm.sh/chart: kubernetes-agent-2.38.1 + helm.sh/chart: kubernetes-agent-2.38.3 name: octopus-agent namespace: NAMESPACE spec: @@ -141,7 +141,7 @@ should render a deployment when crdDisabled is true: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: octopus-agent app.kubernetes.io/version: 9.1.3852 - helm.sh/chart: kubernetes-agent-2.38.1 + helm.sh/chart: kubernetes-agent-2.38.3 name: octopus-agent-pod-template namespace: NAMESPACE spec: diff --git a/charts/kubernetes-agent/tests/__snapshot__/tentacle-deployment_test.yaml.snap b/charts/kubernetes-agent/tests/__snapshot__/tentacle-deployment_test.yaml.snap index 253b69a5..2ea32464 100644 --- a/charts/kubernetes-agent/tests/__snapshot__/tentacle-deployment_test.yaml.snap +++ b/charts/kubernetes-agent/tests/__snapshot__/tentacle-deployment_test.yaml.snap @@ -8,7 +8,7 @@ should match snapshot: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: octopus-agent app.kubernetes.io/version: 9.1.3852 - helm.sh/chart: kubernetes-agent-2.38.1 + helm.sh/chart: kubernetes-agent-2.38.3 name: octopus-agent-tentacle namespace: NAMESPACE spec: @@ -24,7 +24,7 @@ should match snapshot: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: octopus-agent app.kubernetes.io/version: 9.1.3852 - helm.sh/chart: kubernetes-agent-2.38.1 + helm.sh/chart: kubernetes-agent-2.38.3 spec: affinity: nodeAffinity: @@ -79,7 +79,7 @@ should match snapshot: - name: OCTOPUS__K8STENTACLE__HELMRELEASENAME value: RELEASE-NAME - name: OCTOPUS__K8STENTACLE__HELMCHARTVERSION - value: 2.38.1 + value: 2.38.3 - name: OCTOPUS__K8STENTACLE__DISABLEAUTOPODCLEANUP value: "false" - name: OCTOPUS__K8STENTACLE__DISABLEPODEVENTSINTASKLOG diff --git a/charts/kubernetes-agent/tests/__snapshot__/tentacle-pvc_test.yaml.snap b/charts/kubernetes-agent/tests/__snapshot__/tentacle-pvc_test.yaml.snap index a03e79fe..90ea7737 100644 --- a/charts/kubernetes-agent/tests/__snapshot__/tentacle-pvc_test.yaml.snap +++ b/charts/kubernetes-agent/tests/__snapshot__/tentacle-pvc_test.yaml.snap @@ -8,7 +8,7 @@ should match snapshot when storageClassName is set: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: octopus-agent app.kubernetes.io/version: 9.1.3852 - helm.sh/chart: kubernetes-agent-2.38.1 + helm.sh/chart: kubernetes-agent-2.38.3 name: octopus-agent-RELEASE-NAME-pvc spec: accessModes: @@ -27,7 +27,7 @@ should match snapshot when volumeName is set: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: octopus-agent app.kubernetes.io/version: 9.1.3852 - helm.sh/chart: kubernetes-agent-2.38.1 + helm.sh/chart: kubernetes-agent-2.38.3 name: octopus-agent-RELEASE-NAME-pvc spec: accessModes: diff --git a/charts/kubernetes-agent/tests/__snapshot__/tentacle-serviceaccount_test.yaml.snap b/charts/kubernetes-agent/tests/__snapshot__/tentacle-serviceaccount_test.yaml.snap index f645d312..34b09c8f 100644 --- a/charts/kubernetes-agent/tests/__snapshot__/tentacle-serviceaccount_test.yaml.snap +++ b/charts/kubernetes-agent/tests/__snapshot__/tentacle-serviceaccount_test.yaml.snap @@ -9,6 +9,6 @@ should match snapshot: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: octopus-agent app.kubernetes.io/version: 9.1.3852 - helm.sh/chart: kubernetes-agent-2.38.1 + helm.sh/chart: kubernetes-agent-2.38.3 name: octopus-agent-tentacle namespace: NAMESPACE From ec19f53d722723cf03402db882109011c04c1dcf Mon Sep 17 00:00:00 2001 From: Alastair Pitts Date: Tue, 5 May 2026 09:45:08 +1000 Subject: [PATCH 7/7] Add changelog and update --- .changeset/clever-lemons-jog.md | 5 +++++ .../tests/__snapshot__/tentacle-pvc_test.yaml.snap | 4 ++-- .../KubernetesAgent.IntegrationTests.csproj | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 .changeset/clever-lemons-jog.md diff --git a/.changeset/clever-lemons-jog.md b/.changeset/clever-lemons-jog.md new file mode 100644 index 00000000..80b9c466 --- /dev/null +++ b/.changeset/clever-lemons-jog.md @@ -0,0 +1,5 @@ +--- +"kubernetes-agent": patch +--- + +Forward merge changes from [2.38.3](#2.38.3) \ No newline at end of file diff --git a/charts/kubernetes-agent/tests/__snapshot__/tentacle-pvc_test.yaml.snap b/charts/kubernetes-agent/tests/__snapshot__/tentacle-pvc_test.yaml.snap index 36e5b951..f9fa89c9 100644 --- a/charts/kubernetes-agent/tests/__snapshot__/tentacle-pvc_test.yaml.snap +++ b/charts/kubernetes-agent/tests/__snapshot__/tentacle-pvc_test.yaml.snap @@ -7,7 +7,7 @@ should match snapshot when storageClassName is not set and nfs is disabled (defa app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: octopus-agent - app.kubernetes.io/version: 9.1.3835 + app.kubernetes.io/version: 9.1.3852 helm.sh/chart: kubernetes-agent-3.0.1 name: octopus-agent-release-name-pvc spec: @@ -44,7 +44,7 @@ should match snapshot when storageClassName is set to "-" and nfs is disabled: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: octopus-agent - app.kubernetes.io/version: 9.1.3835 + app.kubernetes.io/version: 9.1.3852 helm.sh/chart: kubernetes-agent-3.0.1 name: octopus-agent-release-name-pvc spec: diff --git a/tests/kubernetes-agent/KubernetesAgent.IntegrationTests/KubernetesAgent.IntegrationTests.csproj b/tests/kubernetes-agent/KubernetesAgent.IntegrationTests/KubernetesAgent.IntegrationTests.csproj index 55b218ff..e87e84e7 100644 --- a/tests/kubernetes-agent/KubernetesAgent.IntegrationTests/KubernetesAgent.IntegrationTests.csproj +++ b/tests/kubernetes-agent/KubernetesAgent.IntegrationTests/KubernetesAgent.IntegrationTests.csproj @@ -17,7 +17,7 @@ - +