Merge branch 'main' into ap/upgrade-from-main

Author: APErebus

.changeset/ninety-seahorses-roll.md

@@ -16,9 +16,16 @@
 
   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.36.0
+
+### Minor Changes
+
+- d07fbf4: Add stuck pending script pod monitoring background process. If a script pod has been in the pending state for more than the defined number of minutes (default: 60 minutes), the script pod is terminated.
+
 ### Patch Changes
 
 - 8fa4ed7: chore: update Kubernetes Monitor subchart to 0.25.0
+- f897c59: Upgrade kubernetes-agent-tentacle to 9.1.3703. This adds extra retry logic when performing filesystem operations.
 
 ## 2.35.0
 

.changeset/tricky-parks-begin.md

@@ -15,6 +15,6 @@ dependencies:
     condition: kubernetesMonitor.enabled
     alias: kubernetesMonitor
 type: application
-version: "2.35.0"
+version: "2.36.0"
 # This version number should be the same as the agent.image.tag value as this is the primary application version
 appVersion: "9.1.3703"

.changeset/witty-boats-obey.md

@@ -1,6 +1,6 @@
 ## Kubernetes agent
 
-![Version: 2.35.0](https://img.shields.io/badge/Version-2.35.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 9.1.3703](https://img.shields.io/badge/AppVersion-9.1.3703-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.36.0](https://img.shields.io/badge/Version-2.36.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 9.1.3703](https://img.shields.io/badge/AppVersion-9.1.3703-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).
 

charts/kubernetes-agent/CHANGELOG.md

@@ -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.3703
-        helm.sh/chart: kubernetes-agent-2.35.0
+        helm.sh/chart: kubernetes-agent-2.36.0
       name: octopus-agent-auto-upgrader
       namespace: NAMESPACE

charts/kubernetes-agent/Chart.yaml

@@ -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.3703
-        helm.sh/chart: kubernetes-agent-2.35.0
+        helm.sh/chart: kubernetes-agent-2.36.0
       name: octopus-agent-scripts
       namespace: NAMESPACE

charts/kubernetes-agent/README.md

@@ -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.3703
-        helm.sh/chart: kubernetes-agent-2.35.0
+        helm.sh/chart: kubernetes-agent-2.36.0
       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.3703
-        helm.sh/chart: kubernetes-agent-2.35.0
+        helm.sh/chart: kubernetes-agent-2.36.0
       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.3703
-        helm.sh/chart: kubernetes-agent-2.35.0
+        helm.sh/chart: kubernetes-agent-2.36.0
       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.3703
-        helm.sh/chart: kubernetes-agent-2.35.0
+        helm.sh/chart: kubernetes-agent-2.36.0
       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.3703
-        helm.sh/chart: kubernetes-agent-2.35.0
+        helm.sh/chart: kubernetes-agent-2.36.0
       name: octopus-agent-pod-template
       namespace: NAMESPACE
     spec:

charts/kubernetes-agent/tests/__snapshot__/auto-upgrader-serviceaccount_test.yaml.snap

@@ -9,7 +9,7 @@ should match snapshot:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: octopus-agent
         app.kubernetes.io/version: 9.1.3703
-        helm.sh/chart: kubernetes-agent-2.35.0
+        helm.sh/chart: kubernetes-agent-2.36.0
       name: octopus-agent-tentacle
       namespace: NAMESPACE
     spec:
@@ -26,7 +26,7 @@ should match snapshot:
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: octopus-agent
             app.kubernetes.io/version: 9.1.3703
-            helm.sh/chart: kubernetes-agent-2.35.0
+            helm.sh/chart: kubernetes-agent-2.36.0
         spec:
           affinity:
             nodeAffinity:
@@ -81,7 +81,7 @@ should match snapshot:
                 - name: OCTOPUS__K8STENTACLE__HELMRELEASENAME
                   value: RELEASE-NAME
                 - name: OCTOPUS__K8STENTACLE__HELMCHARTVERSION
-                  value: 2.35.0
+                  value: 2.36.0
                 - name: OCTOPUS__K8STENTACLE__DISABLEAUTOPODCLEANUP
                   value: "false"
                 - name: OCTOPUS__K8STENTACLE__DISABLEPODEVENTSINTASKLOG