Skip to content

Commit 6b57dec

Browse files
committed
kuttl test is successful
1 parent 5f5850a commit 6b57dec

File tree

11 files changed

+62
-198
lines changed

11 files changed

+62
-198
lines changed

rust/operator-binary/src/connect/crd.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -265,11 +265,6 @@ impl v1alpha1::SparkConnectServer {
265265
),
266266
// There is no SPARK_CONNECT_OPTS env var.
267267
("SPARK_DAEMON_JAVA_OPTS".to_string(), connect_jvm_args),
268-
// TODO: remove when this is done in the image
269-
(
270-
"JAVA_HOME".to_string(),
271-
"/usr/lib/jvm/java-17-openjdk".to_string(),
272-
),
273268
]);
274269

275270
envs.extend(role.config.env_overrides.clone());

tests/templates/kuttl/spark-connect/00-secrets.yaml.j2

Lines changed: 0 additions & 33 deletions
This file was deleted.

tests/templates/kuttl/spark-connect/03-assert.yaml

Lines changed: 0 additions & 20 deletions
This file was deleted.

tests/templates/kuttl/spark-connect/03-setup-minio.yaml

Lines changed: 0 additions & 24 deletions
This file was deleted.

tests/templates/kuttl/spark-connect/05-s3-connection.yaml.j2

Lines changed: 0 additions & 38 deletions
This file was deleted.

tests/templates/kuttl/spark-connect/10-assert.yaml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,14 @@ metadata:
1010
status:
1111
readyReplicas: 1
1212
---
13-
apiVersion: policy/v1
14-
kind: PodDisruptionBudget
15-
metadata:
16-
name: spark-connect-node
17-
status:
18-
expectedPods: 1
19-
currentHealthy: 1
20-
disruptionsAllowed: 1
13+
apiVersion: kuttl.dev/v1beta1
14+
kind: TestAssert
15+
timeout: 30
16+
commands:
17+
# Test that two spark-connect executors are running.
18+
# Sleep 5 to prevent the following spark connect app from failing
19+
# while the spark-connect server is busy setting up the executors.
20+
- script: |
21+
sleep 5
22+
EXECUTOR_COUNT=$(kubectl get pods -n $NAMESPACE --selector 'spark-app-name=spark-connect-node-default' --field-selector='status.phase=Running' -o NAME|wc -l)
23+
test 2 -eq "$EXECUTOR_COUNT"
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
---
2+
apiVersion: kuttl.dev/v1beta1
3+
kind: TestAssert
4+
metadata:
5+
name: simple-connect-app
6+
timeout: 180
7+
---
8+
apiVersion: batch/v1
9+
kind: Job
10+
metadata:
11+
name: simple-connect-app
12+
status:
13+
succeeded: 1
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
---
2+
apiVersion: batch/v1
3+
kind: Job
4+
metadata:
5+
name: simple-connect-app
6+
labels:
7+
stackable.tech/vendor: Stackable
8+
spec:
9+
template:
10+
spec:
11+
restartPolicy: OnFailure
12+
activeDeadlineSeconds: 100
13+
containers:
14+
- name: simple-connect-app
15+
{% if test_scenario['values']['spark-connect-client'].find(",") > 0 %}
16+
image: "{{ test_scenario['values']['spark-connect-client'].split(',')[1] }}"
17+
{% else %}
18+
image: oci.stackable.tech/sdp/spark-connect-client:{{ test_scenario['values']['spark-connect-client'] }}-stackable0.0.0-dev
19+
{% endif %}
20+
imagePullPolicy: IfNotPresent
21+
command:
22+
[
23+
"/usr/bin/python",
24+
"/stackable/spark-connect-examples/python/simple-connect-app.py",
25+
"sc://spark-connect-node-default",
26+
]
27+
resources:
28+
limits:
29+
cpu: 500m
30+
memory: 128Mi
31+
requests:
32+
cpu: 200m
33+
memory: 128Mi

tests/templates/kuttl/spark-connect/helm-bitnami-minio-values.yaml

Lines changed: 0 additions & 49 deletions
This file was deleted.

tests/templates/kuttl/spark-connect/simple-connect-app.py

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)