From 4ee03f13b1e19a1cafa16a9608b0cb2e9a61063f Mon Sep 17 00:00:00 2001 From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com> Date: Thu, 27 Feb 2025 13:04:11 +0100 Subject: [PATCH] clean up the spark history test to use local artifacts --- .../spark-history-server/00-secrets.yaml.j2 | 20 ------------------- .../05-s3-connection.yaml.j2 | 11 ---------- .../10-deploy-spark-app.yaml.j2 | 6 +----- .../12-deploy-spark-app.yaml.j2 | 6 +----- 4 files changed, 2 insertions(+), 41 deletions(-) diff --git a/tests/templates/kuttl/spark-history-server/00-secrets.yaml.j2 b/tests/templates/kuttl/spark-history-server/00-secrets.yaml.j2 index 81a98d47..9fb8acff 100644 --- a/tests/templates/kuttl/spark-history-server/00-secrets.yaml.j2 +++ b/tests/templates/kuttl/spark-history-server/00-secrets.yaml.j2 @@ -1,26 +1,6 @@ --- apiVersion: secrets.stackable.tech/v1alpha1 kind: SecretClass -metadata: - name: s3-credentials-class -spec: - backend: - k8sSearch: - searchNamespace: - pod: {} ---- -apiVersion: v1 -kind: Secret -metadata: - name: s3-credentials - labels: - secrets.stackable.tech/class: s3-credentials-class -stringData: - accessKey: spark - secretKey: sparkspark ---- -apiVersion: secrets.stackable.tech/v1alpha1 -kind: SecretClass metadata: name: history-credentials-class spec: diff --git a/tests/templates/kuttl/spark-history-server/05-s3-connection.yaml.j2 b/tests/templates/kuttl/spark-history-server/05-s3-connection.yaml.j2 index 42d785da..03021655 100644 --- a/tests/templates/kuttl/spark-history-server/05-s3-connection.yaml.j2 +++ b/tests/templates/kuttl/spark-history-server/05-s3-connection.yaml.j2 @@ -1,17 +1,6 @@ --- apiVersion: s3.stackable.tech/v1alpha1 kind: S3Connection -metadata: - name: spark-data-s3-connection -spec: - host: test-minio - port: 9000 - accessStyle: Path - credentials: - secretClass: s3-credentials-class ---- -apiVersion: s3.stackable.tech/v1alpha1 -kind: S3Connection metadata: name: spark-history-s3-connection spec: diff --git a/tests/templates/kuttl/spark-history-server/10-deploy-spark-app.yaml.j2 b/tests/templates/kuttl/spark-history-server/10-deploy-spark-app.yaml.j2 index 22c8aa7f..454d8057 100644 --- a/tests/templates/kuttl/spark-history-server/10-deploy-spark-app.yaml.j2 +++ b/tests/templates/kuttl/spark-history-server/10-deploy-spark-app.yaml.j2 @@ -17,11 +17,7 @@ spec: pullPolicy: IfNotPresent mode: cluster mainClass: org.apache.spark.examples.SparkPi - mainApplicationFile: "/stackable/spark/examples/jars/spark-examples.jar" - sparkConf: - spark.kubernetes.file.upload.path: "s3a://my-bucket" - s3connection: - reference: spark-data-s3-connection + mainApplicationFile: "local:///stackable/spark/examples/src/main/python/pi.py" logFileDirectory: s3: prefix: eventlogs/ diff --git a/tests/templates/kuttl/spark-history-server/12-deploy-spark-app.yaml.j2 b/tests/templates/kuttl/spark-history-server/12-deploy-spark-app.yaml.j2 index 4207e441..b594c6bb 100644 --- a/tests/templates/kuttl/spark-history-server/12-deploy-spark-app.yaml.j2 +++ b/tests/templates/kuttl/spark-history-server/12-deploy-spark-app.yaml.j2 @@ -17,11 +17,7 @@ spec: pullPolicy: IfNotPresent mode: cluster mainClass: org.apache.spark.examples.SparkPi - mainApplicationFile: "/stackable/spark/examples/jars/spark-examples.jar" - sparkConf: - spark.kubernetes.file.upload.path: "s3a://my-bucket" - s3connection: - reference: spark-data-s3-connection + mainApplicationFile: "local:///stackable/spark/examples/src/main/python/pi.py" logFileDirectory: s3: prefix: eventlogs/