From 52d5fa34335e3a33a7f578f8c522186ac2d36da6 Mon Sep 17 00:00:00 2001 From: Tao He Date: Fri, 10 Mar 2023 15:08:52 +0800 Subject: [PATCH] Bump up vineyard version to v0.13.2 Signed-off-by: Tao He --- CMakeLists.txt | 2 +- charts/vineyard-operator/Chart.yaml | 4 ++-- k8s/cmd/main.go | 2 +- python/vineyard/deploy/utils.py | 28 ++++++++++++---------------- setup.cfg | 2 +- src/common/util/config.h | 4 ++-- thirdparty/etcd-cpp-apiv3 | 2 +- 7 files changed, 20 insertions(+), 24 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6ee899a8..c85061a7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.3) set(VINEYARD_MAJOR_VERSION 0) set(VINEYARD_MINOR_VERSION 13) -set(VINEYARD_PATCH_VERSION 1) +set(VINEYARD_PATCH_VERSION 2) set(VINEYARD_VERSION ${VINEYARD_MAJOR_VERSION}.${VINEYARD_MINOR_VERSION}.${VINEYARD_PATCH_VERSION}) message(STATUS "Configuring and building vineyard version '${VINEYARD_VERSION}'.") diff --git a/charts/vineyard-operator/Chart.yaml b/charts/vineyard-operator/Chart.yaml index 68523d38..1bad8893 100644 --- a/charts/vineyard-operator/Chart.yaml +++ b/charts/vineyard-operator/Chart.yaml @@ -24,10 +24,10 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.13.1 +version: 0.13.2 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 0.13.1 +appVersion: 0.13.2 diff --git a/k8s/cmd/main.go b/k8s/cmd/main.go index d4304a26..b289ed98 100644 --- a/k8s/cmd/main.go +++ b/k8s/cmd/main.go @@ -45,7 +45,7 @@ var cmdLong = util.LongDesc(` var cmd = &cobra.Command{ Use: "vineyardctl [command]", - Version: "v0.13.1", + Version: "v0.13.2", Short: "vineyardctl is the command-line tool for working with the Vineyard Operator", Long: cmdLong, } diff --git a/python/vineyard/deploy/utils.py b/python/vineyard/deploy/utils.py index 26cadd09..2294289b 100644 --- a/python/vineyard/deploy/utils.py +++ b/python/vineyard/deploy/utils.py @@ -162,25 +162,23 @@ def find_vineyardd_path(): # find vineyard in the package vineyardd_path = _check_executable( - pkg_resources.resource_filename('vineyard', 'vineyardd') + pkg_resources.resource_filename('vineyard.bdist', 'vineyardd') ) - - if vineyardd_path is None: - vineyardd_path = _check_executable(shutil.which('vineyardd')) - if vineyardd_path is None: vineyardd_path = _check_executable( - os.path.join(current_dir, '..', '..', '..', 'build', 'bin', 'vineyardd') + os.path.join(current_dir, '..', 'bdist', 'vineyardd') ) - if vineyardd_path is None: vineyardd_path = _check_executable(os.path.join(current_dir, '..', 'vineyardd')) if vineyardd_path is None: vineyardd_path = _check_executable( - os.path.join(current_dir, '..', 'bdist', 'vineyardd') + os.path.join(current_dir, '..', '..', '..', 'build', 'bin', 'vineyardd') ) + if vineyardd_path is None: + vineyardd_path = _check_executable(shutil.which('vineyardd')) + __vineyardd_path = vineyardd_path return vineyardd_path @@ -198,17 +196,12 @@ def find_vineyardctl_path(): # find vineyardctl in the package vineyardctl_path = _check_executable( - pkg_resources.resource_filename('vineyard', 'vineyardctl') + pkg_resources.resource_filename('vineyard.bdist', 'vineyardctl') ) - - if vineyardctl_path is None: - vineyardctl_path = _check_executable(shutil.which('vineyardctl')) - if vineyardctl_path is None: vineyardctl_path = _check_executable( - os.path.join(current_dir, '..', '..', '..', 'k8s', 'vineyardctl') + os.path.join(current_dir, '..', 'bdist', 'vineyardctl') ) - if vineyardctl_path is None: vineyardctl_path = _check_executable( os.path.join(current_dir, '..', 'vineyardctl') @@ -216,9 +209,12 @@ def find_vineyardctl_path(): if vineyardctl_path is None: vineyardctl_path = _check_executable( - os.path.join(current_dir, '..', 'bdist', 'vineyardctl') + os.path.join(current_dir, '..', '..', '..', 'k8s', 'vineyardctl') ) + if vineyardctl_path is None: + vineyardctl_path = _check_executable(shutil.which('vineyardctl')) + __vineyardctl_path = vineyardctl_path return vineyardctl_path diff --git a/setup.cfg b/setup.cfg index d6e3601f..cca985b6 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [metadata] -version = 0.13.1 +version = 0.13.2 [pycodestyle] max_line_length = 88 diff --git a/src/common/util/config.h b/src/common/util/config.h index 1809ecfd..4cedb2e6 100644 --- a/src/common/util/config.h +++ b/src/common/util/config.h @@ -18,11 +18,11 @@ limitations under the License. #define VINEYARD_VERSION_MAJOR 0 #define VINEYARD_VERSION_MINOR 13 -#define VINEYARD_VERSION_PATCH 1 +#define VINEYARD_VERSION_PATCH 2 #define VINEYARD_VERSION \ ((VINEYARD_VERSION_MAJOR * 1000) + VINEYARD_VERSION_MINOR) * 1000 + \ VINEYARD_VERSION_PATCH -#define VINEYARD_VERSION_STRING "0.13.1" +#define VINEYARD_VERSION_STRING "0.13.2" #endif // SRC_COMMON_UTIL_CONFIG_H_ diff --git a/thirdparty/etcd-cpp-apiv3 b/thirdparty/etcd-cpp-apiv3 index f774f832..d27f0b9e 160000 --- a/thirdparty/etcd-cpp-apiv3 +++ b/thirdparty/etcd-cpp-apiv3 @@ -1 +1 @@ -Subproject commit f774f832de0978ae92b70479af99af29900610be +Subproject commit d27f0b9e81bd3f1b812d4cf7bd872b7ad1fffbc4