Skip to content

Commit 37b1f60

Browse files
Use a ConfigMap for the prepared logs in the logging test (#544)
1 parent d3f9de0 commit 37b1f60

File tree

6 files changed

+25
-14
lines changed

6 files changed

+25
-14
lines changed
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
apiVersion: kuttl.dev/v1beta1
3+
kind: TestStep
4+
commands:
5+
- script: >
6+
kubectl create configmap prepared-logs
7+
--from-file=prepared-logs.log4j.xml
8+
--namespace=$NAMESPACE

tests/templates/kuttl/logging/04-assert.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,23 @@ timeout: 600
66
apiVersion: apps/v1
77
kind: StatefulSet
88
metadata:
9-
name: test-hdfs-custom-log-namenode-default
9+
name: test-hdfs-automatic-log-namenode-default
1010
status:
1111
readyReplicas: 2
1212
replicas: 2
1313
---
1414
apiVersion: apps/v1
1515
kind: StatefulSet
1616
metadata:
17-
name: test-hdfs-custom-log-datanode-default
17+
name: test-hdfs-automatic-log-datanode-default
1818
status:
1919
readyReplicas: 1
2020
replicas: 1
2121
---
2222
apiVersion: apps/v1
2323
kind: StatefulSet
2424
metadata:
25-
name: test-hdfs-custom-log-journalnode-default
25+
name: test-hdfs-automatic-log-journalnode-default
2626
status:
2727
readyReplicas: 1
2828
replicas: 1

tests/templates/kuttl/logging/03-install-hdfs-automatic-log.yaml.j2 renamed to tests/templates/kuttl/logging/04-install-hdfs-automatic-log.yaml.j2

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,17 @@ spec:
6363
loggers:
6464
ROOT:
6565
level: INFO
66+
podOverrides:
67+
spec:
68+
containers:
69+
- name: vector
70+
volumeMounts:
71+
- name: prepared-logs
72+
mountPath: /stackable/log/prepared-logs
73+
volumes:
74+
- name: prepared-logs
75+
configMap:
76+
name: prepared-logs
6677
dataNodes:
6778
config:
6879
resources:

tests/templates/kuttl/logging/03-assert.yaml renamed to tests/templates/kuttl/logging/05-assert.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,23 @@ timeout: 600
66
apiVersion: apps/v1
77
kind: StatefulSet
88
metadata:
9-
name: test-hdfs-automatic-log-namenode-default
9+
name: test-hdfs-custom-log-namenode-default
1010
status:
1111
readyReplicas: 2
1212
replicas: 2
1313
---
1414
apiVersion: apps/v1
1515
kind: StatefulSet
1616
metadata:
17-
name: test-hdfs-automatic-log-datanode-default
17+
name: test-hdfs-custom-log-datanode-default
1818
status:
1919
readyReplicas: 1
2020
replicas: 1
2121
---
2222
apiVersion: apps/v1
2323
kind: StatefulSet
2424
metadata:
25-
name: test-hdfs-automatic-log-journalnode-default
25+
name: test-hdfs-custom-log-journalnode-default
2626
status:
2727
readyReplicas: 1
2828
replicas: 1

tests/templates/kuttl/logging/05-copy-prepared-logs.yaml

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

0 commit comments

Comments
 (0)