fix: use a new k8s_namespace column and use label based lookups #4436
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,7 +3,6 @@ package kubernetes | |
| import ( | ||
| "context" | ||
| "fmt" | ||
|
|
||
| "connectrpc.com/connect" | ||
| kranev1 "github.com/unkeyed/unkey/go/gen/proto/krane/v1" | ||
|
|
@@ -15,32 +14,72 @@ import ( | |
| // DeleteDeployment removes a deployment and all associated Kubernetes resources. | ||
| // | ||
| // This method performs a complete cleanup of a deployment by removing both | ||
| // the Service and StatefulSet resources. Resources are selected by their | ||
| // deployment-id label rather than by name, following Kubernetes best practices | ||
| // for resource management. | ||
| func (k *k8s) DeleteDeployment(ctx context.Context, req *connect.Request[kranev1.DeleteDeploymentRequest]) (*connect.Response[kranev1.DeleteDeploymentResponse], error) { | ||
| deploymentID := req.Msg.GetDeploymentId() | ||
| namespace := req.Msg.GetNamespace() | ||
|
|
||
| k.logger.Info("deleting deployment", | ||
| "namespace", namespace, | ||
| "deployment_id", deploymentID, | ||
| ) | ||
|
|
||
| // Create label selector for this deployment | ||
| labelSelector := fmt.Sprintf("deployment-id=%s", deploymentID) | ||
|
Comment on lines
+29
to
+30
Contributor
There was a problem hiding this comment. Use the centralized label constant for consistency. The label selector uses the hard-coded string +import "github.com/unkeyed/unkey/go/apps/krane/backend/kubernetes/labels"
+
// Create label selector for this deployment
-labelSelector := fmt.Sprintf("deployment-id=%s", deploymentID)
+labelSelector := fmt.Sprintf("%s=%s", labels.DeploymentID, deploymentID)
🤖 Prompt for AI Agents |
||
|
|
||
| //nolint: exhaustruct | ||
| deleteOptions := metav1.DeleteOptions{ | ||
| PropagationPolicy: ptr.P(metav1.DeletePropagationBackground), | ||
| } | ||
|
|
||
| // List and delete Services with this deployment-id label | ||
| //nolint: exhaustruct | ||
| serviceList, err := k.clientset.CoreV1().Services(namespace).List(ctx, metav1.ListOptions{ | ||
| LabelSelector: labelSelector, | ||
| }) | ||
| if err != nil { | ||
| return nil, connect.NewError(connect.CodeInternal, fmt.Errorf("failed to list services: %w", err)) | ||
| } | ||
|
|
||
| for _, service := range serviceList.Items { | ||
| k.logger.Debug("deleting service", | ||
| "name", service.Name, | ||
| "deployment_id", deploymentID, | ||
| ) | ||
| err = k.clientset.CoreV1().Services(namespace).Delete(ctx, service.Name, deleteOptions) | ||
| if err != nil && !apierrors.IsNotFound(err) { | ||
| return nil, connect.NewError(connect.CodeInternal, fmt.Errorf("failed to delete service %s: %w", service.Name, err)) | ||
| } | ||
| } | ||
|
|
||
| // List and delete StatefulSets with this deployment-id label | ||
| //nolint: exhaustruct | ||
| statefulSetList, err := k.clientset.AppsV1().StatefulSets(namespace).List(ctx, metav1.ListOptions{ | ||
| LabelSelector: labelSelector, | ||
| }) | ||
| if err != nil { | ||
| return nil, connect.NewError(connect.CodeInternal, fmt.Errorf("failed to list statefulsets: %w", err)) | ||
| } | ||
|
|
||
| for _, statefulSet := range statefulSetList.Items { | ||
| k.logger.Debug("deleting statefulset", | ||
| "name", statefulSet.Name, | ||
| "deployment_id", deploymentID, | ||
| ) | ||
| err = k.clientset.AppsV1().StatefulSets(namespace).Delete(ctx, statefulSet.Name, deleteOptions) | ||
| if err != nil && !apierrors.IsNotFound(err) { | ||
| return nil, connect.NewError(connect.CodeInternal, fmt.Errorf("failed to delete statefulset %s: %w", statefulSet.Name, err)) | ||
| } | ||
| } | ||
|
|
||
| k.logger.Info("deployment deleted successfully", | ||
| "namespace", namespace, | ||
| "deployment_id", deploymentID, | ||
| "services_deleted", len(serviceList.Items), | ||
| "statefulsets_deleted", len(statefulSetList.Items), | ||
| ) | ||
|
|
||
| return connect.NewResponse(&kranev1.DeleteDeploymentResponse{}), nil | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🛠️ Refactor suggestion | 🟠 Major
Extract
kraneconstant to package level for reuse.This constant is duplicated/missing in
deployment_get.go. Based on the AI summary, there should be a shared constant ingo/apps/krane/backend/kubernetes/krane.go. Consider using that or moving this to package level.Or import from the shared location if
krane.goexports it:🤖 Prompt for AI Agents