Merge pull request opensandbox-group#673 from Pangjiping/feat/bump-versions

bump ingress gateway to 1.0.6

Author: ninan-nn

.github/workflows/publish-server.yml

@@ -104,3 +104,54 @@ jobs:
         run: |
           chmod +x build.sh
           ./build.sh
+
+  bump-server-chart:
+    if: startsWith(github.ref, 'refs/tags/server/v')
+    needs: publish-image
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v6
+
+      - name: Parse tag and set variables
+        id: parse_tag
+        run: |
+          TAG_PATH="${{ github.ref }}"
+          TAG_PATH="${TAG_PATH#refs/tags/}"
+          IMAGE_TAG="${TAG_PATH#server/}"
+          if [ -z "$IMAGE_TAG" ]; then
+            echo "failed to parse image tag from $TAG_PATH" >&2
+            exit 1
+          fi
+          echo "image_tag=$IMAGE_TAG" >> $GITHUB_OUTPUT
+
+      - name: Bump server chart image tag
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          IMAGE_TAG="${{ steps.parse_tag.outputs.image_tag }}"
+          if [[ "$IMAGE_TAG" =~ ^v ]]; then
+            VERSION="$IMAGE_TAG"
+          else
+            VERSION="v${IMAGE_TAG}"
+          fi
+
+          chmod +x scripts/bump-server-chart.sh
+          ./scripts/bump-server-chart.sh "$VERSION"
+
+          BRANCH="bump/server-chart-${VERSION}"
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git checkout -b "$BRANCH"
+          git add kubernetes/charts/opensandbox-server/values.yaml
+          git diff --staged --quiet && echo "No changes to commit" && exit 0
+          git commit -m "chore(chart): bump opensandbox-server image to ${VERSION}"
+          git push origin "$BRANCH"
+
+          gh pr create \
+            --title "chore(chart): bump opensandbox-server image to ${VERSION}" \
+            --body "Auto-generated after publishing server image \`${VERSION}\` (tag \`${{ github.ref_name }}\`)." \
+            --base "$(gh api repos/${{ github.repository }} --jq .default_branch)"

kubernetes/charts/opensandbox-server/values.yaml

@@ -14,7 +14,7 @@ server:
   # -- Server image configuration
   image:
     repository: sandbox-registry.cn-zhangjiakou.cr.aliyuncs.com/opensandbox/server
-    tag: "v0.1.8"
+    tag: "v0.1.9"
 
   # -- Number of server replicas
   replicaCount: 2
@@ -38,7 +38,7 @@ server:
     gatewayRouteMode: "header"
     image:
       repository: sandbox-registry.cn-zhangjiakou.cr.aliyuncs.com/opensandbox/ingress
-      tag: "v1.0.5"
+      tag: "v1.0.6"
     replicaCount: 2
     port: 28888
     dataplaneNamespace: "opensandbox"

scripts/bump-component-version.sh

@@ -13,18 +13,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Bump egress or execd image version across the entire project.
+# Bump component image versions across the project (image refs like component:vX.Y.Z).
+# For ingress, also updates gateway image tag in kubernetes/charts/opensandbox-server/values.yaml.
 # Usage: from repo root:
 #   ./scripts/bump-component-version.sh egress v1.0.2
 #   ./scripts/bump-component-version.sh execd v1.0.7
+#   ./scripts/bump-component-version.sh ingress v1.0.6
 #   ./scripts/bump-component-version.sh v1.0.2              # same as: egress v1.0.2
 
 set -euo pipefail
 
 REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
 cd "$REPO_ROOT"
 
-# Parse args: [egress|execd] NEW_VERSION  or  NEW_VERSION (default egress)
+# Parse args: COMPONENT NEW_VERSION  or  NEW_VERSION (default component: egress)
 COMPONENT=""
 NEW_VERSION=""
 if [ $# -eq 1 ]; then
@@ -34,15 +36,16 @@ elif [ $# -eq 2 ]; then
   COMPONENT="$1"
   NEW_VERSION="$2"
 else
-  echo "Usage: $0 [egress|execd] NEW_VERSION" >&2
+  echo "Usage: $0 [egress|execd|ingress|code-interpreter] NEW_VERSION" >&2
   echo "       $0 NEW_VERSION   # bumps egress" >&2
   echo "Example: $0 egress v1.0.2" >&2
   echo "Example: $0 execd 1.0.7" >&2
+  echo "Example: $0 ingress v1.0.6" >&2
   exit 1
 fi
 
 case "$COMPONENT" in
-  egress|execd|code-interpreter) ;;
+  egress|execd|ingress|code-interpreter) ;;
   *)
     echo "Error: unsupported component: $COMPONENT" >&2
     exit 0
@@ -54,6 +57,33 @@ if [[ ! "$NEW_VERSION" =~ ^v ]]; then
   NEW_VERSION="v${NEW_VERSION}"
 fi
 
+updated=0
+
+# Helm values: gateway ingress image uses repository + tag (not ingress:vX in one string).
+CHART_VALUES="kubernetes/charts/opensandbox-server/values.yaml"
+if [ "$COMPONENT" = "ingress" ]; then
+  INGRESS_REPO='repository: sandbox-registry.cn-zhangjiakou.cr.aliyuncs.com/opensandbox/ingress'
+  if [ ! -f "$CHART_VALUES" ]; then
+    echo "Error: missing $CHART_VALUES" >&2
+    exit 1
+  fi
+  if ! grep -qF "$INGRESS_REPO" "$CHART_VALUES"; then
+    echo "Error: expected ingress gateway repository line not found in $CHART_VALUES" >&2
+    exit 1
+  fi
+  tmpfile="$(mktemp)"
+  cp "$CHART_VALUES" "$tmpfile"
+  perl -i -0pe 's{
+    (repository:\s+sandbox-registry\.cn-zhangjiakou\.cr\.aliyuncs\.com/opensandbox/ingress\n
+     \s+tag:\s+")[^"]+(")
+  }{$1'"$NEW_VERSION"'$2}x' "$CHART_VALUES"
+  if ! cmp -s "$CHART_VALUES" "$tmpfile"; then
+    echo "Updated $CHART_VALUES (server.gateway.image tag for ingress)"
+    updated=$((updated + 1))
+  fi
+  rm -f "$tmpfile"
+fi
+
 # Pattern and replacement for this component (e.g. egress:vX.Y.Z -> egress:NEW_VERSION)
 PATTERN="${COMPONENT}:v[0-9]+\.[0-9]+\.[0-9]+"
 REPLACEMENT="${COMPONENT}:${NEW_VERSION}"
@@ -68,8 +98,9 @@ done < <(grep -rEl \
   --exclude-dir=.git --exclude-dir=__pycache__ --exclude-dir=.venv --exclude-dir=node_modules \
   "$PATTERN" . 2>/dev/null || true)
 
-updated=0
-for f in "${files[@]}"; do
+# Iterate without "${files[@]}" on an empty array (bash 3.x + set -u can error).
+for ((i = 0; i < ${#files[@]}; i++)); do
+  f="${files[$i]}"
   [ -f "$f" ] || continue
   case "$f" in
     *RELEASE_NOTES*) continue ;;
@@ -81,7 +112,7 @@ for f in "${files[@]}"; do
 done
 
 if [ "$updated" -eq 0 ]; then
-  echo "No files were updated (no matches for $PATTERN)." >&2
+  echo "No files were updated (nothing matched for component $COMPONENT)." >&2
   exit 1
 fi
 

scripts/bump-server-chart.sh

@@ -0,0 +1,54 @@
+#!/usr/bin/env bash
+# Copyright 2026 Alibaba Group Holding Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Bump server.image.tag in opensandbox-server Helm values (only that field).
+# Usage from repo root:
+#   ./scripts/bump-server-chart.sh v0.1.9
+#   ./scripts/bump-server-chart.sh 0.1.9
+
+set -euo pipefail
+
+REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+cd "$REPO_ROOT"
+
+NEW_VERSION="${1:-}"
+if [ -z "$NEW_VERSION" ]; then
+  echo "Usage: $0 VERSION" >&2
+  exit 1
+fi
+
+if [[ ! "$NEW_VERSION" =~ ^v ]]; then
+  NEW_VERSION="v${NEW_VERSION}"
+fi
+
+FILE="kubernetes/charts/opensandbox-server/values.yaml"
+if [ ! -f "$FILE" ]; then
+  echo "Error: missing $FILE" >&2
+  exit 1
+fi
+
+# Match tag line immediately after opensandbox/server repository (not gateway/ingress).
+SERVER_REPO='repository: sandbox-registry.cn-zhangjiakou.cr.aliyuncs.com/opensandbox/server'
+if ! grep -qF "$SERVER_REPO" "$FILE"; then
+  echo "Error: expected server repository line not found in $FILE" >&2
+  exit 1
+fi
+
+perl -i -0pe 's{
+  (repository:\s+sandbox-registry\.cn-zhangjiakou\.cr\.aliyuncs\.com/opensandbox/server\n
+   \s+tag:\s+")[^"]+(")
+}{$1'"$NEW_VERSION"'$2}x' "$FILE"
+
+echo "Updated $FILE: server.image.tag -> $NEW_VERSION"