From ab12ed1d01f116e8b8a8a9d8a13536870787027a Mon Sep 17 00:00:00 2001
From: Peter McClonski <mcclonski.peter@gmail.com>
Date: Fri, 10 May 2024 16:10:03 -0400
Subject: [PATCH] (#1982) Publish Spark Operator image for multiple Spark
 versions on release

Signed-off-by: Peter Jablonski <mcclonski.peter@gmail.com>
Signed-off-by: Peter McClonski <mcclonski.peter@gmail.com>
---
 .github/workflows/release.yaml         | 19 ++++++++++++++++---
 charts/spark-operator-chart/Chart.yaml |  4 ++--
 charts/spark-operator-chart/README.md  |  2 +-
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 417ffb267..fc2367f56 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -56,6 +56,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        spark_version:
+          - 3.5.1
+          - 3.4.3
+          - 3.3.4
         platform:
           - linux/amd64
           - linux/arm64
@@ -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 }}
@@ -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
@@ -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
@@ -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:
diff --git a/charts/spark-operator-chart/Chart.yaml b/charts/spark-operator-chart/Chart.yaml
index 891765041..75838d059 100644
--- a/charts/spark-operator-chart/Chart.yaml
+++ b/charts/spark-operator-chart/Chart.yaml
@@ -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
 keywords:
   - spark
 home: https://github.com/kubeflow/spark-operator
diff --git a/charts/spark-operator-chart/README.md b/charts/spark-operator-chart/README.md
index a8f41dc76..7f2c20740 100644
--- a/charts/spark-operator-chart/README.md
+++ b/charts/spark-operator-chart/README.md
@@ -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