diff --git a/CHANGELOG.md b/CHANGELOG.md index 32122b7d..f97dc9ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. ## [Unreleased] +### Changed + +- Updated stackable image versions ([#176]) + +[#176]: https://github.com/stackabletech/spark-k8s-operator/pull/176 + ## [0.6.0] - 2022-11-07 ### Changed diff --git a/docs/modules/ROOT/examples/example-encapsulated.yaml b/docs/modules/ROOT/examples/example-encapsulated.yaml index d859ff75..57e28902 100644 --- a/docs/modules/ROOT/examples/example-encapsulated.yaml +++ b/docs/modules/ROOT/examples/example-encapsulated.yaml @@ -5,7 +5,7 @@ metadata: name: spark-pi spec: version: "1.0" - sparkImage: docker.stackable.tech/stackable/spark-k8s:3.3.0-stackable0.2.0 # <1> + sparkImage: docker.stackable.tech/stackable/spark-k8s:3.3.0-stackable0.3.0 # <1> mode: cluster mainClass: org.apache.spark.examples.SparkPi mainApplicationFile: /stackable/spark/examples/jars/spark-examples_2.12-3.3.0.jar # <2> diff --git a/docs/modules/ROOT/examples/example-sparkapp-configmap.yaml b/docs/modules/ROOT/examples/example-sparkapp-configmap.yaml index 98e2b0d2..2c8b12f0 100644 --- a/docs/modules/ROOT/examples/example-sparkapp-configmap.yaml +++ b/docs/modules/ROOT/examples/example-sparkapp-configmap.yaml @@ -6,7 +6,7 @@ metadata: namespace: default spec: version: "1.0" - sparkImage: docker.stackable.tech/stackable/spark-k8s:3.3.0-stackable0.2.0 + sparkImage: docker.stackable.tech/stackable/spark-k8s:3.3.0-stackable0.3.0 mode: cluster mainApplicationFile: s3a://stackable-spark-k8s-jars/jobs/ny-tlc-report-1.1.0.jar # <3> mainClass: tech.stackable.demo.spark.NYTLCReport diff --git a/docs/modules/ROOT/examples/example-sparkapp-external-dependencies.yaml b/docs/modules/ROOT/examples/example-sparkapp-external-dependencies.yaml index 692cde95..b63df83c 100644 --- a/docs/modules/ROOT/examples/example-sparkapp-external-dependencies.yaml +++ b/docs/modules/ROOT/examples/example-sparkapp-external-dependencies.yaml @@ -6,7 +6,7 @@ metadata: namespace: default spec: version: "1.0" - sparkImage: docker.stackable.tech/stackable/pyspark-k8s:3.3.0-stackable0.2.0 + sparkImage: docker.stackable.tech/stackable/pyspark-k8s:3.3.0-stackable0.3.0 mode: cluster mainApplicationFile: s3a://stackable-spark-k8s-jars/jobs/ny_tlc_report.py # <1> args: diff --git a/docs/modules/ROOT/examples/example-sparkapp-image.yaml b/docs/modules/ROOT/examples/example-sparkapp-image.yaml index 77d155fd..d4e5cfea 100644 --- a/docs/modules/ROOT/examples/example-sparkapp-image.yaml +++ b/docs/modules/ROOT/examples/example-sparkapp-image.yaml @@ -7,7 +7,7 @@ metadata: spec: version: "1.0" image: docker.stackable.tech/stackable/ny-tlc-report:0.1.0 # <1> - sparkImage: docker.stackable.tech/stackable/pyspark-k8s:3.3.0-stackable0.2.0 + sparkImage: docker.stackable.tech/stackable/pyspark-k8s:3.3.0-stackable0.3.0 mode: cluster mainApplicationFile: local:///stackable/spark/jobs/ny_tlc_report.py # <2> args: diff --git a/docs/modules/ROOT/examples/example-sparkapp-pvc.yaml b/docs/modules/ROOT/examples/example-sparkapp-pvc.yaml index 7a41a918..a4e8ca60 100644 --- a/docs/modules/ROOT/examples/example-sparkapp-pvc.yaml +++ b/docs/modules/ROOT/examples/example-sparkapp-pvc.yaml @@ -6,7 +6,7 @@ metadata: namespace: default spec: version: "1.0" - sparkImage: docker.stackable.tech/stackable/spark-k8s:3.3.0-stackable0.2.0 + sparkImage: docker.stackable.tech/stackable/spark-k8s:3.3.0-stackable0.3.0 mode: cluster mainApplicationFile: s3a://stackable-spark-k8s-jars/jobs/ny-tlc-report-1.0-SNAPSHOT.jar # <1> mainClass: org.example.App # <2> diff --git a/docs/modules/ROOT/examples/example-sparkapp-s3-private.yaml b/docs/modules/ROOT/examples/example-sparkapp-s3-private.yaml index 2fbe08b4..2110c1d4 100644 --- a/docs/modules/ROOT/examples/example-sparkapp-s3-private.yaml +++ b/docs/modules/ROOT/examples/example-sparkapp-s3-private.yaml @@ -5,7 +5,7 @@ metadata: name: example-sparkapp-s3-private spec: version: "1.0" - sparkImage: docker.stackable.tech/stackable/spark-k8s:3.3.0-stackable0.2.0 + sparkImage: docker.stackable.tech/stackable/spark-k8s:3.3.0-stackable0.3.0 mode: cluster mainApplicationFile: s3a://my-bucket/spark-examples_2.12-3.3.0.jar # <1> mainClass: org.apache.spark.examples.SparkPi # <2> diff --git a/docs/modules/ROOT/examples/example-sparkapp-streaming.yaml b/docs/modules/ROOT/examples/example-sparkapp-streaming.yaml index ca28770c..f2dbac68 100644 --- a/docs/modules/ROOT/examples/example-sparkapp-streaming.yaml +++ b/docs/modules/ROOT/examples/example-sparkapp-streaming.yaml @@ -6,7 +6,7 @@ metadata: namespace: default spec: version: "1.0" - sparkImage: docker.stackable.tech/stackable/pyspark-k8s:3.3.0-stackable0.1.0 + sparkImage: docker.stackable.tech/stackable/pyspark-k8s:3.3.0-stackable0.3.0 mode: cluster mainApplicationFile: local:///stackable/spark/examples/src/main/python/streaming/hdfs_wordcount.py args: diff --git a/docs/modules/ROOT/pages/usage.adoc b/docs/modules/ROOT/pages/usage.adoc index 4b477a84..5c922bf8 100644 --- a/docs/modules/ROOT/pages/usage.adoc +++ b/docs/modules/ROOT/pages/usage.adoc @@ -211,7 +211,7 @@ Below are listed the CRD fields that can be defined by the user: |User-supplied image containing spark-job dependencies that will be copied to the specified volume mount |`spec.sparkImage` -| Spark image which will be deployed to driver and executor pods, which must contain spark environment needed by the job e.g. `docker.stackable.tech/stackable/spark-k8s:3.3.0-stackable0.2.0` +| Spark image which will be deployed to driver and executor pods, which must contain spark environment needed by the job e.g. `docker.stackable.tech/stackable/spark-k8s:3.3.0-stackable0.3.0` |`spec.sparkImagePullPolicy` | Optional Enum (one of `Always`, `IfNotPresent` or `Never`) that determines the pull policy of the spark job image diff --git a/docs/modules/getting_started/examples/code/getting_started.sh b/docs/modules/getting_started/examples/code/getting_started.sh index 7d517e2c..2efab374 100755 --- a/docs/modules/getting_started/examples/code/getting_started.sh +++ b/docs/modules/getting_started/examples/code/getting_started.sh @@ -53,7 +53,7 @@ metadata: namespace: default spec: version: "1.0" - sparkImage: docker.stackable.tech/stackable/pyspark-k8s:3.3.0-stackable0.2.0 + sparkImage: docker.stackable.tech/stackable/pyspark-k8s:3.3.0-stackable0.3.0 mode: cluster mainApplicationFile: local:///stackable/spark/examples/src/main/python/pi.py driver: diff --git a/docs/modules/getting_started/examples/code/getting_started.sh.j2 b/docs/modules/getting_started/examples/code/getting_started.sh.j2 index e1975362..1998fda2 100755 --- a/docs/modules/getting_started/examples/code/getting_started.sh.j2 +++ b/docs/modules/getting_started/examples/code/getting_started.sh.j2 @@ -53,7 +53,7 @@ metadata: namespace: default spec: version: "1.0" - sparkImage: docker.stackable.tech/stackable/pyspark-k8s:3.3.0-stackable0.2.0 + sparkImage: docker.stackable.tech/stackable/pyspark-k8s:3.3.0-stackable0.3.0 mode: cluster mainApplicationFile: local:///stackable/spark/examples/src/main/python/pi.py driver: diff --git a/examples/ny-tlc-report-external-dependencies.yaml b/examples/ny-tlc-report-external-dependencies.yaml index 1d4fb315..7aae0881 100644 --- a/examples/ny-tlc-report-external-dependencies.yaml +++ b/examples/ny-tlc-report-external-dependencies.yaml @@ -6,7 +6,7 @@ metadata: namespace: default spec: version: "1.0" - sparkImage: docker.stackable.tech/stackable/pyspark-k8s:3.3.0-stackable0.2.0 + sparkImage: docker.stackable.tech/stackable/pyspark-k8s:3.3.0-stackable0.3.0 # Always | IfNotPresent | Never sparkImagePullPolicy: IfNotPresent mode: cluster diff --git a/examples/ny-tlc-report-image.yaml b/examples/ny-tlc-report-image.yaml index 09aaee41..db441310 100644 --- a/examples/ny-tlc-report-image.yaml +++ b/examples/ny-tlc-report-image.yaml @@ -8,7 +8,7 @@ spec: version: "1.0" # everything under /jobs will be copied to /stackable/spark/jobs image: docker.stackable.tech/stackable/ny-tlc-report:0.1.0 - sparkImage: docker.stackable.tech/stackable/pyspark-k8s:3.3.0-stackable0.2.0 + sparkImage: docker.stackable.tech/stackable/pyspark-k8s:3.3.0-stackable0.3.0 sparkImagePullPolicy: IfNotPresent mode: cluster mainApplicationFile: local:///stackable/spark/jobs/ny_tlc_report.py diff --git a/examples/ny-tlc-report.yaml b/examples/ny-tlc-report.yaml index d0f79749..ab13d52e 100644 --- a/examples/ny-tlc-report.yaml +++ b/examples/ny-tlc-report.yaml @@ -13,7 +13,7 @@ metadata: name: spark-ny-cm spec: version: "1.0" - sparkImage: docker.stackable.tech/stackable/spark-k8s:3.3.0-stackable0.2.0 + sparkImage: docker.stackable.tech/stackable/spark-k8s:3.3.0-stackable0.3.0 mode: cluster mainApplicationFile: s3a://my-bucket/ny-tlc-report-1.1.0-3.3.0.jar mainClass: tech.stackable.demo.spark.NYTLCReport diff --git a/kind/assert-pvc-jars.yaml b/kind/assert-pvc-jars.yaml index 9c3c5286..3cc146f8 100644 --- a/kind/assert-pvc-jars.yaml +++ b/kind/assert-pvc-jars.yaml @@ -13,7 +13,7 @@ spec: claimName: pvc-ksv containers: - name: assert-pvc-jars - image: docker.stackable.tech/stackable/tools:0.2.0-stackable0 + image: docker.stackable.tech/stackable/tools:0.2.0-stackable0.4.0 env: - name: DEST_DIR value: "/dependencies/jars" diff --git a/kind/kind-pvc.yaml b/kind/kind-pvc.yaml index 268df002..69f558e2 100644 --- a/kind/kind-pvc.yaml +++ b/kind/kind-pvc.yaml @@ -24,7 +24,7 @@ spec: claimName: pvc-ksv containers: - name: aws-deps - image: docker.stackable.tech/stackable/tools:0.2.0-stackable0 + image: docker.stackable.tech/stackable/tools:0.2.0-stackable0.4.0 env: - name: DEST_DIR value: "/dependencies/jars" diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml index c39abc75..805036e8 100644 --- a/tests/test-definition.yaml +++ b/tests/test-definition.yaml @@ -1,5 +1,5 @@ # -# To run these tests on OpenShift you have ensure that: +# To run these tests on OpenShift you have to ensure that: # 1. The "openshift" dimension below is set to "true" # 2. At least one node in the cluster is labeled with "node: 1" # @@ -13,7 +13,7 @@ dimensions: - 3.3.0 - name: stackable values: - - 0.2.0 + - 0.3.0 - name: ny-tlc-report values: - 0.1.0