Forward merge from release/kubernetes-agent/v2

.changeset/clever-lemons-jog.md

@@ -0,0 +1,5 @@
+---
+"kubernetes-agent": patch
+---
+
+Forward merge changes from [2.38.3](#2.38.3)

.github/CODEOWNERS

@@ -1 +1 @@
-* @OctopusDeploy/team-modern-deployments
+* @OctopusDeploy/team-modern-deployments @OctopusDeploy/team-sierra @OctopusDeploy/team-yosemite

.github/pull_request_template.md

@@ -0,0 +1,11 @@
+# Description
+
+<!-- Why does this PR exist and what changes have been made? -->
+
+# 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.

charts/kubernetes-agent/CHANGELOG.md

@@ -1,5 +1,6 @@
 # kubernetes-agent
 
+
 ## 3.0.1
 
 ### Patch Changes
@@ -47,6 +48,22 @@ Version 3 has breaking changes and upgrading from Version 2 requires manual migr
   The result of this change is that script pods are now scheduled, by default, on the same node as the tentacle pod. This reduces/removes some of the scalability that NFS provided, but comes with increased performance, reduced footprint and reduced security footprint.
 
   To enable scaling of the script pods across nodes, a `persistence.storageClassName` should be set to the name of a storage class that provides `ReadWriteMany` access modes, and the `persistence.accessModes` should be set to `["ReadWriteMany"]`.
+## 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
+
+- 668909b: chore: update Kubernetes Monitor subchart to 0.27.0
+
 
 ## 2.38.1
 

charts/kubernetes-agent/Chart.yaml

@@ -17,4 +17,4 @@ dependencies:
 type: application
 version: "3.0.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"

charts/kubernetes-agent/README.md

@@ -1,6 +1,6 @@
 ## Kubernetes agent
 
-![Version: 3.0.1](https://img.shields.io/badge/Version-3.0.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: 3.0.1](https://img.shields.io/badge/Version-3.0.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).
 
@@ -65,7 +65,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 |

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-3.0.1
       name: octopus-agent-auto-upgrader
       namespace: NAMESPACE

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-3.0.1
       name: octopus-agent-scripts
       namespace: NAMESPACE

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-3.0.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-3.0.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-3.0.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-3.0.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-3.0.1
       name: octopus-agent-pod-template
       namespace: NAMESPACE

charts/kubernetes-agent/tests/__snapshot__/tentacle-deployment_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-3.0.1
       name: octopus-agent-tentacle
       namespace: NAMESPACE
@@ -25,7 +25,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-3.0.1
         spec:
           affinity:
@@ -108,7 +108,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:

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:
@@ -25,7 +25,7 @@ should match snapshot when storageClassName is set 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:
@@ -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:
@@ -64,7 +64,7 @@ should match snapshot when volumeName is set 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:

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-3.0.1
       name: octopus-agent-tentacle
       namespace: NAMESPACE

charts/kubernetes-agent/tests/tentacle-deployment_test.yaml

@@ -268,7 +268,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:

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.

tests/kubernetes-agent/KubernetesAgent.IntegrationTests/KubernetesAgent.IntegrationTests.csproj

@@ -17,7 +17,7 @@
         </PackageReference>
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0"/>
         <PackageReference Include="Octopus.Client" Version="17.15.2394" />
-        <PackageReference Include="Octopus.Tentacle.Client" Version="9.1.3835" />
+        <PackageReference Include="Octopus.Tentacle.Client" Version="9.1.3852" />
         <PackageReference Include="Serilog" Version="3.1.1" />
         <PackageReference Include="Serilog.Sinks.XUnit" Version="3.0.5" />
         <PackageReference Include="xunit" Version="2.5.3"/>