Skip to content

acceptance: Change decommission node pruning #1203

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RafalKorepta merged 1 commit into from
Dec 12, 2025
Merged

acceptance: Change decommission node pruning #1203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion acceptance/features/decommissioning.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ Feature: Decommissioning brokers
When I physically shutdown a kubernetes node for cluster "decommissioning"
And cluster "decommissioning" is unhealthy
And cluster "decommissioning" has only 2 remaining nodes
And I prune any kubernetes node that is now in a NotReady status
And I prune kubernetes node that was removed in previous step
Then cluster "decommissioning" should recover
And cluster "decommissioning" should be stable with 3 nodes
12 changes: 10 additions & 2 deletions acceptance/steps/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ func checkClusterHealthCondition(ctx context.Context, t framework.TestingT, clus
t.Logf("Cluster %q contains Healthy reason %q!", clusterName, reason)
}

func shutdownRandomClusterNode(ctx context.Context, t framework.TestingT, clusterName string) {
func shutdownRandomClusterNode(ctx context.Context, t framework.TestingT, clusterName string) context.Context {
var clusterSet appsv1.StatefulSet

key := t.ResourceKey(clusterName)
Expand All @@ -164,9 +164,10 @@ func shutdownRandomClusterNode(ctx context.Context, t framework.TestingT, cluste
pod := pods.Items[index]

t.ShutdownNode(ctx, pod.Spec.NodeName)
return context.WithValue(ctx, recordedVariable("ShutdownNodeName"), pod.Spec.NodeName)
}

func shutdownNodeOfPod(ctx context.Context, t framework.TestingT, podName string) {
func shutdownNodeOfPod(ctx context.Context, t framework.TestingT, podName string) context.Context {
t.ResourceKey(podName)

var pod corev1.Pod
Expand All @@ -183,6 +184,7 @@ func shutdownNodeOfPod(ctx context.Context, t framework.TestingT, podName string
require.NoError(t, t.Update(ctx, &node))

t.ShutdownNode(ctx, pod.Spec.NodeName)
return context.WithValue(ctx, recordedVariable("ShutdownNodeName"), pod.Spec.NodeName)
}

func deleteNotReadyKubernetesNodes(ctx context.Context, t framework.TestingT) {
Expand All @@ -198,6 +200,12 @@ func deleteNotReadyKubernetesNodes(ctx context.Context, t framework.TestingT) {
}
}

func deleteKubernetesNodesFromContext(ctx context.Context, t framework.TestingT) {
shutdownNodeName := ctx.Value(recordedVariable("ShutdownNodeName"))
t.Logf("Deleting Kubernetes node: %q", shutdownNodeName)
t.DeleteNode(ctx, shutdownNodeName.(string))
}

func checkClusterNodeCount(ctx context.Context, t framework.TestingT, clusterName string, nodeCount int32) {
var cluster redpandav1alpha2.Redpanda
var actualNodeCount int32
Expand Down
1 change: 1 addition & 0 deletions acceptance/steps/register.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ func init() {
framework.RegisterStep(`^I prune any kubernetes node that is now in a NotReady status$`, deleteNotReadyKubernetesNodes)
framework.RegisterStep(`I stop the Node running Pod "([^"]+)"`, shutdownNodeOfPod)
framework.RegisterStep(`^cluster "([^"]*)" has only (\d+) remaining nodes$`, checkClusterNodeCount)
framework.RegisterStep(`^I prune kubernetes node that was removed in previous step$`, deleteKubernetesNodesFromContext)

// Operator upgrade scenario steps
framework.RegisterStep(`^I install local CRDs from "([^"]*)"`, iInstallLocalCRDs)
Expand Down
Loading