Skip to content

Commit b6881bc

Browse files
test(logging): Use descriptive role group names equal to other operators
1 parent 37ee863 commit b6881bc

3 files changed

Lines changed: 9 additions & 9 deletions

File tree

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,28 +30,28 @@ customConfig:
3030
inputs:
3131
- validEvents
3232
condition: >-
33-
.pod == "opensearch-nodes-automatic-0" &&
33+
.pod == "opensearch-nodes-automatic-log-config-0" &&
3434
.container == "opensearch"
3535
filteredAutomaticLogConfigVector:
3636
type: filter
3737
inputs:
3838
- validEvents
3939
condition: >-
40-
.pod == "opensearch-nodes-automatic-0" &&
40+
.pod == "opensearch-nodes-automatic-log-config-0" &&
4141
.container == "vector"
4242
filteredCustomLogConfigOpenSearch:
4343
type: filter
4444
inputs:
4545
- validEvents
4646
condition: >-
47-
.pod == "opensearch-nodes-custom-0" &&
47+
.pod == "opensearch-nodes-custom-log-config-0" &&
4848
.container == "opensearch"
4949
filteredCustomLogConfigVector:
5050
type: filter
5151
inputs:
5252
- validEvents
5353
condition: >-
54-
.pod == "opensearch-nodes-custom-0" &&
54+
.pod == "opensearch-nodes-custom-log-config-0" &&
5555
.container == "vector"
5656
filteredInvalidEvents:
5757
type: filter

tests/templates/kuttl/logging/20-assert.yaml.j2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ timeout: 600
66
apiVersion: apps/v1
77
kind: StatefulSet
88
metadata:
9-
name: opensearch-nodes-automatic
9+
name: opensearch-nodes-automatic-log-config
1010
status:
1111
readyReplicas: 1
1212
replicas: 1
1313
---
1414
apiVersion: apps/v1
1515
kind: StatefulSet
1616
metadata:
17-
name: opensearch-nodes-custom
17+
name: opensearch-nodes-custom-log-config
1818
status:
1919
readyReplicas: 1
2020
replicas: 1

tests/templates/kuttl/logging/20-install-opensearch.yaml.j2

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ spec:
3838
app.kubernetes.io/component: nodes
3939
app.kubernetes.io/instance: opensearch
4040
app.kubernetes.io/name: opensearch
41-
app.kubernetes.io/role-group: automatic
41+
app.kubernetes.io/role-group: automatic-log-config
4242
type: ClusterIP
4343
---
4444
apiVersion: opensearch.stackable.tech/v1alpha1
@@ -56,7 +56,7 @@ spec:
5656
vectorAggregatorConfigMapName: opensearch-vector-aggregator-discovery
5757
nodes:
5858
roleGroups:
59-
automatic:
59+
automatic-log-config:
6060
config:
6161
logging:
6262
enableVectorAgent: true
@@ -78,7 +78,7 @@ spec:
7878
ROOT:
7979
level: INFO
8080
replicas: 1
81-
custom:
81+
custom-log-config:
8282
config:
8383
logging:
8484
enableVectorAgent: true

0 commit comments

Comments
 (0)