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.

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

Pull in latest Tentacle #347

Merged
merged 3 commits into from
Dec 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/quick-mice-leave.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"kubernetes-agent": patch
---

Updated tentacle to resolve errors during calls to 'helm registry login'
6 changes: 4 additions & 2 deletions .github/workflows/kubernetes-agent-publish-chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,9 @@ jobs:

if [[ "${{steps.branch_names.outputs.branch_name}}" != "release-kubernetes-agent-v1" ]]
then
pre_release="-${{steps.branch_names.outputs.branch_name}}-$(date +'%Y%m%d%H%M%S')"
# underscores in branches make for illegal version-string, replace with "-"
cleansed_branch=`echo ${{steps.branch_names.outputs.branch_name}} | sed s/_/-/g`
pre_release="-${cleansed_branch}-$(date +'%Y%m%d%H%M%S')"
fi

full_version="$chart_version$pre_release"
Expand Down Expand Up @@ -143,4 +145,4 @@ jobs:
project: 'Octopus Kubernetes Agent'
release_number: ${{ needs.version_and_package.outputs.CHART_VERSION }}
package_version: ${{ needs.version_and_package.outputs.CHART_VERSION }}
ignore_existing: true
ignore_existing: true
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: "1.19.0"
# This version number should be the same as the agent.image.tag value as this is the primary application version
appVersion: "8.2.2504"
appVersion: "8.2.2514"
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: 1.19.0](https://img.shields.io/badge/Version-1.19.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 8.2.2504](https://img.shields.io/badge/AppVersion-8.2.2504-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: 1.19.0](https://img.shields.io/badge/Version-1.19.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 8.2.2514](https://img.shields.io/badge/AppVersion-8.2.2514-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)

A Helm chart for the Octopus Kubernetes Agent

Expand Down Expand Up @@ -31,7 +31,7 @@ A Helm chart for the Octopus Kubernetes Agent
| agent.debug.disableAutoPodCleanup | bool | `false` | Disables automatic pod cleanup |
| agent.defaultNamespace | string | `""` | The default Kubernetes namespace for deployments |
| 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.2504","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.2514","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.2504
app.kubernetes.io/version: 8.2.2514
helm.sh/chart: kubernetes-agent-1.19.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.2504
app.kubernetes.io/version: 8.2.2514
helm.sh/chart: kubernetes-agent-1.19.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.2504
app.kubernetes.io/version: 8.2.2514
helm.sh/chart: kubernetes-agent-1.19.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.2504
app.kubernetes.io/version: 8.2.2514
helm.sh/chart: kubernetes-agent-1.19.0
spec:
affinity:
Expand Down Expand Up @@ -100,7 +100,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.2504
image: octopusdeploy/kubernetes-agent-tentacle:8.2.2514
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.2504
app.kubernetes.io/version: 8.2.2514
helm.sh/chart: kubernetes-agent-1.19.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.2504
app.kubernetes.io/version: 8.2.2514
helm.sh/chart: kubernetes-agent-1.19.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.2504-bullseye-slim"
value: "octopusdeploy/kubernetes-agent-tentacle:8.2.2514-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 @@ -103,7 +103,7 @@ agent:
image:
repository: octopusdeploy/kubernetes-agent-tentacle
pullPolicy: IfNotPresent
tag: "8.2.2504"
tag: "8.2.2514"
tagSuffix: ""

# -- Credentials used during agent-upgrade tasks. To be populated if encountering rate-limiting failures.
Expand Down
1 change: 1 addition & 0 deletions tests/kubernetes-agent/KubernetesAgent.sln.DotSettings
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,7 @@
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpRenamePlacementToArrangementMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002EMemberReordering_002EMigrations_002ECSharpFileLayoutPatternRemoveIsAttributeUpgrade/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAlwaysTreatStructAsNotReorderableMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
Expand Down
Loading