Skip to content

Commit

Permalink
update release for v0.10.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Justin Pflueger committed Dec 14, 2023
1 parent eb9726f commit b657628
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions chart/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ kubeVersion: ">=1.20.0"
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.7.0
version: 0.10.0
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
appVersion: "0.7.0"
appVersion: "0.10.0"
name: spin-containerd-shim-installer
description: A Helm chart for installing the containerd shim for Spin on Kubernetes
home: https://github.com/fermyon/spin-containerd-shim-installer
Expand Down
6 changes: 3 additions & 3 deletions image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ RUN export DEBIAN_FRONTEND=noninteractive \
&& apt-get update -y \
&& apt-get install -y wget
# NOTE: this binary uses the $(ARCH)-unknown-linux-musl triplet
ARG SHIM_VERSION=0.5.1
RUN wget -q -O - "https://github.com/deislabs/containerd-wasm-shims/releases/download/v${SHIM_VERSION}/containerd-wasm-shims-v1-linux-$(uname -m).tar.gz" | tar -xvz -f - containerd-shim-spin-v1
ARG SHIM_VERSION=0.10.0
RUN wget -q -O - "https://github.com/deislabs/containerd-wasm-shims/releases/download/v${SHIM_VERSION}/containerd-wasm-shims-v2-spin-linux-$(uname -m).tar.gz" | tar -xvz -f - containerd-shim-spin-v2

# Download the toml CLI tool
FROM rust:bullseye as toml-downloader
Expand All @@ -19,7 +19,7 @@ FROM busybox:1.36
WORKDIR /work

COPY --from=toml-downloader /usr/local/cargo/bin/toml /usr/local/bin/toml
COPY --from=shim-downloader /downloads/containerd-shim-spin-v1 ./containerd-shim-spin-v1
COPY --from=shim-downloader /downloads/containerd-shim-spin-v2 ./containerd-shim-spin-v2

COPY ./entrypoint.sh .
CMD ["./entrypoint.sh"]
6 changes: 3 additions & 3 deletions image/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ set -euo
HOST_CONTAINERD_CONFIG="${HOST_CONTAINERD_CONFIG:-/host/etc/containerd/config.toml}"
HOST_BIN="${HOST_BIN:-/host/bin}"

RUNTIME_CONFIG_TYPE="${RUNTIME_CONFIG_TYPE:-io.containerd.spin.v1}"
RUNTIME_CONFIG_TYPE="${RUNTIME_CONFIG_TYPE:-io.containerd.spin.v2}"
RUNTIME_CONFIG_HANDLE="${RUNTIME_CONFIG_HANDLE:-spin}"
RUNTIME_CONFIG_TABLE="plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.${RUNTIME_CONFIG_HANDLE}"

Expand Down Expand Up @@ -38,7 +38,7 @@ set_runtime_type() {
##
# assertions
##
if [ ! -f "./containerd-shim-spin-v1" ]; then
if [ ! -f "./containerd-shim-spin-v2" ]; then
echo "shim binary not found"
exit 1
fi
Expand All @@ -55,7 +55,7 @@ if [ ! -f "${HOST_CONTAINERD_CONFIG}" ]; then
fi

echo "copying the shim to the node's bin directory '${HOST_BIN}'"
cp "./containerd-shim-spin-v1" "${HOST_BIN}"
cp "./containerd-shim-spin-v2" "${HOST_BIN}"

# check if the shim is already in the containerd config
if [ "$(get_runtime_type "${HOST_CONTAINERD_CONFIG}")" = "${RUNTIME_CONFIG_TYPE}" ]; then
Expand Down

0 comments on commit b657628

Please sign in to comment.