From ef0ac2f252410cecc8ad107305f7e77437c76d09 Mon Sep 17 00:00:00 2001
From: Ruslan Aliev <raliev@mirantis.com>
Date: Mon, 20 Jun 2022 16:50:24 -0500
Subject: [PATCH] Bump helm version from 3.6.3 to 3.8.2

Also bump k8s dependency to v1.23.

Signed-off-by: Ruslan Aliev <raliev@mirantis.com>
Change-Id: I188788a41419184cc3dd9172f54ab3a290cabe83
---
 .zuul.yaml                  | 1 -
 Makefile                    | 2 +-
 doc/source/conf.py          | 2 +-
 releasenotes/source/conf.py | 2 +-
 requirements.txt            | 2 +-
 setup.py                    | 6 +++++-
 test-requirements.txt       | 1 +
 tools/helm_install.sh       | 2 +-
 8 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index bcbe52da..2b4c27ec 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -13,7 +13,6 @@
 - project:
     templates:
       - openstack-cover-jobs
-      - openstack-python35-jobs
       - openstack-python36-jobs
     check:
       jobs:
diff --git a/Makefile b/Makefile
index a8a710c0..4489bc13 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.6.3-linux-amd64.tar.gz
+HELM_ARTIFACT_URL ?= https://get.helm.sh/helm-v3.8.2-linux-amd64.tar.gz
 
 # VERSION INFO
 GIT_COMMIT = $(shell git rev-parse HEAD)
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 6ed6273d..b4826c71 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -78,7 +78,7 @@ author = 'The Airship Authors'
 #
 # This is also used if you do content translation via gettext catalogs.
 # Usually you set "language" from the command line for these cases.
-language = None
+language = 'en'
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index 92672948..1fe81bb9 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -63,7 +63,7 @@ master_doc = 'index'
 #
 # This is also used if you do content translation via gettext catalogs.
 # Usually you set "language" from the command line for these cases.
-language = None
+language = 'en'
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
diff --git a/requirements.txt b/requirements.txt
index 0559ce77..5ac48014 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<23,>=17.0.0
+kubernetes<24,>=23.0.0; python_version >= '3.6'
 Paste>=2.0.3
 PasteDeploy>=1.5.2
 pylibyaml~=0.1
diff --git a/setup.py b/setup.py
index 7d9b6948..49d30720 100644
--- a/setup.py
+++ b/setup.py
@@ -5,4 +5,8 @@ try:
 except ImportError:
     pass
 
-setuptools.setup(setup_requires=['pbr>=2.0.0'], pbr=True)
+setuptools.setup(
+    package_data={'armada': ['schemas/*.yaml']},
+    include_package_data=True,
+    setup_requires=['pbr>=2.0.0'],
+    pbr=True)
diff --git a/test-requirements.txt b/test-requirements.txt
index 3108c65b..a2c50d41 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -20,3 +20,4 @@ flake8-import-order==0.18.1
 grpcio-tools==1.16.0
 typing-extensions==3.7.2
 cmd2==1.5.0
+stestr
diff --git a/tools/helm_install.sh b/tools/helm_install.sh
index 730d1413..364d2805 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.6.3-linux-amd64.tar.gz"}
+HELM_ARTIFACT_URL=${HELM_ARTIFACT_URL:-"https://get.helm.sh/helm-v3.8.2-linux-amd64.tar.gz"}
 
 
 function install_helm_binary {