airship
/
armada
Code Issues Proposed changes

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
This commit is contained in:
Ruslan Aliev 2022-06-20 16:50:24 -05:00
parent 416eff4e52
commit ef0ac2f252
8 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.zuul.yaml
View File

@ -13,7 +13,6 @@
- project:
templates:
- openstack-cover-jobs
- openstack-python35-jobs
- openstack-python36-jobs
check:
jobs:

2
Makefile
View File

@ -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)

2
doc/source/conf.py
View File

@ -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.

2
releasenotes/source/conf.py
View File

@ -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.

2
requirements.txt
View File

@ -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

6
setup.py
View File

@ -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)

1
test-requirements.txt
View File

@ -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

2
tools/helm_install.sh
View File

@ -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 {