Bump up vineyard version to v0.13.2

Signed-off-by: Tao He <linzhu.ht@alibaba-inc.com>

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}'.")

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
 

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,
 }

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,27 +196,25 @@ 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')
         )
 
     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
 

setup.cfg

@@ -1,5 +1,5 @@
 [metadata]
-version = 0.13.1
+version = 0.13.2
 
 [pycodestyle]
 max_line_length = 88

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_