Skip to content

Commit

Permalink
Merge branch 'release/kubernetes-agent/v1' into kevjt/forward-merge
Browse files Browse the repository at this point in the history
# Conflicts:
#	charts/kubernetes-agent/CHANGELOG.md
#	charts/kubernetes-agent/Chart.yaml
#	charts/kubernetes-agent/README.md
#	charts/kubernetes-agent/package.json
#	charts/kubernetes-agent/tests/__snapshot__/auto-upgrader-serviceaccount_test.yaml.snap
#	charts/kubernetes-agent/tests/__snapshot__/pod-serviceaccount_test.yaml.snap
#	charts/kubernetes-agent/tests/__snapshot__/tentacle-deployment_test.yaml.snap
#	charts/kubernetes-agent/tests/__snapshot__/tentacle-pvc_test.yaml.snap
#	charts/kubernetes-agent/tests/__snapshot__/tentacle-serviceaccount_test.yaml.snap
  • Loading branch information
kevjt committed Jan 13, 2025
2 parents 7747bdf + 3262916 commit 58af1f2
Show file tree
Hide file tree
Showing 10 changed files with 18 additions and 12 deletions.
6 changes: 6 additions & 0 deletions charts/kubernetes-agent/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,12 @@ Version 2 has breaking changes and upgrading from Version 1 requires manual migr

- 05fa04c: Creating Kubernetes Agent v2 alpha prerelease

# 1.20.1

### Patch Changes

- 2d38d37: Updated Tentacle to version 8.2.2585, which increases the maximum buffer size for the output scanner in the bootstrap runner. This fix addresses an issue where output lines longer than the previous buffer limit would fail to be written.

## 1.20.0

### Minor Changes
Expand Down
2 changes: 1 addition & 1 deletion charts/kubernetes-agent/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ maintainers:
type: application
version: "2.9.0"
# This version number should be the same as the agent.image.tag value as this is the primary application version
appVersion: "8.2.2540"
appVersion: "8.2.2585"
4 changes: 2 additions & 2 deletions charts/kubernetes-agent/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Kubernetes agent

![Version: 2.9.0](https://img.shields.io/badge/Version-2.9.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 8.2.2540](https://img.shields.io/badge/AppVersion-8.2.2540-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.9.0](https://img.shields.io/badge/Version-2.9.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 8.2.2585](https://img.shields.io/badge/AppVersion-8.2.2585-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).

Expand Down Expand Up @@ -49,7 +49,7 @@ This is documented [here](./migrations.md).
| agent.certificate | string | `""` | A base64-encoded x509 certificate used to setup a trust between the agent and target Octopus Server |
| 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":"8.2.2540","tagSuffix":""}` | The repository, pullPolicy, tag & tagSuffix to use for the agent image |
| agent.image | object | `{"pullPolicy":"IfNotPresent","repository":"octopusdeploy/kubernetes-agent-tentacle","tag":"8.2.2585","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 |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: 8.2.2540
app.kubernetes.io/version: 8.2.2585
helm.sh/chart: kubernetes-agent-2.9.0
name: octopus-agent-auto-upgrader
namespace: NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -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: 8.2.2540
app.kubernetes.io/version: 8.2.2585
helm.sh/chart: kubernetes-agent-2.9.0
name: octopus-agent-scripts
namespace: NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -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: 8.2.2540
app.kubernetes.io/version: 8.2.2585
helm.sh/chart: kubernetes-agent-2.9.0
name: octopus-agent-tentacle
namespace: NAMESPACE
Expand All @@ -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: 8.2.2540
app.kubernetes.io/version: 8.2.2585
helm.sh/chart: kubernetes-agent-2.9.0
spec:
affinity:
Expand Down Expand Up @@ -102,7 +102,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:8.2.2540
image: octopusdeploy/kubernetes-agent-tentacle:8.2.2585
imagePullPolicy: IfNotPresent
name: octopus-agent-tentacle
resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: 8.2.2540
app.kubernetes.io/version: 8.2.2585
helm.sh/chart: kubernetes-agent-2.9.0
name: octopus-agent-RELEASE-NAME-pvc
spec:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: 8.2.2540
app.kubernetes.io/version: 8.2.2585
helm.sh/chart: kubernetes-agent-2.9.0
name: octopus-agent-tentacle
namespace: NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -266,4 +266,4 @@ tests:
asserts:
- equal:
path: spec.template.spec.containers[0].image
value: "octopusdeploy/kubernetes-agent-tentacle:8.2.2540-bullseye-slim"
value: "octopusdeploy/kubernetes-agent-tentacle:8.2.2585-bullseye-slim"
2 changes: 1 addition & 1 deletion charts/kubernetes-agent/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ agent:
image:
repository: octopusdeploy/kubernetes-agent-tentacle
pullPolicy: IfNotPresent
tag: "8.2.2540"
tag: "8.2.2585"
tagSuffix: ""

# -- Credentials used during agent-upgrade tasks. To be populated if encountering rate-limiting failures.
Expand Down

0 comments on commit 58af1f2

Please sign in to comment.