infra: use labels when deleting infra (envoyproxy#4430)

api/v1alpha1/shared_types.go

@@ -98,7 +98,7 @@ type KubernetesDeploymentSpec struct {
 	// TODO: Expose config as use cases are better understood, e.g. labels.
 }
 
-// KubernetesDaemonsetSpec defines the desired state of the Kubernetes daemonset resource.
+// KubernetesDaemonSetSpec defines the desired state of the Kubernetes daemonset resource.
 type KubernetesDaemonSetSpec struct {
 	// Patch defines how to perform the patch operation to daemonset
 	//

internal/infrastructure/kubernetes/infra.go

@@ -13,6 +13,7 @@ import (
 	autoscalingv2 "k8s.io/api/autoscaling/v2"
 	corev1 "k8s.io/api/core/v1"
 	policyv1 "k8s.io/api/policy/v1"
+	"k8s.io/apimachinery/pkg/labels"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	egv1a1 "github.com/envoyproxy/gateway/api/v1alpha1"
@@ -29,6 +30,7 @@ var _ ResourceRender = &ratelimit.ResourceRender{}
 // based on Infra IR resources.
 type ResourceRender interface {
 	Name() string
+	LabelSelector() labels.Selector
 	ServiceAccount() (*corev1.ServiceAccount, error)
 	Service() (*corev1.Service, error)
 	ConfigMap() (*corev1.ConfigMap, error)

internal/infrastructure/kubernetes/infra_resource.go

@@ -19,6 +19,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/types"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/envoyproxy/gateway/internal/metrics"
 )
@@ -395,7 +396,11 @@ func (i *Infra) deleteServiceAccount(ctx context.Context, r ResourceRender) (err
 		}
 	}()
 
-	return i.Client.Delete(ctx, sa)
+	return i.Client.DeleteAllOf(ctx, sa, &client.DeleteAllOfOptions{
+		ListOptions: client.ListOptions{
+			LabelSelector: r.LabelSelector(),
+		},
+	})
 }
 
 // deleteDeployment deletes the Envoy Deployment in the kube api server, if it exists.
@@ -430,7 +435,11 @@ func (i *Infra) deleteDeployment(ctx context.Context, r ResourceRender) (err err
 		}
 	}()
 
-	return i.Client.Delete(ctx, deployment)
+	return i.Client.DeleteAllOf(ctx, deployment, &client.DeleteAllOfOptions{
+		ListOptions: client.ListOptions{
+			LabelSelector: r.LabelSelector(),
+		},
+	})
 }
 
 // deleteDaemonSet deletes the Envoy DaemonSet in the kube api server, if it exists.
@@ -465,7 +474,11 @@ func (i *Infra) deleteDaemonSet(ctx context.Context, r ResourceRender) (err erro
 		}
 	}()
 
-	return i.Client.Delete(ctx, daemonSet)
+	return i.Client.DeleteAllOf(ctx, daemonSet, &client.DeleteAllOfOptions{
+		ListOptions: client.ListOptions{
+			LabelSelector: r.LabelSelector(),
+		},
+	})
 }
 
 // deleteConfigMap deletes the ConfigMap in the kube api server, if it exists.
@@ -495,7 +508,11 @@ func (i *Infra) deleteConfigMap(ctx context.Context, r ResourceRender) (err erro
 		}
 	}()
 
-	return i.Client.Delete(ctx, cm)
+	return i.Client.DeleteAllOf(ctx, cm, &client.DeleteAllOfOptions{
+		ListOptions: client.ListOptions{
+			LabelSelector: r.LabelSelector(),
+		},
+	})
 }
 
 // deleteService deletes the Service in the kube api server, if it exists.
@@ -525,7 +542,11 @@ func (i *Infra) deleteService(ctx context.Context, r ResourceRender) (err error)
 		}
 	}()
 
-	return i.Client.Delete(ctx, svc)
+	return i.Client.DeleteAllOf(ctx, svc, &client.DeleteAllOfOptions{
+		ListOptions: client.ListOptions{
+			LabelSelector: r.LabelSelector(),
+		},
+	})
 }
 
 // deleteHpa deletes the Horizontal Pod Autoscaler associated to its renderer, if it exists.
@@ -560,7 +581,11 @@ func (i *Infra) deleteHPA(ctx context.Context, r ResourceRender) (err error) {
 		}
 	}()
 
-	return i.Client.Delete(ctx, hpa)
+	return i.Client.DeleteAllOf(ctx, hpa, &client.DeleteAllOfOptions{
+		ListOptions: client.ListOptions{
+			LabelSelector: r.LabelSelector(),
+		},
+	})
 }
 
 // deletePDB deletes the PodDistribution budget associated to its renderer, if it exists.
@@ -595,5 +620,9 @@ func (i *Infra) deletePDB(ctx context.Context, r ResourceRender) (err error) {
 		}
 	}()
 
-	return i.Client.Delete(ctx, pdb)
+	return i.Client.DeleteAllOf(ctx, pdb, &client.DeleteAllOfOptions{
+		ListOptions: client.ListOptions{
+			LabelSelector: r.LabelSelector(),
+		},
+	})
 }

internal/infrastructure/kubernetes/proxy/resource_provider.go

@@ -15,6 +15,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	policyv1 "k8s.io/api/policy/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/utils/ptr"
 
@@ -46,6 +47,10 @@ func (r *ResourceRender) Name() string {
 	return ExpectedResourceHashedName(r.infra.Name)
 }
 
+func (r *ResourceRender) LabelSelector() labels.Selector {
+	return labels.SelectorFromSet(r.stableSelector().MatchLabels)
+}
+
 // ServiceAccount returns the expected proxy serviceAccount.
 func (r *ResourceRender) ServiceAccount() (*corev1.ServiceAccount, error) {
 	// Set the labels based on the owning gateway name.

internal/infrastructure/kubernetes/ratelimit/resource_provider.go

@@ -15,6 +15,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	policyv1 "k8s.io/api/policy/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/utils/ptr"
@@ -60,6 +61,10 @@ func (r *ResourceRender) Name() string {
 	return InfraName
 }
 
+func (r *ResourceRender) LabelSelector() labels.Selector {
+	return labels.SelectorFromSet(rateLimitLabels())
+}
+
 func enablePrometheus(rl *egv1a1.RateLimit) bool {
 	if rl != nil &&
 		rl.Telemetry != nil &&

internal/infrastructure/kubernetes/ratelimit_infra.go

@@ -52,10 +52,6 @@ func (i *Infra) CreateOrUpdateRateLimitInfra(ctx context.Context) error {
 
 // DeleteRateLimitInfra removes the managed kube infra, if it doesn't exist.
 func (i *Infra) DeleteRateLimitInfra(ctx context.Context) error {
-	if err := ratelimit.Validate(ctx, i.Client.Client, i.EnvoyGateway, i.Namespace); err != nil {
-		return err
-	}
-
 	// Delete ratelimit infra do not require the uid of owner reference.
 	r := ratelimit.NewResourceRender(i.Namespace, i.EnvoyGateway, nil)
 	return i.delete(ctx, r)

site/content/en/latest/api/extension_types.md

@@ -2431,7 +2431,7 @@ _Appears in:_
 
 
 
-KubernetesDaemonsetSpec defines the desired state of the Kubernetes daemonset resource.
+KubernetesDaemonSetSpec defines the desired state of the Kubernetes daemonset resource.
 
 _Appears in:_
 - [EnvoyProxyKubernetesProvider](#envoyproxykubernetesprovider)

site/content/zh/latest/api/extension_types.md

@@ -2431,7 +2431,7 @@ _Appears in:_
 
 
 
-KubernetesDaemonsetSpec defines the desired state of the Kubernetes daemonset resource.
+KubernetesDaemonSetSpec defines the desired state of the Kubernetes daemonset resource.
 
 _Appears in:_
 - [EnvoyProxyKubernetesProvider](#envoyproxykubernetesprovider)