diff --git a/.changeset/quick-mice-leave.md b/.changeset/quick-mice-leave.md new file mode 100644 index 00000000..07ca809b --- /dev/null +++ b/.changeset/quick-mice-leave.md @@ -0,0 +1,5 @@ +--- +"kubernetes-agent": patch +--- + +Updated tentacle to resolve errors during calls to 'helm registry login' diff --git a/.github/workflows/kubernetes-agent-publish-chart.yaml b/.github/workflows/kubernetes-agent-publish-chart.yaml index 81bf0799..4751bfeb 100644 --- a/.github/workflows/kubernetes-agent-publish-chart.yaml +++ b/.github/workflows/kubernetes-agent-publish-chart.yaml @@ -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" @@ -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 \ No newline at end of file + ignore_existing: true diff --git a/charts/kubernetes-agent/Chart.yaml b/charts/kubernetes-agent/Chart.yaml index 9d326097..f862a82d 100644 --- a/charts/kubernetes-agent/Chart.yaml +++ b/charts/kubernetes-agent/Chart.yaml @@ -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" diff --git a/charts/kubernetes-agent/README.md b/charts/kubernetes-agent/README.md index c724e99e..db7475f8 100644 --- a/charts/kubernetes-agent/README.md +++ b/charts/kubernetes-agent/README.md @@ -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 @@ -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 | 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 828f9315..64a55a39 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: 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 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 a16f3799..b6310ee0 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: 8.2.2504 + app.kubernetes.io/version: 8.2.2514 helm.sh/chart: kubernetes-agent-1.19.0 name: octopus-agent-scripts 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 108450c5..121974e8 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: 8.2.2504 + app.kubernetes.io/version: 8.2.2514 helm.sh/chart: kubernetes-agent-1.19.0 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: 8.2.2504 + app.kubernetes.io/version: 8.2.2514 helm.sh/chart: kubernetes-agent-1.19.0 spec: affinity: @@ -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: 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 f5df3912..4fc7b48a 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: 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: 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 a1815ed0..5fe0bfd4 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: 8.2.2504 + app.kubernetes.io/version: 8.2.2514 helm.sh/chart: kubernetes-agent-1.19.0 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 cb6054fe..9285e136 100644 --- a/charts/kubernetes-agent/tests/tentacle-deployment_test.yaml +++ b/charts/kubernetes-agent/tests/tentacle-deployment_test.yaml @@ -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" diff --git a/charts/kubernetes-agent/values.yaml b/charts/kubernetes-agent/values.yaml index d31a787e..5b2a2548 100644 --- a/charts/kubernetes-agent/values.yaml +++ b/charts/kubernetes-agent/values.yaml @@ -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. diff --git a/tests/kubernetes-agent/KubernetesAgent.sln.DotSettings b/tests/kubernetes-agent/KubernetesAgent.sln.DotSettings index b58a4c8b..03c232f1 100644 --- a/tests/kubernetes-agent/KubernetesAgent.sln.DotSettings +++ b/tests/kubernetes-agent/KubernetesAgent.sln.DotSettings @@ -309,6 +309,7 @@ True True True + True True True True