Skip to content

Commit b3158b1

Browse files
committed
Use different endpoints for data and event logs.
1 parent 1650f09 commit b3158b1

File tree

7 files changed

+74
-6
lines changed

7 files changed

+74
-6
lines changed

tests/templates/kuttl/spark-history-server/00-s3-secret.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,12 @@ metadata:
3232
secrets.stackable.tech/class: history-credentials-class
3333
timeout: 240
3434
stringData:
35-
accessKeyId: minioAccessKey
36-
secretAccessKey: minioSecretKey
35+
accessKeyId: eventLogAccessKey
36+
secretAccessKey: eventLogSecretKey
37+
# The following two entries are used by the Bitnami chart for MinIO to
38+
# set up credentials for accessing buckets managed by the MinIO tenant.
39+
root-user: eventLogAccessKey
40+
root-password: eventLogSecretKey
3741
---
3842
apiVersion: secrets.stackable.tech/v1alpha1
3943
kind: SecretClass

tests/templates/kuttl/spark-history-server/00-setup-minio.yaml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@ commands:
88
--version 11.9.2
99
-f helm-bitnami-minio-values.yaml
1010
--repo https://charts.bitnami.com/bitnami minio
11+
- script: >-
12+
helm install eventlog-minio
13+
--namespace $NAMESPACE
14+
--version 11.9.2
15+
-f helm-bitnami-eventlog-minio-values.yaml
16+
--repo https://charts.bitnami.com/bitnami minio
1117
---
1218
apiVersion: v1
1319
kind: Pod
@@ -42,3 +48,37 @@ spec:
4248
value: "9000"
4349
- name: MINIO_SERVER_SCHEME
4450
value: http
51+
---
52+
apiVersion: v1
53+
kind: Pod
54+
metadata:
55+
name: eventlog-minio-client
56+
labels:
57+
app: eventlog-minio-client
58+
spec:
59+
restartPolicy: Never
60+
containers:
61+
- name: minio-client
62+
image: docker.io/bitnami/minio-client:2022.8.11-debian-11-r3
63+
command: ["bash", "-c", "sleep infinity"]
64+
stdin: true
65+
tty: true
66+
env:
67+
- name: MINIO_SERVER_ACCESS_KEY
68+
valueFrom:
69+
secretKeyRef:
70+
name: history-credentials
71+
key: root-user
72+
optional: false
73+
- name: MINIO_SERVER_SECRET_KEY
74+
valueFrom:
75+
secretKeyRef:
76+
name: history-credentials
77+
key: root-password
78+
optional: false
79+
- name: MINIO_SERVER_HOST
80+
value: eventlog-minio
81+
- name: MINIO_SERVER_PORT_NUMBER
82+
value: "9000"
83+
- name: MINIO_SERVER_SCHEME
84+
value: http

tests/templates/kuttl/spark-history-server/01-prepare-bucket.yaml.j2

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ commands:
77
- command: kubectl cp -n $NAMESPACE spark-examples_2.12-{{ test_scenario['values']['spark'] }}.jar minio-client:/tmp
88
- command: kubectl exec -n $NAMESPACE minio-client -- sh -c 'mc alias set test-minio http://test-minio:9000 $$MINIO_SERVER_ACCESS_KEY $$MINIO_SERVER_SECRET_KEY'
99
- command: kubectl exec -n $NAMESPACE minio-client -- mc mb test-minio/my-bucket
10-
- command: kubectl exec -n $NAMESPACE minio-client -- mc mb test-minio/spark-logs/eventlogs
10+
- command: kubectl exec -n $NAMESPACE eventlog-minio-client -- sh -c 'mc alias set eventlog-minio http://eventlog-minio:9000 $$MINIO_SERVER_ACCESS_KEY $$MINIO_SERVER_SECRET_KEY'
11+
- command: kubectl exec -n $NAMESPACE eventlog-minio-client -- mc mb eventlog-minio/spark-logs/eventlogs
1112
- script: >-
1213
kubectl exec -n $NAMESPACE minio-client -- mc cp /tmp/spark-examples_2.12-{{ test_scenario['values']['spark'] }}.jar test-minio/my-bucket

tests/templates/kuttl/spark-history-server/05-deploy-history-server.yaml.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
bucketName: spark-logs
1616
connection:
1717
inline:
18-
host: test-minio
18+
host: eventlog-minio
1919
port: 9000
2020
accessStyle: Path
2121
credentials:

tests/templates/kuttl/spark-history-server/10-deploy-spark-app.yaml.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ spec:
2828
bucketName: spark-logs
2929
connection:
3030
inline:
31-
host: test-minio
31+
host: eventlog-minio
3232
port: 9000
3333
accessStyle: Path
3434
credentials:

tests/templates/kuttl/spark-history-server/12-deploy-spark-app.yaml.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ spec:
2828
bucketName: spark-logs
2929
connection:
3030
inline:
31-
host: test-minio
31+
host: eventlog-minio
3232
port: 9000
3333
accessStyle: Path
3434
credentials:
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
---
2+
volumePermissions:
3+
enabled: false
4+
5+
podSecurityContext:
6+
enabled: false
7+
8+
containerSecurityContext:
9+
enabled: false
10+
11+
mode: standalone
12+
13+
disableWebUI: true
14+
15+
persistence:
16+
enabled: false
17+
18+
resources:
19+
requests:
20+
memory: 1Gi
21+
22+
auth:
23+
existingSecret: history-credentials

0 commit comments

Comments
 (0)