chore(bors): merge pull request #780

780: Cherry pick fixes r=niladrih a=niladrih

Changes:
- Cherry-pick PR 777
- Cherry-pick PR 770
- Cherry-pick PR 781

Co-authored-by: Niladri Halder <niladri.halder26@gmail.com>

Author: mayastor-bors

k8s/upgrade/src/helm/upgrade.rs

@@ -270,8 +270,7 @@ impl HelmUpgraderBuilder {
                 "--set",
                 helm_args_set,
                 "--set-file",
-                helm_args_set_file,
-                "--atomic"
+                helm_args_set_file
             ]);
 
             Ok(Box::new(CoreHelmUpgrader {

nix/pkgs/images/default.nix

@@ -59,7 +59,7 @@ let
     # The repo chart is already prepared.
     if [[ "$(semver validate ${tag})" == "valid" ]] &&
       [[ ! ${tag} =~ ^(v?[0-9]+\.[0-9]+\.[0-9]+-pin-(dev|devrel).([0-9]+))$ ]] &&
-      [[ ! ${tag} =~ ^(v?[0-9]+\.[0-9]+\.[0-9]+-0-(main|release)-unstable(-[0-9]+){6}-0)$ ]]; then
+      [[ ! ${tag} =~ ^(v?[0-9]+\.[0-9]+\.[0-9]+-(main|release)-unstable(-[0-9]+){6})$ ]]; then
       CHART_FILE=build/chart/Chart.yaml build/scripts/helm/publish-chart-yaml.sh --app-tag ${tag} --override-index ""
     fi
 

scripts/helm/publish-chart-yaml.sh

@@ -68,7 +68,7 @@ helm_testing_branch_version() {
     bumped_latest=$(semver bump "$bump" "$latest_version")
   fi
 
-  semver bump prerel 0-"$helm_kind"-unstable-"$DATE_TIME"-0 "$bumped_latest"
+  semver bump prerel "$helm_kind"-unstable-"$DATE_TIME" "$bumped_latest"
 }
 
 # Checks if version is semver and removes "v" from the beginning

scripts/helm/test-publish-chart-yaml.sh

@@ -216,7 +216,7 @@ CHECK_BRANCH=helm-testing/develop
 DATE_TIME=$(date +"$DATE_TIME_FMT")
 LATEST_RELEASE_BRANCH="release/123.456"
 BUMP_MAJOR_FOR_MAIN="false"
-APP_TAG=123.457.0-0-main-unstable-$DATE_TIME-0
+APP_TAG=123.457.0-main-unstable-$DATE_TIME
 CHART_VERSION=0.0.0
 CHART_APP_VERSION=0.0.0
 test_one "helm-testing/develop is special"
@@ -225,7 +225,7 @@ CHECK_BRANCH=helm-testing/develop
 DATE_TIME=$(date +"$DATE_TIME_FMT")
 LATEST_RELEASE_BRANCH="release/123.456"
 BUMP_MAJOR_FOR_MAIN="true"
-APP_TAG=124.0.0-0-main-unstable-$DATE_TIME-0
+APP_TAG=124.0.0-main-unstable-$DATE_TIME
 CHART_VERSION=0.0.0
 CHART_APP_VERSION=0.0.0
 test_one "helm-testing/develop is special"
@@ -235,34 +235,34 @@ HELM_TESTING=helm-testing/develop
 DATE_TIME=$(date +"$DATE_TIME_FMT")
 LATEST_RELEASE_BRANCH="release/123.456"
 BUMP_MAJOR_FOR_MAIN="false"
-APP_TAG=123.457.0-0-main-unstable-$DATE_TIME-0
+APP_TAG=123.457.0-main-unstable-$DATE_TIME
 CHART_VERSION=0.0.0
 CHART_APP_VERSION=0.0.0
-NEW_CHART_VERSION=123.457.0-0-main-unstable-$DATE_TIME-0
-NEW_CHART_APP_VERSION=123.457.0-0-main-unstable-$DATE_TIME-0
+NEW_CHART_VERSION=123.457.0-main-unstable-$DATE_TIME
+NEW_CHART_APP_VERSION=123.457.0-main-unstable-$DATE_TIME
 test_one "helm-testing/develop is special"
 
 CHECK_BRANCH=helm-testing/develop
 HELM_TESTING=helm-testing/develop
 DATE_TIME=$(date +"$DATE_TIME_FMT")
 LATEST_RELEASE_BRANCH="release/123.456"
 BUMP_MAJOR_FOR_MAIN="true"
-APP_TAG=124.0.0-0-main-unstable-$DATE_TIME-0
+APP_TAG=124.0.0-main-unstable-$DATE_TIME
 CHART_VERSION=0.0.0
 CHART_APP_VERSION=0.0.0
-NEW_CHART_VERSION=124.0.0-0-main-unstable-$DATE_TIME-0
-NEW_CHART_APP_VERSION=124.0.0-0-main-unstable-$DATE_TIME-0
+NEW_CHART_VERSION=124.0.0-main-unstable-$DATE_TIME
+NEW_CHART_APP_VERSION=124.0.0-main-unstable-$DATE_TIME
 test_one "helm-testing/develop is special"
 
 CHECK_BRANCH=helm-testing/develop
 HELM_TESTING=helm-testing/develop
 LATEST_RELEASE_BRANCH="release/123.456"
 BUMP_MAJOR_FOR_MAIN="true"
-APP_TAG=124.0.0-0-main-unstable-main-0
+APP_TAG=124.0.0-main-unstable-main
 CHART_VERSION=13.14.15
 CHART_APP_VERSION=13.14.15
-NEW_CHART_VERSION=124.0.0-0-main-unstable-main-0
-NEW_CHART_APP_VERSION=124.0.0-0-main-unstable-main-0
+NEW_CHART_VERSION=124.0.0-main-unstable-main
+NEW_CHART_APP_VERSION=124.0.0-main-unstable-main
 EXPECT_FAIL=1
 test_one "helm-testing/develop is special"