Skip to content

Commit 9d4cf1f

Browse files
maltesandermaltesander
committed
revert: rolegroup length changes
1 parent 2603f67 commit 9d4cf1f

7 files changed

Lines changed: 33 additions & 33 deletions

File tree

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

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: test-kafka-broker-automatic-log
9+
name: test-kafka-broker-automatic-log-config
1010
status:
1111
readyReplicas: 1
1212
replicas: 1
1313
---
1414
apiVersion: apps/v1
1515
kind: StatefulSet
1616
metadata:
17-
name: test-kafka-broker-custom-log
17+
name: test-kafka-broker-custom-log-config
1818
status:
1919
readyReplicas: 1
2020
replicas: 1

‎tests/templates/kuttl/logging/04-install-kafka.yaml.j2‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ spec:
5353
zookeeperConfigMapName: test-kafka-znode
5454
brokers:
5555
roleGroups:
56-
automatic-log:
56+
automatic-log-config:
5757
replicas: 1
5858
config:
5959
logging:
@@ -86,7 +86,7 @@ spec:
8686
- name: prepared-logs
8787
configMap:
8888
name: prepared-logs
89-
custom-log:
89+
custom-log-config:
9090
replicas: 1
9191
config:
9292
logging:

‎tests/templates/kuttl/logging/90-shutdown-kafka.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ apiVersion: kuttl.dev/v1beta1
66
kind: TestStep
77
commands:
88
- script: |
9-
kubectl patch kafkacluster test-kafka -n $NAMESPACE --type merge -p '{"spec":{"brokers":{"roleGroups":{"automatic-log":{"replicas":0}, "custom-log":{"replicas":0}}}}}'
9+
kubectl patch kafkacluster test-kafka -n $NAMESPACE --type merge -p '{"spec":{"brokers":{"roleGroups":{"automatic-log-config":{"replicas":0}, "custom-log-config":{"replicas":0}}}}}'
1010
- script: |
1111
kubectl wait --for=delete pod -l app.kubernetes.io/instance=test-kafka -n $NAMESPACE --timeout=300s

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,25 +28,25 @@ customConfig:
2828
type: filter
2929
inputs: [validEvents]
3030
condition: >-
31-
.pod == "test-kafka-broker-automatic-log-0" &&
31+
.pod == "test-kafka-broker-automatic-log-config-0" &&
3232
.container == "kafka"
3333
filteredAutomaticLogConfigBrokerVector:
3434
type: filter
3535
inputs: [validEvents]
3636
condition: >-
37-
.pod == "test-kafka-broker-automatic-log-0" &&
37+
.pod == "test-kafka-broker-automatic-log-config-0" &&
3838
.container == "vector"
3939
filteredCustomLogConfigBrokerKafka:
4040
type: filter
4141
inputs: [validEvents]
4242
condition: >-
43-
.pod == "test-kafka-broker-custom-log-0" &&
43+
.pod == "test-kafka-broker-custom-log-config-0" &&
4444
.container == "kafka"
4545
filteredCustomLogConfigBrokerVector:
4646
type: filter
4747
inputs: [validEvents]
4848
condition: >-
49-
.pod == "test-kafka-broker-custom-log-0" &&
49+
.pod == "test-kafka-broker-custom-log-config-0" &&
5050
.container == "vector"
5151
filteredInvalidEvents:
5252
type: filter

‎tests/templates/kuttl/smoke-kraft/30-assert.yaml.j2‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ status:
1717
apiVersion: apps/v1
1818
kind: StatefulSet
1919
metadata:
20-
name: test-kafka-broker-automatic-log
20+
name: test-kafka-broker-automatic-log-config
2121
generation: 1 # There should be no unneeded Pod restarts
2222
labels:
2323
restarter.stackable.tech/enabled: "true"
@@ -28,7 +28,7 @@ status:
2828
apiVersion: apps/v1
2929
kind: StatefulSet
3030
metadata:
31-
name: test-kafka-broker-custom-log
31+
name: test-kafka-broker-custom-log-config
3232
generation: 1 # There should be no unneeded Pod restarts
3333
labels:
3434
restarter.stackable.tech/enabled: "true"
@@ -39,7 +39,7 @@ status:
3939
apiVersion: apps/v1
4040
kind: StatefulSet
4141
metadata:
42-
name: test-kafka-controller-automatic-log
42+
name: test-kafka-controller-automatic-log-config
4343
generation: 1 # There should be no unneeded Pod restarts
4444
labels:
4545
restarter.stackable.tech/enabled: "true"
@@ -50,7 +50,7 @@ status:
5050
apiVersion: apps/v1
5151
kind: StatefulSet
5252
metadata:
53-
name: test-kafka-controller-custom-log
53+
name: test-kafka-controller-custom-log-config
5454
generation: 1 # There should be no unneeded Pod restarts
5555
labels:
5656
restarter.stackable.tech/enabled: "true"
@@ -83,7 +83,7 @@ spec:
8383
apiVersion: v1
8484
kind: Service
8585
metadata:
86-
name: test-kafka-broker-automatic-log-headless
86+
name: test-kafka-broker-automatic-log-config-headless
8787
spec:
8888
ports:
8989
- name: kafka-tls
@@ -94,7 +94,7 @@ spec:
9494
apiVersion: v1
9595
kind: Service
9696
metadata:
97-
name: test-kafka-broker-automatic-log-metrics
97+
name: test-kafka-broker-automatic-log-config-metrics
9898
spec:
9999
ports:
100100
- name: metrics
@@ -105,7 +105,7 @@ spec:
105105
apiVersion: v1
106106
kind: Service
107107
metadata:
108-
name: test-kafka-broker-custom-log-headless
108+
name: test-kafka-broker-custom-log-config-headless
109109
spec:
110110
ports:
111111
- name: kafka-tls
@@ -116,7 +116,7 @@ spec:
116116
apiVersion: v1
117117
kind: Service
118118
metadata:
119-
name: test-kafka-broker-custom-log-metrics
119+
name: test-kafka-broker-custom-log-config-metrics
120120
spec:
121121
ports:
122122
- name: metrics
@@ -127,7 +127,7 @@ spec:
127127
apiVersion: v1
128128
kind: Service
129129
metadata:
130-
name: test-kafka-controller-automatic-log-headless
130+
name: test-kafka-controller-automatic-log-config-headless
131131
spec:
132132
ports:
133133
- name: kafka-tls
@@ -138,7 +138,7 @@ spec:
138138
apiVersion: v1
139139
kind: Service
140140
metadata:
141-
name: test-kafka-controller-automatic-log-metrics
141+
name: test-kafka-controller-automatic-log-config-metrics
142142
spec:
143143
ports:
144144
- name: metrics
@@ -149,7 +149,7 @@ spec:
149149
apiVersion: v1
150150
kind: Service
151151
metadata:
152-
name: test-kafka-controller-custom-log-headless
152+
name: test-kafka-controller-custom-log-config-headless
153153
spec:
154154
ports:
155155
- name: kafka-tls
@@ -160,7 +160,7 @@ spec:
160160
apiVersion: v1
161161
kind: Service
162162
metadata:
163-
name: test-kafka-controller-custom-log-metrics
163+
name: test-kafka-controller-custom-log-config-metrics
164164
spec:
165165
ports:
166166
- name: metrics

‎tests/templates/kuttl/smoke-kraft/30-install-kafka.yaml.j2‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ spec:
8484
enableVectorAgent: true
8585
requestedSecretLifetime: 7d
8686
roleGroups:
87-
automatic-log:
87+
automatic-log-config:
8888
replicas: 1
8989
config:
9090
logging:
@@ -117,7 +117,7 @@ spec:
117117
- name: prepared-logs
118118
configMap:
119119
name: prepared-logs
120-
custom-log:
120+
custom-log-config:
121121
replicas: 1
122122
config:
123123
logging:
@@ -157,7 +157,7 @@ spec:
157157
cpu: 300m
158158
limits:
159159
cpu: 1100m
160-
automatic-log:
160+
automatic-log-config:
161161
replicas: 1
162162
config:
163163
logging:
@@ -190,7 +190,7 @@ spec:
190190
- name: prepared-logs
191191
configMap:
192192
name: prepared-logs
193-
custom-log:
193+
custom-log-config:
194194
replicas: 1
195195
config:
196196
logging:

‎tests/templates/kuttl/smoke-kraft/kafka-vector-aggregator-values.yaml.j2‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,49 +36,49 @@ customConfig:
3636
type: filter
3737
inputs: [validEvents]
3838
condition: >-
39-
.pod == "test-kafka-broker-automatic-log-0" &&
39+
.pod == "test-kafka-broker-automatic-log-config-0" &&
4040
.container == "kafka"
4141
filteredAutomaticLogConfigBrokerVector:
4242
type: filter
4343
inputs: [validEvents]
4444
condition: >-
45-
.pod == "test-kafka-broker-automatic-log-0" &&
45+
.pod == "test-kafka-broker-automatic-log-config-0" &&
4646
.container == "vector"
4747
filteredCustomLogConfigBrokerKafka:
4848
type: filter
4949
inputs: [validEvents]
5050
condition: >-
51-
.pod == "test-kafka-broker-custom-log-0" &&
51+
.pod == "test-kafka-broker-custom-log-config-0" &&
5252
.container == "kafka"
5353
filteredCustomLogConfigBrokerVector:
5454
type: filter
5555
inputs: [validEvents]
5656
condition: >-
57-
.pod == "test-kafka-broker-custom-log-0" &&
57+
.pod == "test-kafka-broker-custom-log-config-0" &&
5858
.container == "vector"
5959
filteredAutomaticLogConfigControllerKafka:
6060
type: filter
6161
inputs: [validEvents]
6262
condition: >-
63-
.pod == "test-kafka-controller-automatic-log-0" &&
63+
.pod == "test-kafka-controller-automatic-log-config-0" &&
6464
.container == "kafka"
6565
filteredAutomaticLogConfigControllerVector:
6666
type: filter
6767
inputs: [validEvents]
6868
condition: >-
69-
.pod == "test-kafka-controller-automatic-log-0" &&
69+
.pod == "test-kafka-controller-automatic-log-config-0" &&
7070
.container == "vector"
7171
filteredCustomLogConfigControllerKafka:
7272
type: filter
7373
inputs: [validEvents]
7474
condition: >-
75-
.pod == "test-kafka-controller-custom-log-0" &&
75+
.pod == "test-kafka-controller-custom-log-config-0" &&
7676
.container == "kafka"
7777
filteredCustomLogConfigControllerVector:
7878
type: filter
7979
inputs: [validEvents]
8080
condition: >-
81-
.pod == "test-kafka-controller-custom-log-0" &&
81+
.pod == "test-kafka-controller-custom-log-config-0" &&
8282
.container == "vector"
8383
filteredInvalidEvents:
8484
type: filter

0 commit comments

Comments
 (0)