diff --git a/.github/workflows/ghcr_deploy.yml b/.github/workflows/ghcr_deploy.yml index f574ec9c20..aa032972b8 100644 --- a/.github/workflows/ghcr_deploy.yml +++ b/.github/workflows/ghcr_deploy.yml @@ -5,6 +5,7 @@ on: inputs: tag: description: "The tag version you want to build" + required: true release_type: description: "The release type you want to build. Can be 'latest', 'stable', 'dev', 'rc'" type: string @@ -336,9 +337,9 @@ jobs: run: | CHART_LIST=$(helm show chart oci://${{ env.REGISTRY }}/${{ env.REPO_OWNER }}/${{ env.CHART_NAME }} 2>/dev/null || true) if [ -z "${CHART_LIST}" ]; then - echo "current-version=0.1.0" | tee -a $GITHUB_OUTPUT + echo "current-version=1.0.0" | tee -a $GITHUB_OUTPUT else - # Extract version and strip any prerelease suffix (e.g., 0.1.827-latest -> 0.1.827) + # Extract version and strip any prerelease suffix (e.g., 1.0.5-latest -> 1.0.5) VERSION=$(printf '%s' "${CHART_LIST}" | grep '^version:' | awk 'BEGIN{FS=":"}{print $2}' | tr -d " " | cut -d'-' -f1) echo "current-version=${VERSION}" | tee -a $GITHUB_OUTPUT fi @@ -350,28 +351,42 @@ jobs: id: bump_version uses: christian-draeger/increment-semantic-version@1.1.0 with: - current-version: ${{ steps.current_version.outputs.current-version || '0.1.0' }} + current-version: ${{ steps.current_version.outputs.current-version || '1.0.0' }} version-fragment: 'bug' # Add suffix for non-stable releases (semantic versioning) - - name: Calculate chart version with prerelease suffix + - name: Calculate chart and app versions id: chart_version shell: bash run: | - BASE_VERSION="${{ steps.bump_version.outputs.next-version || '0.1.0' }}" + BASE_VERSION="${{ steps.bump_version.outputs.next-version || '1.0.0' }}" RELEASE_TYPE="${{ github.event.inputs.release_type }}" + INPUT_TAG="${{ github.event.inputs.tag }}" + + # Chart version (independent Helm chart versioning with release type suffix) if [ "$RELEASE_TYPE" = "stable" ]; then echo "version=${BASE_VERSION}" | tee -a $GITHUB_OUTPUT else echo "version=${BASE_VERSION}-${RELEASE_TYPE}" | tee -a $GITHUB_OUTPUT fi + # App version (must match Docker tags) + # stable/rc releases: Docker creates main-{tag}, so use the tag + # latest/dev releases: Docker only creates main-{release_type}, so use release_type + if [ "$RELEASE_TYPE" = "stable" ] || [ "$RELEASE_TYPE" = "rc" ]; then + APP_VERSION="${INPUT_TAG}" + else + APP_VERSION="${RELEASE_TYPE}" + fi + + echo "app_version=${APP_VERSION}" | tee -a $GITHUB_OUTPUT + - uses: ./.github/actions/helm-oci-chart-releaser with: name: ${{ env.CHART_NAME }} repository: ${{ env.REPO_OWNER }} - tag: ${{ github.event.inputs.chartVersion || steps.chart_version.outputs.version || '0.1.0' }} - app_version: ${{ steps.current_app_tag.outputs.latest_tag }} + tag: ${{ github.event.inputs.chartVersion || steps.chart_version.outputs.version || '1.0.0' }} + app_version: ${{ steps.chart_version.outputs.app_version }} path: deploy/charts/${{ env.CHART_NAME }} registry: ${{ env.REGISTRY }} registry_username: ${{ github.actor }} diff --git a/deploy/charts/litellm-helm/Chart.yaml b/deploy/charts/litellm-helm/Chart.yaml index b77693ba8d..b37597c7c8 100644 --- a/deploy/charts/litellm-helm/Chart.yaml +++ b/deploy/charts/litellm-helm/Chart.yaml @@ -18,13 +18,13 @@ 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.4.10 +version: 1.0.0 # 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. # It is recommended to use it with quotes. -appVersion: v1.50.2 +appVersion: v1.80.12 dependencies: - name: "postgresql"