Skip to content

Commit

Permalink
fix: Update qemu image (#512)
Browse files Browse the repository at this point in the history 
**Reason for Change**:
- Replace `multiarch/qemu-user-static` with
`mcr.microsoft.com/mirror/docker/multiarch/qemu-user-static:7.2.0-1`

**Requirements**

- [ ] added unit tests and e2e tests (if applicable).

**Issue Fixed**:
<!-- If this PR fixes GitHub issue 4321, add "Fixes #4321" to the next
line. -->

**Notes for Reviewers**:

Signed-off-by: Heba Elayoty <hebaelayoty@gmail.com>
  • Loading branch information
@helayoty
helayoty authored Jul 13, 2024
1 parent 029d11f commit 7d1dc82
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 28 deletions.
1 change: 0 additions & 1 deletion .github/workflows/publish-gh-image.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,6 @@ jobs:

publish-mcr-image:
runs-on: ubuntu-latest
environment: preset-env
needs: [ check-tag, run-e2e-gh-image ]
steps:
- name: 'Dispatch release tag'
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/publish-mcr-image.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ jobs:

create-release:
runs-on: ubuntu-latest
environment: publish-mcr
needs: [ run-e2e-mcr ]
steps:
- name: 'Dispatch release tag'
Expand Down
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=mcr.microsoft.com/aks/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 | `mcr.microsoft.com/aks/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: 2 additions & 0 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -391,6 +391,8 @@ github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncj
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
github.com/samber/lo v1.44.0 h1:5il56KxRE+GHsm1IR+sZ/6J42NODigFiqCWpSc2dybA=
github.com/samber/lo v1.44.0/go.mod h1:RmDH9Ct32Qy3gduHQuKJ3gW1fMHAnE/fAzQuf6He5cU=
github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8=
github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
Expand Down
4 changes: 2 additions & 2 deletions goreleaser.yml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# refer to https://goreleaser.com for more options
version: 2
before:
hooks:
- go mod tidy
Expand Down Expand Up @@ -29,13 +30,12 @@ builds:
env:
- CGO_ENABLED=0
- GO111MODULE=on

release:
prerelease: auto
header: |
## {{.Tag}} - {{ time "2006-01-02" }}
make_latest: true
changelog:
skip: false
groups:
- title: Features 🌈
regexp: ^.*feat[(\\w)]*:+.*$
Expand Down

0 comments on commit 7d1dc82

Please sign in to comment.