diff --git a/Makefile b/Makefile index 4489bc13..8739aaab 100644 --- a/Makefile +++ b/Makefile @@ -33,7 +33,7 @@ IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TA UBUNTU_BASE_IMAGE ?= # Helm binary download url -HELM_ARTIFACT_URL ?= https://get.helm.sh/helm-v3.8.2-linux-amd64.tar.gz +HELM_ARTIFACT_URL ?= https://get.helm.sh/helm-v3.9.4-linux-amd64.tar.gz # VERSION INFO GIT_COMMIT = $(shell git rev-parse HEAD) diff --git a/armada/exceptions/source_exceptions.py b/armada/exceptions/source_exceptions.py index efa0f363..6c088d78 100644 --- a/armada/exceptions/source_exceptions.py +++ b/armada/exceptions/source_exceptions.py @@ -145,7 +145,7 @@ class ChartSourceException(SourceException): self._chart_name = chart_name self._source_type = source_type - self._message = 'Unknown source type \"' + self._source_type + '\" for \ - chart \"' + self._chart_name + '\"' + self._message = 'Unknown source type \"' + self._source_type +\ + '\" for chart \"' + self._chart_name + '\"' super(ChartSourceException, self).__init__(self._message) diff --git a/armada/tests/unit/api/test_test_controller.py b/armada/tests/unit/api/test_test_controller.py index 296175bc..2a8b2b67 100644 --- a/armada/tests/unit/api/test_test_controller.py +++ b/armada/tests/unit/api/test_test_controller.py @@ -236,8 +236,8 @@ class TestReleasesReleaseNameControllerNegativeRbacTest(base.BaseControllerTest ): @test_utils.attr(type=['negative']) def test_test_release_insufficient_permissions(self): - """Tests the GET /api/v1.0/test/{namespace}/{release} endpoint returns 403 - following failed authorization. + """Tests the GET /api/v1.0/test/{namespace}/{release} endpoint returns + 403 following failed authorization. """ rules = {'armada:test_release': policy_base.RULE_ADMIN_REQUIRED} self.policy.set_rules(rules) diff --git a/requirements.txt b/requirements.txt index 5ac48014..6837d3fa 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ jsonschema>=3.0.1,<4 keystoneauth1>=3.18.0 keystonemiddleware==5.3.0 kombu<4.7,>=4.6.10 -kubernetes<24,>=23.0.0; python_version >= '3.6' +kubernetes~=24.2.0; python_version >= '3.6' Paste>=2.0.3 PasteDeploy>=1.5.2 pylibyaml~=0.1 diff --git a/tools/helm_install.sh b/tools/helm_install.sh index 364d2805..cee81412 100755 --- a/tools/helm_install.sh +++ b/tools/helm_install.sh @@ -17,7 +17,7 @@ set -x HELM=$1 -HELM_ARTIFACT_URL=${HELM_ARTIFACT_URL:-"https://get.helm.sh/helm-v3.8.2-linux-amd64.tar.gz"} +HELM_ARTIFACT_URL=${HELM_ARTIFACT_URL:-"https://get.helm.sh/helm-v3.9.4-linux-amd64.tar.gz"} function install_helm_binary {