Merge branch 'main' into fguo-dev

kaito-project · Mar 4, 2024 · 4169297 · 4169297
2 parents 9c05cb1 + d930630
commit 4169297
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 27 deletions.
diff --git a/.github/workflows/build-publish-image.yml b/.github/workflows/build-publish-image.yml
@@ -2,6 +2,7 @@ name: Create, Scan and Publish KAITO image
 on:
   pull_request:
     branches:
+      - main
       - release-**
     types: [ closed ]
 
@@ -36,7 +37,7 @@ jobs:
     steps:
       - id: get-tag
         name: Get tag
-        run: echo "IMG_TAG=$(echo ${{ github.event.pull_request.head.ref }} | tr -d release-)" >> $GITHUB_OUTPUT
+        run: echo "IMG_TAG=$(echo ${{ github.event.pull_request.head.ref }} | tr -d release-)" >> $GITHUB_ENV
       - uses: actions/checkout@v4
         with:
           submodules: true
@@ -73,9 +74,9 @@ jobs:
           TRIVY_USERNAME: ${{ github.actor }}
           TRIVY_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: 'Dispatch tag to e2e test'
+      - name: 'Dispatch release tag'
         uses: peter-evans/repository-dispatch@v1
         with:
-          token: ${{ secrets.PAT }}
+          token: ${{ secrets.GITHUB_TOKEN }}
           event-type: release-tag
-          client-payload: '{"isRelease": true,"registry": "$${{ env.REGISTRY }}","tag": "${{ env.IMG_TAG }}"}'
+          client-payload: '{"isRelease": true,"registry": "$${{ env.REGISTRY }}","tag": "v${{ env.IMG_TAG }}"}'
diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
@@ -4,6 +4,9 @@ on:
     workflows: [ "Create, Scan and Publish KAITO image" ]
     types: [completed]
     branches: [release-**]
+  repository_dispatch:
+    types: [ release-tag ]
+    branches: [ release-** ]
 
 permissions:
   contents: write

diff --git a/.github/workflows/kaito-e2e.yaml b/.github/workflows/kaito-e2e.yaml
@@ -43,15 +43,13 @@ jobs:
           echo "VERSION=${rand}" >> $GITHUB_ENV
           echo "CLUSTER_NAME=kaito${rand}" >> $GITHUB_ENV
           echo "RUN_LLAMA_13B=false" >> $GITHUB_ENV
+          echo "REGISTRY=kaito${rand}.azurecr.io" >> $GITHUB_ENV
 
       - name: Set Registry
+        if: ${{ github.event.client_payload.isRelease }}
         run: |
-            isRelease=${{ github.event.client_payload.isRelease }}
-            if ["$isRelease" = true ] ; then
-              echo "REGISTRY= ${{ github.event.client_payload.registry }}" >> $GITHUB_ENV
-            else
-              echo "REGISTRY=${{ env.CLUSTER_NAME }}" >> $GITHUB_ENV
-            fi
+              echo "REGISTRY=${{ github.event.client_payload.registry }}" >> $GITHUB_ENV
+              echo "VERSION=$(echo ${{ github.event.client_payload.tag }} | tr -d v)" >> $GITHUB_ENV
 
       - name: Set up Go ${{ env.GO_VERSION }}
         uses: actions/setup-go@v5
@@ -111,7 +109,7 @@ jobs:
         run: |
           make docker-build-kaito
         env:
-          REGISTRY: ${{ env.REGISTRY }}.azurecr.io
+          REGISTRY: ${{ env.REGISTRY }}
           VERSION: ${{ env.VERSION }}
 
       - name: create cluster
@@ -161,7 +159,7 @@ jobs:
         env:
           AZURE_RESOURCE_GROUP: ${{ env.CLUSTER_NAME }}
           AZURE_CLUSTER_NAME: ${{ env.CLUSTER_NAME }}
-          REGISTRY: ${{ env.REGISTRY }}.azurecr.io
+          REGISTRY: ${{ env.REGISTRY }}
           VERSION: ${{ env.VERSION }}
 
       - name: Add Secret Credentials

diff --git a/.github/workflows/publish-image-acr.yml b/.github/workflows/publish-image-acr.yml
@@ -61,21 +61,18 @@ jobs:
     steps:
       - id: get-tag
         name: Get tag
-        run: echo "IMG_TAG=$(echo ${{ needs.check-tag.outputs.tag }} )" >> $GITHUB_ENV
+        run: echo "IMG_TAG=$(echo ${{ needs.check-tag.outputs.tag }} | tr -d v)" >> $GITHUB_ENV
 
       - name: Set up Go ${{ env.GO_VERSION }}
         uses: actions/setup-go@v5
         with:
           go-version: ${{ env.GO_VERSION  }}
-      - name: 'Set Image Tag'
-        run: |
-          echo "REPO_TAG=$(echo ${{ needs.check-tag.outputs.tag }} | tr -d v)" >> $GITHUB_ENV
-          
+
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
           submodules: true
-          ref: ${{ env.REPO_TAG }}
+          ref: ${{ needs.check-tag.outputs.tag }}
 
       - name: 'Build Image'
         run: |
@@ -103,7 +100,7 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           event-type: release-tag
-          client-payload: '{"isRelease": true,"registry": "${{ secrets.KAITO_MCR_REGISTRY }}/unlisted/aks/kaito","tag": "${{ env.IMG_TAG }}"}'
+          client-payload: '{"isRelease": true,"registry": "mcr.microsoft.com/aks/kaito","tag": "${{ needs.check-tag.outputs.tag }}"}'
 
       ## push to MCR
       - name: 'Az CLI login'

diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@
 # Image URL to use all building/pushing image targets
 REGISTRY ?= YOUR_REGISTRY
 IMG_NAME ?= workspace
-VERSION ?= v0.1.0
+VERSION ?= v0.2.0
 IMG_TAG ?= $(subst v,,$(VERSION))
 
 ROOT_DIR := $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))

diff --git a/README.md b/README.md
@@ -4,9 +4,10 @@
 ![GitHub go.mod Go version](https://img.shields.io/github/go-mod/go-version/Azure/kaito)
 [![codecov](https://codecov.io/gh/Azure/kaito/graph/badge.svg?token=XAQLLPB2AR)](https://codecov.io/gh/Azure/kaito)
 
-| ![notification](docs/img/bell.svg) What is NEW!|
-|---------------------------------------------------------------------------------------------|
-| First Release: Nov 15th, 2023. Kaito v0.1.0.                                               |
+| ![notification](docs/img/bell.svg) What is NEW! |
+|-------------------------------------------------|
+| First Release: Nov 15th, 2023. Kaito v0.1.0.    |
+| March 1st, 2024. Kaito v0.2.0.                  | 
 
 Kaito is an operator that automates the AI/ML inference model deployment in a Kubernetes cluster.
 The target models are popular large open-sourced inference models such as [falcon](https://huggingface.co/tiiuae) and [llama 2](https://github.com/facebookresearch/llama).

diff --git a/charts/kaito/workspace/Chart.yaml b/charts/kaito/workspace/Chart.yaml
@@ -12,7 +12,7 @@ version: 0.1.0
 # 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: "0.1.0"
+appVersion: "0.2.0"
 home: https://github.com/Azure/kaito
 sources:
   - https://github.com/Azure/kaito

diff --git a/charts/kaito/workspace/README.md b/charts/kaito/workspace/README.md
@@ -5,7 +5,7 @@
 ```bash
 export REGISTRY=<your_docker_registry>
 export IMG_NAME=workspace
-export IMG_TAG=0.1.0
+export IMG_TAG=0.2.0
 helm install workspace ./charts/kaito/workspace  --set image.repository=${REGISTRY}/$(IMG_NAME) --set image.tag=$(IMG_TAG)
 ```
 
@@ -16,7 +16,7 @@ helm install workspace ./charts/kaito/workspace  --set image.repository=${REGIST
 | affinity                                 | object | `{}`                              |             |
 | image.pullPolicy                         | string | `"IfNotPresent"`                  |             |
 | image.repository                         | string | `"ghcr.io/azure/kaito/workspace"` |             |
-| image.tag                                | string | `"0.1.0"`                         |             |
+| image.tag                                | string | `"0.2.0"`                         |             |
 | imagePullSecrets                         | list   | `[]`                              |             |
 | nodeSelector                             | object | `{}`                              |             |
 | podAnnotations                           | object | `{}`                              |             |

diff --git a/charts/kaito/workspace/values.yaml b/charts/kaito/workspace/values.yaml
@@ -5,7 +5,7 @@ replicaCount: 1
 image:
   repository: mcr.microsoft.com/aks/kaito/workspace
   pullPolicy: IfNotPresent
-  tag: 0.1.0
+  tag: 0.2.0
 imagePullSecrets: []
 podAnnotations: {}
 podSecurityContext: