diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 61842506..8ada9fd3 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -24,7 +24,7 @@ jobs: shell: bash run: | VERSION=$(yq '(.version|split("-"))[0]' rockcraft.yaml) - BASE=$(yq '(.base|split(":"))[1]' rockcraft.yaml) + BASE=$(yq '(.base|split("@"))[1]' rockcraft.yaml) echo "version=${VERSION}" >> $GITHUB_OUTPUT echo "base=${BASE}" >> $GITHUB_OUTPUT id: rock_metadata diff --git a/README.md b/README.md index a3d6a996..6c68b3d6 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ https://github.com/canonical/charmed-spark-rock/pkgs/container/charmed-spark The image can be used straight away when running Spark on Kubernetes by setting the appropriate configuration property: ```shell -spark.kubernetes.container.image=ghcr.io/canonical/charmed-spark:3.4.1-22.04_edge +spark.kubernetes.container.image=ghcr.io/canonical/charmed-spark:3.4.2-22.04_edge ``` ### Using `spark8t` CLI @@ -49,7 +49,7 @@ spark.kubernetes.container.image=ghcr.io/canonical/charmed-spark:3.4.1-22.04_edg The `spark8t` CLI tooling interacts with the K8s API to create, manage and delete K8s resources representing the Spark service account. Make sure that the kube config file is correctly loaded into the container, e.g. ```shell -docker run --name chamed-spark -v /path/to/kube/config:/var/lib/spark/.kube/config ghcr.io/canonical/charmed-spark:3.4.1-22.04_edge +docker run --name chamed-spark -v /path/to/kube/config:/var/lib/spark/.kube/config ghcr.io/canonical/charmed-spark:3.4.2-22.04_edge ``` Note that this will start the image and a long-living service, allowing you to exec commands: @@ -59,7 +59,7 @@ docker exec charmed-spark spark-client.service-account-registry list If you prefer to run one-shot commands, without having the Charmed Spark image running, use `\; exec` prefix, e.g. ```shell -docker run -v ... ghcr.io/canonical/charmed-spark:3.4.1-22.04_edge \; exec spark-client.service-account-registry list +docker run -v ... ghcr.io/canonical/charmed-spark:3.4.2-22.04_edge \; exec spark-client.service-account-registry list ``` For more information about spark-client API and `spark8t` tooling, please refer to [here](https://discourse.charmhub.io/t/spark-client-snap-how-to-manage-spark-accounts/8959). @@ -71,7 +71,7 @@ Charmed Spark Rock Image is delivered with Pebble already included in order to m #### Starting History Server ```shell -docker run ghcr.io/canonical/charmed-spark:3.4.1-22.04_edge \; start history-server +docker run ghcr.io/canonical/charmed-spark:3.4.2-22.04_edge \; start history-server ``` ## Developers and Contributing diff --git a/rockcraft.yaml b/rockcraft.yaml index a2263d3b..579f70d4 100644 --- a/rockcraft.yaml +++ b/rockcraft.yaml @@ -3,8 +3,8 @@ summary: Spark ROCK description: Spark ROCK license: Apache-2.0 -version: "3.4.1" -base: ubuntu:22.04 +version: "3.4.2" +base: ubuntu@22.04 platforms: amd64: @@ -49,8 +49,8 @@ services: parts: spark: plugin: dump - source: https://github.com/canonical/central-uploader/releases/download/spark-3.4.1-ubuntu2/spark-3.4.1-ubuntu2-20231128202352-bin-k8s.tgz - source-checksum: sha512/b81937b2090074bb5de99ccfe6e4413073e2277220e40557635573e6df1a9961b7e75afba1b0074f24008c3a0e9f0547e7687b161add440f9d0d4da321983c14 + source: https://github.com/canonical/central-uploader/releases/download/spark-3.4.2-ubuntu1/spark-3.4.2-ubuntu1-20231214143421-bin-k8s.tgz + source-checksum: sha512/a111897557921c4dd61daa67fb6979e0a231d4c5f56a0007f26663cb69ab42a12beb83e46edd8961baa7e7b62f031801c1b82e2e612afa1c6ebf8fc208e45ffd overlay-script: | sed -i 's/http:\/\/deb.\(.*\)/https:\/\/deb.\1/g' /etc/apt/sources.list apt-get update diff --git a/tests/integration/resources/testpod.yaml b/tests/integration/resources/testpod.yaml index 2f3b0da3..f190da3e 100644 --- a/tests/integration/resources/testpod.yaml +++ b/tests/integration/resources/testpod.yaml @@ -4,7 +4,7 @@ metadata: name: testpod spec: containers: - - image: ghcr.io/canonical/test-charmed-spark:3.4.1 + - image: ghcr.io/canonical/test-charmed-spark:3.4.2 name: spark ports: - containerPort: 18080