Skip to content

Commit 89eb8dd

Browse files
authored
Merge branch 'main' into renovate/github.com-stacklok-toolhive-catalog-0.x
2 parents 5f7f97e + 7d89e07 commit 89eb8dd

93 files changed

Lines changed: 6323 additions & 2256 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/operator-ci.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,19 @@ jobs:
187187
with:
188188
release: v0.2.12
189189

190+
- name: Disable containerd image store
191+
# Workaround for https://github.com/kubernetes-sigs/kind/issues/3795
192+
# Docker 29+ defaults to containerd image store, which causes
193+
# `kind load docker-image` to fail for multi-arch images because
194+
# `docker save` preserves the OCI index referencing all platforms
195+
# even when only the host platform layers were pulled.
196+
# --platform on docker pull is not sufficient; the image store
197+
# itself must be switched back to the classic overlay2 driver.
198+
run: |
199+
sudo mkdir -p /etc/docker
200+
echo '{"features":{"containerd-snapshotter": false}}' | sudo tee /etc/docker/daemon.json
201+
sudo systemctl restart docker
202+
190203
- name: Create KIND Cluster
191204
uses: helm/kind-action@ef37e7f390d99f746eb8b610417061a60e82a6cc # pin@v1.12.0
192205
with:
@@ -195,6 +208,11 @@ jobs:
195208
cloud_provider: true
196209
node_image: ${{ matrix.version }}
197210

211+
- name: Pre-load test images
212+
run: |
213+
docker pull ghcr.io/stackloklabs/yardstick/yardstick-server:1.1.1
214+
kind load docker-image --name toolhive ghcr.io/stackloklabs/yardstick/yardstick-server:1.1.1
215+
198216
- name: Run Chainsaw tests
199217
run: |
200218
kind get kubeconfig --name toolhive > kconfig.yaml

.github/workflows/releaser.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,9 @@ jobs:
141141
rm ./thv-test
142142
143143
- name: Bundle CLI docs
144-
run: tar -czf /tmp/thv-cli-docs.tar.gz -C docs/cli .
144+
run: |
145+
mkdir -p build
146+
tar -czf build/thv-cli-docs.tar.gz -C docs/cli .
145147
146148
- name: Run GoReleaser
147149
id: run-goreleaser

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ go.work
2525

2626
# Build output
2727
/bin/
28+
/build/
2829
/dist/
2930
/coverage/
3031

.goreleaser.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ release:
100100
owner: stacklok
101101
name: toolhive
102102
extra_files:
103-
- glob: /tmp/thv-cli-docs.tar.gz
103+
- glob: build/thv-cli-docs.tar.gz
104104
- glob: docs/server/swagger.yaml
105105
- glob: docs/server/swagger.json
106106
- glob: docs/operator/crd-api.md

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.10.0
1+
0.10.2

0 commit comments

Comments
 (0)