Skip to content
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

Jump to bottom

k8s: Improve ghost nodes removal #9750

Merged
merged 1 commit into from
Apr 3, 2023
Merged

k8s: Improve ghost nodes removal #9750

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
39 changes: 38 additions & 1 deletion src/go/k8s/controllers/redpanda/cluster_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,7 @@ func (r *ClusterReconciler) setPodNodeIDAnnotation(

nodeID, err := r.fetchAdminNodeID(ctx, rp, pod, log)
if err != nil {
return fmt.Errorf("cannot fetch node id for node-id annotation: %w", err)
return fmt.Errorf(`cannot fetch node id for "%s" node-id annotation: %w`, pod.Name, err)
}

realNodeIDStr := fmt.Sprintf("%d", nodeID)
Expand All @@ -537,6 +537,15 @@ func (r *ClusterReconciler) setPodNodeIDAnnotation(
continue
}

oldNodeID, err := strconv.Atoi(nodeIDStr)
if err != nil {
return fmt.Errorf("unable to convert node ID (%s) to int: %w", nodeIDStr, err)
}

if err = r.decommissionBroker(ctx, rp, oldNodeID, log); err != nil {
return fmt.Errorf("unable to decommission broker: %w", err)
}

log.WithValues("pod-name", pod.Name, "node-id", nodeID).Info("setting node-id annotation")
pod.Annotations[PodAnnotationNodeIDKey] = realNodeIDStr
if err := r.Update(ctx, pod, &client.UpdateOptions{}); err != nil {
Expand All @@ -546,6 +555,34 @@ func (r *ClusterReconciler) setPodNodeIDAnnotation(
return nil
}

func (r *ClusterReconciler) decommissionBroker(
ctx context.Context, rp *redpandav1alpha1.Cluster, nodeID int, log logr.Logger,
) error {
log.V(6).WithValues("node-id", nodeID).Info("decommission broker")

redpandaPorts := networking.NewRedpandaPorts(rp)
headlessPorts := collectHeadlessPorts(redpandaPorts)
clusterPorts := collectClusterPorts(redpandaPorts, rp)
headlessSvc := resources.NewHeadlessService(r.Client, rp, r.Scheme, headlessPorts, log)
clusterSvc := resources.NewClusterService(r.Client, rp, r.Scheme, clusterPorts, log)

pki, err := certmanager.NewPki(ctx, r.Client, rp, headlessSvc.HeadlessServiceFQDN(r.clusterDomain), clusterSvc.ServiceFQDN(r.clusterDomain), r.Scheme, log)
if err != nil {
return fmt.Errorf("unable to create pki: %w", err)
}

adminClient, err := r.AdminAPIClientFactory(ctx, r.Client, rp, headlessSvc.HeadlessServiceFQDN(r.clusterDomain), pki.AdminAPIConfigProvider())
if err != nil {
return fmt.Errorf("unable to create admin client: %w", err)
}

err = adminClient.DecommissionBroker(ctx, nodeID)
if err != nil {
return fmt.Errorf("unable to decommission broker: %w", err)
}
return nil
}

func (r *ClusterReconciler) fetchAdminNodeID(ctx context.Context, rp *redpandav1alpha1.Cluster, pod *corev1.Pod, log logr.Logger) (int32, error) {
redpandaPorts := networking.NewRedpandaPorts(rp)
headlessPorts := collectHeadlessPorts(redpandaPorts)
Expand Down