Skip to content

[image-builder-bob] update buildkit version #19383

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 6, 2024
Merged

[image-builder-bob] update buildkit version #19383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion components/image-builder-bob/leeway.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Licensed under the GNU Affero General Public License (AGPL).
# See License.AGPL.txt in the project root for license information.

FROM eu.gcr.io/gitpod-core-dev/build/buildkit:v0.12.2-gitpod.1
FROM eu.gcr.io/gitpod-core-dev/build/buildkit:v0.12.5-gitpod.0
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The image is already pushed to GCR

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

docker run --rm -it eu.gcr.io/gitpod-core-dev/build/buildkit:v0.12.5-gitpod.0 --version
buildkitd github.com/moby/buildkit v0.12.5-4-gaf7854806 af7854806a5721a31ef1c22b18ea434882687711

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ref: https://github.com/gitpod-io/buildkit/releases/tag/v0.12.5-gitpod.0


USER root
RUN apk --no-cache add sudo bash \
Expand Down
5 changes: 5 additions & 0 deletions dev/preview/infrastructure/scripts/bootstrap-k3s.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ export INSTALL_K3S_SKIP_DOWNLOAD=true
# failing occasionally. Sleeping for a bit solves it.
sleep 10

# shellcheck disable=SC2154
# shellcheck disable=SC2086
kubectl label nodes ${vm_name} \
gitpod.io/workload_meta=true \
gitpod.io/workload_ide=true \
Expand All @@ -39,10 +41,13 @@ kubectl label nodes ${vm_name} \

# apply fix from https://github.com/k3s-io/klipper-lb/issues/6 so we can use the klipper servicelb
# this can be removed if https://github.com/gitpod-io/gitpod-packer-gcp-image/pull/20 gets merged
# shellcheck disable=SC2002
# shellcheck disable=SC1001
cat /var/lib/gitpod/manifests/calico.yaml | sed s/__KUBERNETES_NODE_NAME__\"\,/__KUBERNETES_NODE_NAME__\",\ \"container_settings\"\:\ \{\ \"allow_ip_forwarding\"\:\ true\ \}\,/ >/var/lib/gitpod/manifests/calico2.yaml

sed -i 's/docker.io/quay.io/g' /var/lib/gitpod/manifests/calico2.yaml
sed -i 's/interface=ens/interface=en/g' /var/lib/gitpod/manifests/calico2.yaml
# shellcheck disable=SC2016
sed -i 's/\$CLUSTER_IP_RANGE/10.20.0.0\/16/g' /var/lib/gitpod/manifests/calico2.yaml

kubectl apply -f /var/lib/gitpod/manifests/calico2.yaml
Expand Down