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:
parent
416eff4e52
commit
ef0ac2f252
@ -13,7 +13,6 @@
|
|||||||
- project:
|
- project:
|
||||||
templates:
|
templates:
|
||||||
- openstack-cover-jobs
|
- openstack-cover-jobs
|
||||||
- openstack-python35-jobs
|
|
||||||
- openstack-python36-jobs
|
- openstack-python36-jobs
|
||||||
check:
|
check:
|
||||||
jobs:
|
jobs:
|
||||||
|
2
Makefile
2
Makefile
@ -33,7 +33,7 @@ IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TA
|
|||||||
UBUNTU_BASE_IMAGE ?=
|
UBUNTU_BASE_IMAGE ?=
|
||||||
|
|
||||||
# Helm binary download url
|
# 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
|
# VERSION INFO
|
||||||
GIT_COMMIT = $(shell git rev-parse HEAD)
|
GIT_COMMIT = $(shell git rev-parse HEAD)
|
||||||
|
@ -78,7 +78,7 @@ author = 'The Airship Authors'
|
|||||||
#
|
#
|
||||||
# This is also used if you do content translation via gettext catalogs.
|
# This is also used if you do content translation via gettext catalogs.
|
||||||
# Usually you set "language" from the command line for these cases.
|
# 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
|
# List of patterns, relative to source directory, that match files and
|
||||||
# directories to ignore when looking for source files.
|
# directories to ignore when looking for source files.
|
||||||
|
@ -63,7 +63,7 @@ master_doc = 'index'
|
|||||||
#
|
#
|
||||||
# This is also used if you do content translation via gettext catalogs.
|
# This is also used if you do content translation via gettext catalogs.
|
||||||
# Usually you set "language" from the command line for these cases.
|
# 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
|
# List of patterns, relative to source directory, that match files and
|
||||||
# directories to ignore when looking for source files.
|
# directories to ignore when looking for source files.
|
||||||
|
@ -5,7 +5,7 @@ jsonschema>=3.0.1,<4
|
|||||||
keystoneauth1>=3.18.0
|
keystoneauth1>=3.18.0
|
||||||
keystonemiddleware==5.3.0
|
keystonemiddleware==5.3.0
|
||||||
kombu<4.7,>=4.6.10
|
kombu<4.7,>=4.6.10
|
||||||
kubernetes<23,>=17.0.0
|
kubernetes<24,>=23.0.0; python_version >= '3.6'
|
||||||
Paste>=2.0.3
|
Paste>=2.0.3
|
||||||
PasteDeploy>=1.5.2
|
PasteDeploy>=1.5.2
|
||||||
pylibyaml~=0.1
|
pylibyaml~=0.1
|
||||||
|
6
setup.py
6
setup.py
@ -5,4 +5,8 @@ try:
|
|||||||
except ImportError:
|
except ImportError:
|
||||||
pass
|
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)
|
||||||
|
@ -20,3 +20,4 @@ flake8-import-order==0.18.1
|
|||||||
grpcio-tools==1.16.0
|
grpcio-tools==1.16.0
|
||||||
typing-extensions==3.7.2
|
typing-extensions==3.7.2
|
||||||
cmd2==1.5.0
|
cmd2==1.5.0
|
||||||
|
stestr
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
set -x
|
set -x
|
||||||
|
|
||||||
HELM=$1
|
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 {
|
function install_helm_binary {
|
||||||
|
Loading…
Reference in New Issue
Block a user