Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions rust/operator-binary/src/resource/statefulset.rs
Original file line number Diff line number Diff line change
Expand Up @@ -693,17 +693,19 @@ pub fn build_controller_rolegroup_statefulset(
port: IntOrString::Int(kafka_security.client_port().into()),
..Default::default()
}),
timeout_seconds: Some(5),
period_seconds: Some(5),
timeout_seconds: Some(10),
period_seconds: Some(10),
failure_threshold: Some(6),
..Probe::default()
})
.readiness_probe(Probe {
tcp_socket: Some(TCPSocketAction {
port: IntOrString::Int(kafka_security.client_port().into()),
..Default::default()
}),
timeout_seconds: Some(5),
period_seconds: Some(5),
timeout_seconds: Some(10),
period_seconds: Some(10),
failure_threshold: Some(6),
..Probe::default()
});

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
apiVersion: kuttl.dev/v1beta1
kind: TestStep
timeout: 300
timeout: 600
---
apiVersion: kafka.stackable.tech/v1alpha1
kind: KafkaCluster
Expand Down
2 changes: 1 addition & 1 deletion tests/templates/kuttl/operations-kraft/25-assert.yaml.j2
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
apiVersion: kuttl.dev/v1beta1
kind: TestAssert
timeout: 300
timeout: 600
commands:
- script: kubectl -n $NAMESPACE wait --for=condition=reconciliationPaused kafkaclusters.kafka.stackable.tech/test-kafka --timeout 301s
---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
apiVersion: kuttl.dev/v1beta1
kind: TestStep
timeout: 300
timeout: 600
---
apiVersion: kafka.stackable.tech/v1alpha1
kind: KafkaCluster
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
apiVersion: kuttl.dev/v1beta1
kind: TestStep
timeout: 300
timeout: 600
---
apiVersion: kafka.stackable.tech/v1alpha1
kind: KafkaCluster
Expand Down
2 changes: 1 addition & 1 deletion tests/templates/kuttl/operations-kraft/50-assert.yaml.j2
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
apiVersion: kuttl.dev/v1beta1
kind: TestAssert
timeout: 300
timeout: 600
commands:
- script: kubectl -n $NAMESPACE wait --for=condition=available kafkaclusters.kafka.stackable.tech/test-kafka --timeout 301s
---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
apiVersion: kuttl.dev/v1beta1
kind: TestStep
timeout: 300
timeout: 600
---
apiVersion: kafka.stackable.tech/v1alpha1
kind: KafkaCluster
Expand Down
2 changes: 1 addition & 1 deletion tests/templates/kuttl/operations-kraft/60-assert.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
---
apiVersion: kuttl.dev/v1beta1
kind: TestAssert
timeout: 300
timeout: 600
commands:
- script: kubectl -n $NAMESPACE wait --for=condition=available kafkaclusters.kafka.stackable.tech/test-kafka --timeout 301s
---
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
---
apiVersion: kuttl.dev/v1beta1
kind: TestStep
timeout: 300
timeout: 600
---
apiVersion: kafka.stackable.tech/v1alpha1
kind: KafkaCluster
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
---
apiVersion: kuttl.dev/v1beta1
kind: TestAssert
timeout: 300
timeout: 600
commands:
- script: kubectl -n $NAMESPACE wait --for=condition=available kafkaclusters.kafka.stackable.tech/test-kafka --timeout 301s
---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
#
# This test step is disabled becaus Kraft controller do scale down reliably.
# This leads to flaky tests.
#
{% if not test_scenario['values']['kafka-kraft'].startswith("3.7") %}
---
apiVersion: kuttl.dev/v1beta1
kind: TestStep
timeout: 300
timeout: 600
---
apiVersion: kafka.stackable.tech/v1alpha1
kind: KafkaCluster
Expand Down
21 changes: 21 additions & 0 deletions tests/templates/kuttl/operations-kraft/80-assert.yaml.j2
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{% if not test_scenario['values']['kafka-kraft'].startswith("3.7") %}
---
apiVersion: kuttl.dev/v1beta1
kind: TestAssert
timeout: 600
---
apiVersion: apps/v1
kind: StatefulSet
metadata:
name: test-kafka-broker-default
status:
replicas: 0
---
apiVersion: apps/v1
kind: StatefulSet
metadata:
name: test-kafka-controller-default
status:
readyReplicas: 3
replicas: 3
{% endif %}
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
#
# This is a test helper to ensure that all broker pods are deleted before
# the test namespace is terminated.
# The brokers must be deleted because otherwise they are left dangling until
# the test timeouts and fails.
#
{% if not test_scenario['values']['kafka-kraft'].startswith("3.7") %}
---
apiVersion: kuttl.dev/v1beta1
kind: TestStep
timeout: 600
---
apiVersion: kafka.stackable.tech/v1alpha1
kind: KafkaCluster
metadata:
name: test-kafka
spec:
image:
{% if test_scenario['values']['kafka-kraft'].find(",") > 0 %}
custom: "{{ test_scenario['values']['kafka-kraft'].split(',')[1] }}"
productVersion: "{{ test_scenario['values']['kafka-kraft'].split(',')[0] }}"
{% else %}
productVersion: "{{ test_scenario['values']['kafka-kraft'] }}"
{% endif %}
{% if lookup('env', 'VECTOR_AGGREGATOR') %}
clusterConfig:
vectorAggregatorConfigMapName: vector-aggregator-discovery
{% endif %}
controllers:
config:
logging:
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
roleGroups:
default:
replicas: 3
brokers:
config:
logging:
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
roleGroups:
default:
replicas: 0
clusterOperation:
stopped: false
reconciliationPaused: false
{% endif %}