Skip to content
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

(#1982) Publish Spark Operator image for multiple Spark versions on r… #2024

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

(#1982) Publish Spark Operator image for multiple Spark versions on r… #2024

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
19 changes: 16 additions & 3 deletions .github/workflows/release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@ jobs:
strategy:
fail-fast: false
matrix:
spark_version:
- 3.5.1
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I don't like repeating this between the two jobs, but it was the least complex solution.

- 3.4.3
- 3.3.4
platform:
- linux/amd64
- linux/arm64
Expand Down Expand Up @@ -91,6 +95,8 @@ jobs:
uses: docker/build-push-action@v5
with:
context: .
build-args: |
SPARK_IMAGE=spark:${{ matrix.spark_version }}
platforms: ${{ matrix.platform }}
cache-to: type=gha,mode=max,scope=${{ env.SCOPE }}
cache-from: type=gha,scope=${{ env.SCOPE }}
Expand All @@ -104,11 +110,18 @@ jobs:
- name: Upload digest
uses: actions/upload-artifact@v4
with:
name: digests-${{ env.PLATFORM_PAIR }}
name: digests-${{ matrix.spark_version }}-${{ env.PLATFORM_PAIR }}
path: /tmp/digests/*
if-no-files-found: error
retention-days: 1
publish-image:
strategy:
fail-fast: false
matrix:
spark_version:
- 3.5.1
- 3.4.3
- 3.3.4
runs-on: ubuntu-latest
needs:
- release
Expand All @@ -118,7 +131,7 @@ jobs:
- name: Download digests
uses: actions/download-artifact@v4
with:
pattern: digests-*
pattern: digests-${{ matrix.spark_version }}-*
path: /tmp/digests
merge-multiple: true
- name: Setup Docker Buildx
Expand All @@ -128,7 +141,7 @@ jobs:
uses: docker/metadata-action@v5
with:
images: ${{ env.REGISTRY_IMAGE }}
tags: ${{ needs.build-skip-check.outputs.app_version_tag }}
tags: "${{ needs.build-skip-check.outputs.app_version_tag }}-${{ matrix.spark_version }}"
- name: Login to Docker Hub
uses: docker/login-action@v3
with:
Expand Down
4 changes: 2 additions & 2 deletions charts/spark-operator-chart/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v2
name: spark-operator
description: A Helm chart for Spark on Kubernetes operator
version: 1.2.15
appVersion: v1beta2-1.4.6-3.5.0
version: 1.2.16
appVersion: v1beta2-1.4.6
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I: The Spark version is separate from the Operator version. New image tag format is consistent with the old one, but with parameterized Spark version rather than hardcoding it here.

keywords:
- spark
home: https://github.com/kubeflow/spark-operator
Expand Down
2 changes: 1 addition & 1 deletion charts/spark-operator-chart/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# spark-operator

![Version: 1.2.15](https://img.shields.io/badge/Version-1.2.15-informational?style=flat-square) ![AppVersion: v1beta2-1.4.6-3.5.0](https://img.shields.io/badge/AppVersion-v1beta2--1.4.6--3.5.0-informational?style=flat-square)
![Version: 1.2.16](https://img.shields.io/badge/Version-1.2.16-informational?style=flat-square) ![AppVersion: v1beta2-1.4.6](https://img.shields.io/badge/AppVersion-v1beta2--1.4.6-informational?style=flat-square)

A Helm chart for Spark on Kubernetes operator

Expand Down
Loading