Skip to content

Commit 5d9bea3

Browse files
committed
Revert "fix(test): shorten rolegroup names"
This reverts commit 9e5c83f.
1 parent a837ec1 commit 5d9bea3

3 files changed

Lines changed: 10 additions & 10 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ timeout: 600
88
apiVersion: apps/v1
99
kind: StatefulSet
1010
metadata:
11-
name: test-zk-server-automatic-log
11+
name: test-zk-server-automatic-log-config
1212
status:
1313
readyReplicas: 1
1414
replicas: 1
1515
---
1616
apiVersion: apps/v1
1717
kind: StatefulSet
1818
metadata:
19-
name: test-zk-server-custom-log
19+
name: test-zk-server-custom-log-config
2020
status:
2121
readyReplicas: 1
2222
replicas: 1

tests/templates/kuttl/logging/11-install-zookeeper.yaml.j2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ spec:
3939
vectorAggregatorConfigMapName: zookeeper-vector-aggregator-discovery
4040
servers:
4141
roleGroups:
42-
automatic-log:
42+
automatic-log-config:
4343
replicas: 1
4444
config:
4545
logging:
@@ -80,7 +80,7 @@ spec:
8080
- name: prepared-logs
8181
configMap:
8282
name: prepared-logs
83-
custom-log:
83+
custom-log-config:
8484
replicas: 1
8585
config:
8686
logging:

tests/templates/kuttl/logging/zookeeper-vector-aggregator-values.yaml.j2

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,32 +28,32 @@ customConfig:
2828
type: filter
2929
inputs: [validEvents]
3030
condition: |-
31-
.pod == "test-zk-server-automatic-log-0" && .container == "prepare"
31+
.pod == "test-zk-server-automatic-log-config-0" && .container == "prepare"
3232
filteredAutomaticLogConfigVector:
3333
type: filter
3434
inputs: [validEvents]
3535
condition: |-
36-
.pod == "test-zk-server-automatic-log-0" && .container == "vector"
36+
.pod == "test-zk-server-automatic-log-config-0" && .container == "vector"
3737
filteredAutomaticLogConfigZookeeper:
3838
type: filter
3939
inputs: [validEvents]
4040
condition: |-
41-
.pod == "test-zk-server-automatic-log-0" && .container == "zookeeper"
41+
.pod == "test-zk-server-automatic-log-config-0" && .container == "zookeeper"
4242
filteredCustomLogConfigPrepare:
4343
type: filter
4444
inputs: [validEvents]
4545
condition: |-
46-
.pod == "test-zk-server-custom-log-0" && .container == "prepare"
46+
.pod == "test-zk-server-custom-log-config-0" && .container == "prepare"
4747
filteredCustomLogConfigVector:
4848
type: filter
4949
inputs: [validEvents]
5050
condition: |-
51-
.pod == "test-zk-server-custom-log-0" && .container == "vector"
51+
.pod == "test-zk-server-custom-log-config-0" && .container == "vector"
5252
filteredCustomLogConfigZookeeper:
5353
type: filter
5454
inputs: [validEvents]
5555
condition: |-
56-
.pod == "test-zk-server-custom-log-0" && .container == "zookeeper"
56+
.pod == "test-zk-server-custom-log-config-0" && .container == "zookeeper"
5757
filteredInvalidEvents:
5858
type: filter
5959
inputs: [vector]

0 commit comments

Comments
 (0)