Skip to content

Commit d90a00f

Browse files
swebrazvan
andauthored
Apply suggestions from code review
Co-authored-by: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com>
1 parent 039c6e1 commit d90a00f

3 files changed

Lines changed: 4 additions & 7 deletions

File tree

CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ All notable changes to this project will be documented in this file.
2424
- druid: Add `37.0.0` ([#1535]).
2525
- hbase: Add `2.6.6` ([#1547]).
2626
- spark: Add `4.1.2` ([#1550]).
27-
- spark: Bake the OpenLineage Spark listener (`1.51.0`) into the Spark images under the dedicated directory `/stackable/spark/openlineage/` (off the `extra-jars` classpath), enabling the OpenLineage MVP in the operator. The Scala 2.13 build (`openlineage-spark_2.13`) is used for the `4.1.x` images and the Scala 2.12 build (`openlineage-spark_2.12`) for the `3.5.x` images, both exposed through a stable `openlineage-spark.jar` symlink so the operator need not track the version or Scala suffix ([#XXXX]).
27+
- spark: Add the OpenLineage listener under the dedicated directory `/stackable/spark/openlineage/` ([#1577]).
2828
- opensearch: Add `3.6.0` ([#1549]).
2929
- opensearch-dashboards: Add `3.6.0` ([#1551]).
3030

@@ -96,7 +96,7 @@ All notable changes to this project will be documented in this file.
9696
[#1548]: https://github.com/stackabletech/docker-images/pull/1548
9797
[#1549]: https://github.com/stackabletech/docker-images/pull/1549
9898
[#1550]: https://github.com/stackabletech/docker-images/pull/1550
99-
[#XXXX]: https://github.com/stackabletech/docker-images/pull/XXXX
99+
[#1577]: https://github.com/stackabletech/docker-images/pull/1577
100100
[#1551]: https://github.com/stackabletech/docker-images/pull/1551
101101
[#1559]: https://github.com/stackabletech/docker-images/pull/1559
102102
[#1561]: https://github.com/stackabletech/docker-images/pull/1561

spark-k8s/Dockerfile.3

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,14 +154,12 @@ cp /root/.m2/repository/com/fasterxml/woodstox/woodstox-core/${WOODSTOX_CORE_VER
154154
# so it loads on Spark's child/user classloader, sharing it with connectors delivered via `--packages`
155155
# (e.g. Iceberg). If it landed on extra-jars it would be added to the system classloader via
156156
# extraClassPath, OpenLineage's connector probe would fail, and no datasets would be emitted.
157-
# Spark 3.5.x is a Scala 2.12 build, so the 2.12 artifact is used (Spark 4.x uses 2.13).
158157
mkdir -p /stackable/spark-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}/dist/openlineage
159158
mvn dependency:get -Dartifact=io.openlineage:openlineage-spark_2.12:${OPENLINEAGE_SPARK_VERSION}
160159
cp /root/.m2/repository/io/openlineage/openlineage-spark_2.12/${OPENLINEAGE_SPARK_VERSION}/openlineage-spark_2.12-${OPENLINEAGE_SPARK_VERSION}.jar \
161160
/stackable/spark-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}/dist/openlineage/openlineage-spark_2.12-${OPENLINEAGE_SPARK_VERSION}.jar
162161
# Symlink to a stable, version- and Scala-independent name (mirroring the jmx_prometheus_javaagent.jar
163162
# pattern) so the operator can reference the jar without knowing the version or Scala build baked here.
164-
# The relative target keeps the link valid after `dist` is copied into the final image.
165163
ln -s openlineage-spark_2.12-${OPENLINEAGE_SPARK_VERSION}.jar \
166164
/stackable/spark-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}/dist/openlineage/openlineage-spark.jar
167165

spark-k8s/Dockerfile.4

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,8 @@ mkdir -p /stackable/spark-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}/dist/op
132132
mvn dependency:get -Dartifact=io.openlineage:openlineage-spark_2.13:${OPENLINEAGE_SPARK_VERSION}
133133
cp /root/.m2/repository/io/openlineage/openlineage-spark_2.13/${OPENLINEAGE_SPARK_VERSION}/openlineage-spark_2.13-${OPENLINEAGE_SPARK_VERSION}.jar \
134134
/stackable/spark-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}/dist/openlineage/openlineage-spark_2.13-${OPENLINEAGE_SPARK_VERSION}.jar
135-
# Symlink to a stable, version- and Scala-independent name (mirroring the jmx_prometheus_javaagent.jar
136-
# pattern) so the operator can reference the jar without knowing the version or Scala build baked here.
137-
# The relative target keeps the link valid after `dist` is copied into the final image.
135+
# Symlink to a stable, version- and Scala-independent name
136+
# so the operator can reference the jar without knowing the version or Scala build baked here.
138137
ln -s openlineage-spark_2.13-${OPENLINEAGE_SPARK_VERSION}.jar \
139138
/stackable/spark-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}/dist/openlineage/openlineage-spark.jar
140139

0 commit comments

Comments
 (0)