github/kamaji
1
0
Fork 0
mirror of https://github.com/clastix/kamaji.git synced 2026-02-14 18:10:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: cleanup ingress managed by kamaji (#726)

Browse Source
This commit is contained in:
daseul cho
2025-03-16 19:14:06 +09:00
committed by GitHub
parent 4f70df8b61
commit e7df0f15d8
1 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
internal/resources/k8s_ingress_resource.go
View File

@@ -80,10 +80,30 @@ func (r *KubernetesIngressResource) ShouldCleanup(tcp *kamajiv1alpha1.TenantCont
return tcp.Spec.ControlPlane.Ingress == nil
}
func (r *KubernetesIngressResource) CleanUp(ctx context.Context, _ *kamajiv1alpha1.TenantControlPlane) (bool, error) {
func (r *KubernetesIngressResource) CleanUp(ctx context.Context, tcp *kamajiv1alpha1.TenantControlPlane) (bool, error) {
logger := log.FromContext(ctx, "resource", r.GetName())
if err := r.Client.Delete(ctx, r.resource); err != nil {
var ingress networkingv1.Ingress
if err := r.Client.Get(ctx, client.ObjectKey{
Namespace: r.resource.GetNamespace(),
Name: r.resource.GetName(),
}, &ingress); err != nil {
if !k8serrors.IsNotFound(err) {
logger.Error(err, "failed to get ingress resource before cleanup")
return false, err
}
return false, nil
}
if !metav1.IsControlledBy(&ingress, tcp) {
logger.Info("skipping cleanup: ingress is not managed by Kamaji", "name", ingress.Name, "namespace", ingress.Namespace)
return false, nil
}
if err := r.Client.Delete(ctx, &ingress); err != nil {
if !k8serrors.IsNotFound(err) {
logger.Error(err, "cannot cleanup resource")