From 45d182ed043be04182d88f86d729d6b003b9c9ad Mon Sep 17 00:00:00 2001
From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com>
Date: Fri, 25 Aug 2023 10:05:06 +0200
Subject: [PATCH] Update Spark app image version

---
 CHANGELOG.md                                                | 4 ++++
 .../create-spark-ingestion-job.yaml                         | 6 ++++--
 .../create-spark-anomaly-detection-job.yaml                 | 4 +++-
 stacks/airflow/airflow.yaml                                 | 4 +++-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 52a958d9..264aa061 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@
 
 - Also print stack parameters when describing a demo ([#251](https://github.com/stackabletech/stackablectl/pull/251))
 
+### Changed
+
+- Update demo Spark image definitions to the latest CRD version ([#281](https://github.com/stackabletech/stackablectl/pull/281))
+
 ### Fixed
 
 - Check HTTP status code when fetching resources via HTTP ([#258](https://github.com/stackabletech/stackablectl/pull/258))
diff --git a/demos/data-lakehouse-iceberg-trino-spark/create-spark-ingestion-job.yaml b/demos/data-lakehouse-iceberg-trino-spark/create-spark-ingestion-job.yaml
index 7de921f1..6365b019 100644
--- a/demos/data-lakehouse-iceberg-trino-spark/create-spark-ingestion-job.yaml
+++ b/demos/data-lakehouse-iceberg-trino-spark/create-spark-ingestion-job.yaml
@@ -41,8 +41,10 @@ data:
       name: spark-ingest-into-lakehouse
     spec:
       version: "1.0"
-      sparkImage: docker.stackable.tech/demos/pyspark-k8s-with-kafka-and-iceberg:3.3.0-stackable23.4
-      sparkImagePullPolicy: Always
+      sparkImage:
+        custom: docker.stackable.tech/demos/pyspark-k8s-with-kafka-and-iceberg:3.3.0-stackable23.4
+        productVersion: 3.3.0
+        pullPolicy: Always
       mode: cluster
       mainApplicationFile: local:///stackable/spark/jobs/spark-ingest-into-lakehouse.py
       # deps:
diff --git a/demos/spark-k8s-anomaly-detection-taxi-data/create-spark-anomaly-detection-job.yaml b/demos/spark-k8s-anomaly-detection-taxi-data/create-spark-anomaly-detection-job.yaml
index 7f705717..043feeb6 100644
--- a/demos/spark-k8s-anomaly-detection-taxi-data/create-spark-anomaly-detection-job.yaml
+++ b/demos/spark-k8s-anomaly-detection-taxi-data/create-spark-anomaly-detection-job.yaml
@@ -37,7 +37,9 @@ data:
       name: spark-ad
     spec:
       version: "1.0"
-      sparkImage: docker.stackable.tech/demos/pyspark-k8s-with-kafka-and-iceberg:3.3.0-stackable0.2.0
+      sparkImage:
+        custom: docker.stackable.tech/demos/pyspark-k8s-with-kafka-and-iceberg:3.3.0-stackable0.2.0
+        productVersion: 3.3.0
       mode: cluster
       mainApplicationFile: local:///spark-scripts/spark-ad.py
       deps:
diff --git a/stacks/airflow/airflow.yaml b/stacks/airflow/airflow.yaml
index 3eb35c60..c09a0d4b 100644
--- a/stacks/airflow/airflow.yaml
+++ b/stacks/airflow/airflow.yaml
@@ -260,7 +260,9 @@ data:
       name: pyspark-pi
     spec:
       version: "1.0"
-      sparkImage: docker.stackable.tech/stackable/pyspark-k8s:3.3.0-stackable23.4
+      sparkImage:
+        custom: docker.stackable.tech/stackable/pyspark-k8s:3.3.0-stackable23.4
+        productVersion: 3.3.0
       mode: cluster
       mainApplicationFile: local:///stackable/spark/examples/src/main/python/pi.py
       driver: