chore(bors): merge pull request #471

471: Add partial rebuild disable and various fixes r=tiagolobocastro a=tiagolobocastro feat(helm): add var to disable partial rebuilds Signed-off-by: Tiago Castro <tiagolobocastro@gmail.com> Co-authored-by: Tiago Castro <tiagolobocastro@gmail.com>
openebs · Apr 10, 2024 · b9c0d3c · b9c0d3c
2 parents 3bfbe4c + e773891
commit b9c0d3c
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 4 deletions.
diff --git a/chart/templates/mayastor/agents/core/agent-core-deployment.yaml b/chart/templates/mayastor/agents/core/agent-core-deployment.yaml
@@ -63,6 +63,9 @@ spec:
             - "--ansi-colors={{ .Values.base.logging.color }}"
             - "--create-volume-limit={{ .Values.agents.core.maxCreateVolume }}"{{ if .Values.agents.core.maxRebuilds }}
             - "--max-rebuilds={{ .Values.agents.core.maxRebuilds }}"{{ end }}
+            {{- if .Values.agents.core.partialRebuildDisable }}
+            - "--disable-partial-rebuild"
+            {{- end }}
           ports:
             - containerPort: 50051
           env:

diff --git a/chart/values.yaml b/chart/values.yaml
@@ -179,6 +179,8 @@ agents:
     # faster depending on the log size. Otherwise, the replica will be fully rebuilt.
     # A blank value "" means internally derived value will be used.
     partialRebuildWaitPeriod: ""
+    # Set to true to disable partial rebuilds.
+    partialRebuildDisable:
     # The maximum number of system-wide rebuilds permitted at any given time.
     # If set to an empty string, there are no limits.
     maxRebuilds: ""

diff --git a/dependencies/control-plane b/dependencies/control-plane
diff --git a/scripts/helm/publish-chart-yaml.sh b/scripts/helm/publish-chart-yaml.sh
@@ -395,8 +395,8 @@ if [ -n "$CHECK_BRANCH" ]; then
   elif [ -n "$DEVELOP_TO_REL" ]; then
     if [ "$CHART_VERSION" == "0.0.0" ]; then
       output_yaml "$APP_TAG" "$APP_TAG" "${CHECK_BRANCH////-}" "Always"
-    else
-      die "ERROR: source chart is not from develop branch"
+    elif [ "$CHART_VERSION" != "$APP_TAG" ]; then
+      die "ERROR: Already on $CHART_VERSION which does not match $APP_TAG"
     fi
     exit 0
   fi

diff --git a/scripts/helm/test-publish-chart-yaml.sh b/scripts/helm/test-publish-chart-yaml.sh
@@ -55,13 +55,21 @@ NEW_CHART_VERSION: $NEW_CHART_VERSION
 NEW_CHART_APP_VERSION: $NEW_CHART_APP_VERSION
 EOF
     elif [ -n "$DEVELOP_TO_REL" ]; then
-      cat <<EOF
+      if [ -n "$NEW_CHART_VERSION" ]; then
+        cat <<EOF
 APP_TAG: $APP_TAG
 CHART_VERSION: $CHART_VERSION
 CHART_APP_VERSION: $CHART_APP_VERSION
 NEW_CHART_VERSION: $NEW_CHART_VERSION
 NEW_CHART_APP_VERSION: $NEW_CHART_APP_VERSION
 EOF
+      else
+        cat <<EOF
+APP_TAG: $APP_TAG
+CHART_VERSION: $CHART_VERSION
+CHART_APP_VERSION: $CHART_APP_VERSION
+EOF
+      fi
     else
       cat <<EOF
 APP_TAG: $APP_TAG
@@ -267,6 +275,13 @@ NEW_CHART_VERSION=2.0.1
 NEW_CHART_APP_VERSION=2.0.1
 test_one "Upgrade from develop to release"
 
+CHECK_BRANCH=release/2.0.1
+DEVELOP_TO_REL=1
+APP_TAG=2.0.1
+CHART_VERSION=2.0.1
+CHART_APP_VERSION=2.0.1
+test_one "Already on release, no new version"
+
 APP_TAG=2.0.0-a.0
 CHART_VERSION=2.0.0
 CHART_APP_VERSION=2.0.0