From 3ffceae6cbbe9f03304203a697b83e1b07448197 Mon Sep 17 00:00:00 2001 From: Heba Elayoty Date: Fri, 12 Jul 2024 09:00:33 +0300 Subject: [PATCH] Update qemu image and split oss release from mcr Signed-off-by: Heba Elayoty --- .github/workflows/publish-gh-image.yml | 15 +++++++-- .github/workflows/publish-mcr-image.yml | 12 ------- Makefile | 4 +-- charts/kaito/workspace/README.md | 44 ++++++++++++------------- charts/kaito/workspace/values.yaml | 2 +- 5 files changed, 38 insertions(+), 39 deletions(-) diff --git a/.github/workflows/publish-gh-image.yml b/.github/workflows/publish-gh-image.yml index 4362c9a9d..5ae6af791 100644 --- a/.github/workflows/publish-gh-image.yml +++ b/.github/workflows/publish-gh-image.yml @@ -130,12 +130,23 @@ jobs: E2E_ACR_AMRT_USERNAME: ${{ secrets.ACR_AMRT_USERNAME }} E2E_ACR_AMRT_PASSWORD: ${{ secrets.ACR_AMRT_PASSWORD }} + + create-release: + runs-on: ubuntu-latest + needs: [ run-e2e-gh-image ] + steps: + - name: 'Dispatch release tag' + uses: peter-evans/repository-dispatch@v3 + with: + token: ${{ secrets.GITHUB_TOKEN }} + event-type: create-release + client-payload: '{"tag": "${{ github.event.client_payload.tag }}"}' + publish-mcr-image: runs-on: ubuntu-latest - environment: preset-env needs: [ check-tag, run-e2e-gh-image ] steps: - - name: 'Dispatch release tag' + - name: 'Dispatch mcr image tag' uses: peter-evans/repository-dispatch@v3 with: token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/publish-mcr-image.yml b/.github/workflows/publish-mcr-image.yml index 3f0f52b13..bb0bca924 100644 --- a/.github/workflows/publish-mcr-image.yml +++ b/.github/workflows/publish-mcr-image.yml @@ -65,15 +65,3 @@ jobs: E2E_AMRT_SECRET_NAME: ${{ secrets.AMRT_SECRET_NAME }} E2E_ACR_AMRT_USERNAME: ${{ secrets.ACR_AMRT_USERNAME }} E2E_ACR_AMRT_PASSWORD: ${{ secrets.ACR_AMRT_PASSWORD }} - - create-release: - runs-on: ubuntu-latest - environment: publish-mcr - needs: [ run-e2e-mcr ] - steps: - - name: 'Dispatch release tag' - uses: peter-evans/repository-dispatch@v3 - with: - token: ${{ secrets.GITHUB_TOKEN }} - event-type: create-release - client-payload: '{"tag": "${{ github.event.client_payload.tag }}"}' diff --git a/Makefile b/Makefile index f0bd46c0b..0673f3023 100644 --- a/Makefile +++ b/Makefile @@ -170,13 +170,13 @@ run: manifests generate fmt vet ## Run a controller from your host. ##@ Docker BUILDX_BUILDER_NAME ?= img-builder OUTPUT_TYPE ?= type=registry -QEMU_VERSION ?= 5.2.0-2 +QEMU_VERSION ?= 7.2.0-1 ARCH ?= amd64,arm64 .PHONY: docker-buildx docker-buildx: ## Build and push docker image for the manager for cross-platform support @if ! docker buildx ls | grep $(BUILDX_BUILDER_NAME); then \ - docker run --rm --privileged multiarch/qemu-user-static:$(QEMU_VERSION) --reset -p yes; \ + docker run --rm --privileged mcr.microsoft.com/mirror/docker/multiarch/qemu-user-static:$(QEMU_VERSION) --reset -p yes; \ docker buildx create --name $(BUILDX_BUILDER_NAME) --use; \ docker buildx inspect $(BUILDX_BUILDER_NAME) --bootstrap; \ fi diff --git a/charts/kaito/workspace/README.md b/charts/kaito/workspace/README.md index 42e2cf15d..b9d8a4772 100644 --- a/charts/kaito/workspace/README.md +++ b/charts/kaito/workspace/README.md @@ -3,7 +3,7 @@ ## Install ```bash -export REGISTRY= +export REGISTRY=ghcr.io/azure/kaito export IMG_NAME=workspace export IMG_TAG=0.3.0 helm install workspace ./charts/kaito/workspace \ @@ -13,24 +13,24 @@ helm install workspace ./charts/kaito/workspace \ ## Values -| Key | Type | Default | Description | -|------------------------------------------|--------|-----------------------------------|---------------------------------------------------------------| -| affinity | object | `{}` | | -| image.pullPolicy | string | `"IfNotPresent"` | | -| image.repository | string | `"ghcr.io/azure/kaito/workspace"` | | -| image.tag | string | `"0.2.0"` | | -| imagePullSecrets | list | `[]` | | -| nodeSelector | object | `{}` | | -| podAnnotations | object | `{}` | | -| podSecurityContext.runAsNonRoot | bool | `true` | | -| presetRegistryName | string | `"mcr.microsoft.com/aks/kaito"` | | -| replicaCount | int | `1` | | -| resources.limits.cpu | string | `"500m"` | | -| resources.limits.memory | string | `"128Mi"` | | -| resources.requests.cpu | string | `"10m"` | | -| resources.requests.memory | string | `"64Mi"` | | -| securityContext.allowPrivilegeEscalation | bool | `false` | | -| securityContext.capabilities.drop[0] | string | `"ALL"` | | -| tolerations | list | `[]` | | -| webhook.port | int | `9443` | | -| cloudProviderName | string | `"azure"` | Karpenter cloud provider name. Values can be "azure" or "aws" | +| Key | Type | Default | Description | +|------------------------------------------|--------|---------------------------------|---------------------------------------------------------------| +| affinity | object | `{}` | | +| image.pullPolicy | string | `"IfNotPresent"` | | +| image.repository | string | `ghcr.io/azure/kaito/workspace` | | +| image.tag | string | `"0.3.0"` | | +| imagePullSecrets | list | `[]` | | +| nodeSelector | object | `{}` | | +| podAnnotations | object | `{}` | | +| podSecurityContext.runAsNonRoot | bool | `true` | | +| presetRegistryName | string | `"mcr.microsoft.com/aks/kaito"` | | +| replicaCount | int | `1` | | +| resources.limits.cpu | string | `"500m"` | | +| resources.limits.memory | string | `"128Mi"` | | +| resources.requests.cpu | string | `"10m"` | | +| resources.requests.memory | string | `"64Mi"` | | +| securityContext.allowPrivilegeEscalation | bool | `false` | | +| securityContext.capabilities.drop[0] | string | `"ALL"` | | +| tolerations | list | `[]` | | +| webhook.port | int | `9443` | | +| cloudProviderName | string | `"azure"` | Karpenter cloud provider name. Values can be "azure" or "aws" | diff --git a/charts/kaito/workspace/values.yaml b/charts/kaito/workspace/values.yaml index 2cef7f75c..9b4405932 100644 --- a/charts/kaito/workspace/values.yaml +++ b/charts/kaito/workspace/values.yaml @@ -3,7 +3,7 @@ # Declare variables to be passed into your templates. replicaCount: 1 image: - repository: mcr.microsoft.com/aks/kaito/workspace + repository: ghcr.io/azure/kaito/workspace pullPolicy: IfNotPresent tag: 0.3.0 imagePullSecrets: []