fix: use new-style env command

.github/workflows/e2e.yaml

@@ -0,0 +1,234 @@
+name: e2e
+on:
+  issue_comment:
+    types: [created]
+
+env:
+  E2E_CHECK_NAME: e2e tests
+
+jobs:
+  triage:
+    runs-on: ubuntu-latest
+    name: Comment evaluate
+    outputs:
+      run-e2e: ${{ startsWith(github.event.comment.body,'/run-e2e') && steps.checkUserMember.outputs.isTeamMember == 'true' }}
+      is-debug: ${{ startsWith(github.event.comment.body,'/run-e2e debug') && steps.checkUserMember.outputs.isTeamMember == 'true' }}
+      pr_num: ${{ steps.parser.outputs.pr_num }}
+      image_tag: "pr-${{ steps.parser.outputs.pr_num }}-${{ steps.parser.outputs.commit_sha }}"
+      commit_sha: ${{ steps.parser.outputs.commit_sha }}
+      version_buildflags: ${{ steps.parser.outputs.version_buildflags }}
+      image_build_hash: ${{ steps.parser.outputs.image_build_hash }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: tspascoal/get-user-teams-membership@v2
+        id: checkUserMember
+        with:
+          username: ${{ github.actor }}
+          team: 'dev'
+          GITHUB_TOKEN: ${{ secrets.GH_CHECKING_USER_AUTH }}
+
+      - name: Update comment with the execution url
+        if: ${{ startsWith(github.event.comment.body,'/run-e2e') && steps.checkUserMember.outputs.isTeamMember == 'true' }}
+        uses: peter-evans/create-or-update-comment@v2
+        with:
+          comment-id: ${{ github.event.comment.id }}
+          body: |
+            **Update:** You can check the progress [here](https://github.com/${{github.repository}}/actions/runs/${{github.run_id}})
+          reactions: rocket
+
+      - name: Parse git info
+        if: ${{ startsWith(github.event.comment.body,'/run-e2e') && steps.checkUserMember.outputs.isTeamMember == 'true' }}
+        id: parser
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          # Get PR number
+          PR_URL="${{ github.event.issue.pull_request.url }}"
+          PR_NUM=${PR_URL##*/}
+          echo "Checking out from PR #$PR_NUM based on URL: $PR_URL"
+          echo "::set-output name=pr_num::$PR_NUM"
+          # Get commit SHA
+          git config --global --add safe.directory "$GITHUB_WORKSPACE"
+          gh pr checkout $PR_NUM
+          SHA=$(git log -n 1 --pretty=format:"%H")
+          echo "::set-output name=commit_sha::$SHA"
+          GIT_COMMIT=$(git describe --match=NeVeRmAtCh --tags --always --dirty | cut -c 1-7)
+          BUILD_DATE=$(date -u +%Y-%m-%dT%H:%M:%SZ)
+          VERSION=$(git describe --tags `git rev-list --tags --max-count=1` | sed 's/v\(\)/\1/')
+          PKG=github.com/bentoml/yatai-image-builder
+          VERSION_BUILDFLAGS="-X '${PKG}/version.GitCommit=${GIT_COMMIT}' -X '${PKG}/version.Version=${VERSION}' -X '${PKG}/version.BuildDate=${BUILD_DATE}'"
+          echo "::set-output name=version_buildflags::$VERSION_BUILDFLAGS"
+          echo "::set-output name=image_build_hash::${{ hashFiles('Dockerfile', 'main.go', './apis/**', './controllers/**', './utils/**', './version/**', './yatai-client/**', '**/go.sum', '**go.mod') }}"
+
+  build-test-images:
+    needs: triage
+    if: needs.triage.outputs.run-e2e == 'true'
+    runs-on: ubuntu-latest
+    steps:
+    - name: Set status in-progress
+      uses: LouisBrunner/[email protected]
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        sha: ${{ needs.triage.outputs.commit_sha }}
+        name: ${{ env.E2E_CHECK_NAME }}
+        status: in_progress
+        details_url: https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}
+
+    - uses: actions/checkout@v3
+
+    - name: Register workspace path
+      run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
+
+    - name: Checkout Pull Request
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      id: checkout
+      run: |
+        gh pr checkout ${{ needs.triage.outputs.pr_num }}
+
+    - name: Set up Docker Buildx
+      id: buildx
+      # Use the action from the master, as we've seen some inconsistencies with @v1
+      # Issue: https://github.com/docker/build-push-action/issues/286
+      uses: docker/setup-buildx-action@master
+      with:
+        install: true
+
+    - name: Login to Quay.io
+      uses: docker/login-action@v1
+      with:
+        registry: quay.io
+        username: ${{ secrets.QUAY_USERNAME }}
+        password: ${{ secrets.QUAY_ROBOT_TOKEN }}
+
+    - name: Cache Docker layers
+      uses: actions/cache@v2
+      with:
+        path: /tmp/.buildx-cache
+        # Key is named differently to avoid collision
+        key: ${{ runner.os }}-multi-buildx-${{ needs.triage.outputs.image_build_hash }}
+        restore-keys: |
+          ${{ runner.os }}-multi-buildx
+
+    - name: Build test image
+      uses: docker/build-push-action@v2
+      with:
+        build-args: 'VERSION_BUILDFLAGS=${{ needs.triage.outputs.version_buildflags }}'
+        context: .
+        push: true
+        tags: quay.io/bentoml/test-yatai-image-builder:${{ needs.triage.outputs.image_tag }}
+        cache-from: type=local,src=/tmp/.buildx-cache
+        # Note the mode=max here
+        # More: https://github.com/moby/buildkit#--export-cache-options
+        # And: https://github.com/docker/buildx#--cache-tonametypetypekeyvalue
+        cache-to: type=local,mode=max,dest=/tmp/.buildx-cache-new
+
+    - name: Move cache
+      run: |
+        rm -rf /tmp/.buildx-cache
+        mv /tmp/.buildx-cache-new /tmp/.buildx-cache
+
+  run-test:
+    needs: [triage, build-test-images]
+    if: needs.triage.outputs.run-e2e == 'true'
+    runs-on: ubuntu-latest
+    steps:
+    - name: Set status in-progress
+      uses: LouisBrunner/[email protected]
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        sha: ${{ needs.triage.outputs.commit_sha }}
+        name: ${{ env.E2E_CHECK_NAME }}
+        status: in_progress
+        details_url: https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}
+
+    - name: Checkout
+      uses: actions/checkout@v3
+
+    - name: Register workspace path
+      run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
+
+    - name: Checkout Pull Request
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      id: checkout
+      run: |
+        gh pr checkout ${{ needs.triage.outputs.pr_num }}
+
+    - name: Install KinD
+      run: ./tests/gh-actions/install_kind.sh
+
+    - name: Install Helm
+      run: ./tests/gh-actions/install_helm.sh
+
+    - name: Create KinD Cluster
+      run: kind create cluster --config tests/gh-actions/kind-cluster-1-24.yaml
+
+    - uses: oNaiPs/secrets-to-env-action@v1
+      with:
+        secrets: ${{ toJSON(secrets) }}
+
+    - name: Install yatai-image-builder
+      continue-on-error: true
+      id: install-yatai-image-builder
+      env:
+        YATAI_IMAGE_BUILDER_IMG_REPO: test-yatai-image-builder
+        YATAI_IMAGE_BUILDER_IMG_TAG: ${{ needs.triage.outputs.image_tag }}
+      run: |
+        ./tests/e2e/installation_test.sh
+
+    - name: Setup upterm session
+      uses: lhotari/action-upterm@v1
+      if: needs.triage.outputs.is-debug == 'true'
+      with:
+        ## limits ssh access and adds the ssh public key for the user which triggered the workflow
+        limit-access-to-actor: true
+        ## limits ssh access and adds the ssh public keys of the listed GitHub users
+        limit-access-to-users: yetone
+
+    - name: Run e2e test
+      continue-on-error: true
+      id: test
+      if: steps.install-yatai-image-builder.outcome == 'success'
+      env:
+        DEBUG: ${{ needs.triage.outputs.is-debug }}
+      run: |
+        make test-e2e
+
+    - name: Set status success
+      uses: LouisBrunner/[email protected]
+      if: steps.test.outcome == 'success' && steps.install-yatai-image-builder.outcome == 'success'
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        sha: ${{ needs.triage.outputs.commit_sha }}
+        name: ${{ env.E2E_CHECK_NAME }}
+        conclusion: success
+        details_url: https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}
+
+    - name: React to comment with success
+      uses: dkershner6/reaction-action@v1
+      if: steps.test.outcome == 'success' && steps.install-yatai-image-builder.outcome == 'success'
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        commentId: ${{ github.event.comment.id }}
+        reaction: "hooray"
+
+    - name: React to comment with failure
+      uses: dkershner6/reaction-action@v1
+      if: steps.test.outcome != 'success' || steps.install-yatai-image-builder.outcome != 'success'
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        commentId: ${{ github.event.comment.id }}
+        reaction: "confused"
+
+    - name: Set status failure
+      uses: LouisBrunner/[email protected]
+      if: steps.test.outcome != 'success' || steps.install-yatai-image-builder.outcome != 'success'
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        sha: ${{ needs.triage.outputs.commit_sha }}
+        name: ${{ env.E2E_CHECK_NAME }}
+        conclusion: failure
+        details_url: https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}

.github/workflows/lint.yaml

@@ -75,6 +75,10 @@ jobs:
       - name: Set up chart-testing
         uses: helm/[email protected]
 
-      - name: Render Helm Template
+      - name: Render yatai-image-builder-crds Helm Template
+        working-directory: ./helm/yatai-image-builder-crds
+        run: make template
+
+      - name: Render yatai-image-builder Helm Template
         working-directory: ./helm/yatai-image-builder
         run: make template

.github/workflows/release.yaml

@@ -67,15 +67,31 @@ jobs:
               echo ::set-output name=match::true
           fi
 
-      - name: Package, Index and Publish to public repo
+      - name: Package, Index and Publish yatai-image-builder-crds to public repo
+        working-directory: ./helm/yatai-image-builder-crds
+        if: steps.check-tag.outputs.match != 'true'
+        env:
+          VERSION: ${{ steps.tag.outputs.tag }}
+          API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }}
+        run: make release
+
+      - name: Package, Index and Publish yatai-image-builder-crds to devel repo
+        working-directory: ./helm/yatai-image-builder-crds
+        if: steps.check-tag.outputs.match == 'true'
+        env:
+          VERSION: ${{ steps.tag.outputs.tag }}
+          API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }}
+        run: make release-devel
+
+      - name: Package, Index and Publish yatai-image-builder to public repo
         working-directory: ./helm/yatai-image-builder
         if: steps.check-tag.outputs.match != 'true'
         env:
           VERSION: ${{ steps.tag.outputs.tag }}
           API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }}
         run: make release
 
-      - name: Package, Index and Publish to devel repo
+      - name: Package, Index and Publish yatai-image-builder to devel repo
         working-directory: ./helm/yatai-image-builder
         if: steps.check-tag.outputs.match == 'true'
         env:

Dockerfile-kaniko

@@ -0,0 +1 @@
+FROM gcr.io/kaniko-project/executor:debug

Makefile

@@ -95,6 +95,7 @@ help: ## Display this help.
 .PHONY: manifests
 manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
 	$(CONTROLLER_GEN) rbac:roleName=manager-role crd webhook paths="./..." output:crd:artifacts:config=config/crd/bases
+	$(KUSTOMIZE) build config/crd > helm/yatai-image-builder-crds/templates/bentorequest.yaml
 
 .PHONY: generate
 generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
@@ -112,6 +113,10 @@ vet: ## Run go vet against code.
 test: manifests generate fmt vet envtest ## Run tests.
 	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" go test ./... -coverprofile cover.out
 
+.PHONY: test-e2e # You will need to have a Kind cluster up in running to run this target
+test-e2e:
+	go test ./tests/e2e/ -v -ginkgo.v -timeout 20m
+
 ##@ Build
 
 .PHONY: build
@@ -167,7 +172,7 @@ ENVTEST ?= $(LOCALBIN)/setup-envtest
 
 ## Tool Versions
 KUSTOMIZE_VERSION ?= v3.8.7
-CONTROLLER_TOOLS_VERSION ?= v0.9.2
+CONTROLLER_TOOLS_VERSION ?= v0.14.0
 
 KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
 .PHONY: kustomize
@@ -250,3 +255,6 @@ start-dev:
 
 stop-dev:
 	kubectl -n yatai-image-builder patch deploy/yatai-image-builder -p '{"spec":{"replicas":1}}'
+
+build-kaniko-image:
+	docker buildx build --platform linux/amd64,linux/arm64 -t quay.io/bentoml/kaniko:debug -f Dockerfile-kaniko --push .

apis/resources/v1alpha1/bento_types.go

@@ -18,6 +18,7 @@ package v1alpha1
 
 import (
 	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -35,8 +36,9 @@ type BentoContext struct {
 
 type BentoModel struct {
 	// +kubebuilder:validation:Required
-	Tag         string `json:"tag"`
-	DownloadURL string `json:"downloadUrl,omitempty"`
+	Tag         string             `json:"tag"`
+	DownloadURL string             `json:"downloadUrl,omitempty"`
+	Size        *resource.Quantity `json:"size,omitempty"`
 }
 
 type BentoRunner struct {
@@ -54,9 +56,11 @@ type BentoSpec struct {
 	// +kubebuilder:validation:Required
 	Tag string `json:"tag"`
 	// +kubebuilder:validation:Required
-	Image   string        `json:"image"`
-	Context BentoContext  `json:"context,omitempty"`
-	Runners []BentoRunner `json:"runners,omitempty"`
+	Image       string        `json:"image"`
+	ServiceName string        `json:"serviceName,omitempty"`
+	Context     *BentoContext `json:"context,omitempty"`
+	Runners     []BentoRunner `json:"runners,omitempty"`
+	Models      []BentoModel  `json:"models,omitempty"`
 
 	ImagePullSecrets []corev1.LocalObjectReference `json:"imagePullSecrets,omitempty"`
 }