Skip to content

Commit

Permalink
Update qemu image and split oss release from mcr
Browse files Browse the repository at this point in the history 
Signed-off-by: Heba Elayoty <hebaelayoty@gmail.com>
  • Loading branch information
@helayoty
helayoty committed Jul 12, 2024
1 parent ed546f0 commit 3ffceae
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 39 deletions.
15 changes: 13 additions & 2 deletions .github/workflows/publish-gh-image.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
12 changes: 0 additions & 12 deletions .github/workflows/publish-mcr-image.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"}'
4 changes: 2 additions & 2 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
44 changes: 22 additions & 22 deletions charts/kaito/workspace/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
## Install

```bash
export REGISTRY=<your_docker_registry>
export REGISTRY=ghcr.io/azure/kaito
export IMG_NAME=workspace
export IMG_TAG=0.3.0
helm install workspace ./charts/kaito/workspace \
Expand All @@ -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" |
2 changes: 1 addition & 1 deletion charts/kaito/workspace/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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: []
Expand Down

0 comments on commit 3ffceae

Please sign in to comment.