Skip to content

Commit d654a97

Browse files
committed
run pre commit
1 parent e5f366b commit d654a97

15 files changed

Lines changed: 42 additions & 37 deletions

File tree

.vscode/launch.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@
2020
"cwd": "${workspaceFolder}"
2121
}
2222
]
23-
}
23+
}

docs/modules/kafka/pages/usage-guide/kraft-controller.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
= KRaft
22
:description: Apache Kafka KRaft mode with the Stackable Operator for Apache Kafka
33

4-
Apache Kafka's KRaft mode (Kafka Raft Metadata mode) replaces Apache ZooKeeper with Kafka’s own built-in consensus mechanism based on the Raft protocol.
4+
Apache Kafka's KRaft mode (Kafka Raft Metadata mode) replaces Apache ZooKeeper with Kafka’s own built-in consensus mechanism based on the Raft protocol.
55
This simplifies Kafka’s architecture, reducing operational complexity by consolidating cluster metadata management into Kafka itself.
66

77
WARNING: The Stackable Operator for Apache Kafka currently does not support automatic cluster upgrades from Apache ZooKeeper to KRaft.
@@ -76,7 +76,7 @@ controllers:
7676

7777
=== Overrides
7878

79-
== Internal operator details
79+
== Internal operator details
8080

8181
KRaft mode requires major configuration changes compared to ZooKeeper:
8282

rust/operator-binary/src/config/command.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,12 +151,12 @@ pub fn controller_kafka_container_command(
151151
echo \"{KAFKA_LISTENER_SECURITY_PROTOCOL_MAP}={listener_security_protocol_map}\" >> /tmp/{properties_file}
152152
echo \"{KAFKA_CONTROLLER_QUORUM_VOTERS}={controller_quorum_voters}\" >> /tmp/{properties_file}
153153
154-
bin/kafka-storage.sh format --cluster-id {cluster_id} --config /tmp/{properties_file} --ignore-formatted {initial_controller_command}
154+
bin/kafka-storage.sh format --cluster-id {cluster_id} --config /tmp/{properties_file} --ignore-formatted {initial_controller_command}
155155
bin/kafka-server-start.sh /tmp/{properties_file} &
156156
157157
wait_for_termination $!
158158
{create_vector_shutdown_file_command}
159-
",
159+
",
160160
remove_vector_shutdown_file_command = remove_vector_shutdown_file_command(STACKABLE_LOG_DIR),
161161
config_dir = STACKABLE_CONFIG_DIR,
162162
properties_file = CONTROLLER_PROPERTIES_FILE,

tests/templates/kuttl/cluster-operation/20-install-kafka.yaml.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spec:
1616
productVersion: "{{ test_scenario['values']['kafka-latest'] }}"
1717
{% endif %}
1818
pullPolicy: IfNotPresent
19-
{% if lookup('env', 'VECTOR_AGGREGATOR') or test_scenario['values']['use-kraft-controller'] == 'false' %}
19+
{% if lookup('env', 'VECTOR_AGGREGATOR') or test_scenario['values']['use-kraft-controller'] == 'false' %}
2020
clusterConfig:
2121
{% endif %}
2222
{% if lookup('env', 'VECTOR_AGGREGATOR') %}

tests/templates/kuttl/cluster-operation/30-stop-kafka.yaml.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spec:
1616
productVersion: "{{ test_scenario['values']['kafka-latest'] }}"
1717
{% endif %}
1818
pullPolicy: IfNotPresent
19-
{% if lookup('env', 'VECTOR_AGGREGATOR') or test_scenario['values']['use-kraft-controller'] == 'false' %}
19+
{% if lookup('env', 'VECTOR_AGGREGATOR') or test_scenario['values']['use-kraft-controller'] == 'false' %}
2020
clusterConfig:
2121
{% endif %}
2222
{% if lookup('env', 'VECTOR_AGGREGATOR') %}

tests/templates/kuttl/cluster-operation/40-pause-kafka.yaml.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spec:
1616
productVersion: "{{ test_scenario['values']['kafka-latest'] }}"
1717
{% endif %}
1818
pullPolicy: IfNotPresent
19-
{% if lookup('env', 'VECTOR_AGGREGATOR') or test_scenario['values']['use-kraft-controller'] == 'false' %}
19+
{% if lookup('env', 'VECTOR_AGGREGATOR') or test_scenario['values']['use-kraft-controller'] == 'false' %}
2020
clusterConfig:
2121
{% endif %}
2222
{% if lookup('env', 'VECTOR_AGGREGATOR') %}

tests/templates/kuttl/cluster-operation/50-restart-kafka.yaml.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
{% else %}
1616
productVersion: "{{ test_scenario['values']['kafka-latest'] }}"
1717
{% endif %}
18-
{% if lookup('env', 'VECTOR_AGGREGATOR') or test_scenario['values']['use-kraft-controller'] == 'false' %}
18+
{% if lookup('env', 'VECTOR_AGGREGATOR') or test_scenario['values']['use-kraft-controller'] == 'false' %}
1919
clusterConfig:
2020
{% endif %}
2121
{% if lookup('env', 'VECTOR_AGGREGATOR') %}

tests/templates/kuttl/delete-rolegroup/02-assert.yaml.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@ metadata:
3535
status:
3636
readyReplicas: 1
3737
replicas: 1
38-
{% endif %}
38+
{% endif %}

tests/templates/kuttl/delete-rolegroup/02-install-kafka.yaml.j2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ spec:
2727
config:
2828
gracefulShutdownTimeout: 30s # speed up tests
2929
logging:
30-
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
30+
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
3131
roleGroups:
3232
default:
3333
replicas: 2
3434
secondary:
3535
replicas: 1
36-
{% endif %}
36+
{% endif %}
3737
brokers:
3838
config:
3939
gracefulShutdownTimeout: 30s # speed up tests

tests/templates/kuttl/delete-rolegroup/03-assert.yaml.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ metadata:
1919
status:
2020
readyReplicas: 2
2121
replicas: 2
22-
{% endif %}
22+
{% endif %}

0 commit comments

Comments
 (0)