chore(store) expand TypeMeta population

Add a type-agnostic helper to populate TypeMeta using a scheme with registered types. Populate TypeMeta throughout all controllers and reference filter predicates. Remove feature gate limitations on types added to the manager scheme to simplify its use where config is not readily available.
Kong · Sep 28, 2023 · f9e1d91 · f9e1d91
1 parent 7f5c264
commit f9e1d91
Show file tree

Hide file tree

Showing 18 changed files with 231 additions and 149 deletions.
diff --git a/hack/generators/controllers/networking/main.go b/hack/generators/controllers/networking/main.go
@@ -397,7 +397,6 @@ import (
 	discoveryv1 "k8s.io/api/discovery/v1"
 	netv1 "k8s.io/api/networking/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	k8stypes "k8s.io/apimachinery/pkg/types"
@@ -550,11 +549,6 @@ func (r *{{.PackageAlias}}{{.Kind}}Reconciler) Reconcile(ctx context.Context, re
 
 	// get the relevant object
 	obj := new({{.PackageImportAlias}}.{{.Kind}})
-	// set type meta to the object
-	obj.TypeMeta = metav1.TypeMeta{
-		APIVersion: {{.PackageImportAlias}}.SchemeGroupVersion.String(),
-		Kind: "{{.Kind}}",
-	}
 
 	if err := r.Get(ctx, req.NamespacedName, obj); err != nil {
 		if apierrors.IsNotFound(err) {
@@ -572,6 +566,11 @@ func (r *{{.PackageAlias}}{{.Kind}}Reconciler) Reconcile(ctx context.Context, re
 	}
 	log.V(util.DebugLevel).Info("reconciling resource", "namespace", req.Namespace, "name", req.Name)
 
+	err := util.PopulateTypeMeta(obj)
+	if err != nil {
+		log.WithValues().Error(err, "could not set resource TypeMeta", "namespace", obj.GetNamespace(), "name", obj.GetName())
+	}
+
 	// clean the object up if it's being deleted
 	if !obj.DeletionTimestamp.IsZero() && time.Now().After(obj.DeletionTimestamp.Time) {
 		log.V(util.DebugLevel).Info("resource is being deleted, its configuration will be removed", "type", "{{.Kind}}", "namespace", req.Namespace, "name", req.Name)

diff --git a/internal/controllers/configuration/kongadminapi_controller.go b/internal/controllers/configuration/kongadminapi_controller.go
@@ -87,6 +87,11 @@ func (r *KongAdminAPIServiceReconciler) SetLogger(l logr.Logger) {
 }
 
 func (r *KongAdminAPIServiceReconciler) shouldReconcileEndpointSlice(obj client.Object) bool {
+	err := util.PopulateTypeMeta(obj)
+	if err != nil {
+		r.Log.Error(err, "could not set resource TypeMeta",
+			"namespace", obj.GetNamespace(), "name", obj.GetName())
+	}
 	endpoints, ok := obj.(*discoveryv1.EndpointSlice)
 	if !ok {
 		return false

diff --git a/internal/controllers/configuration/secret_controller.go b/internal/controllers/configuration/secret_controller.go
@@ -77,6 +77,11 @@ func (r *CoreV1SecretReconciler) SetLogger(l logr.Logger) {
 // - the secret has label: konghq.com/ca-cert:true
 // - or the secret is referred by objects we care (service, ingress, gateway, ...)
 func (r *CoreV1SecretReconciler) shouldReconcileSecret(obj client.Object) bool {
+	err := util.PopulateTypeMeta(obj)
+	if err != nil {
+		r.Log.Error(err, "could not set resource TypeMeta",
+			"namespace", obj.GetNamespace(), "name", obj.GetName())
+	}
 	secret, ok := obj.(*corev1.Secret)
 	if !ok {
 		return false
@@ -113,6 +118,13 @@ func (r *CoreV1SecretReconciler) Reconcile(ctx context.Context, req ctrl.Request
 		}
 		return ctrl.Result{}, err
 	}
+
+	err := util.PopulateTypeMeta(secret)
+	if err != nil {
+		r.Log.Error(err, "could not set resource TypeMeta",
+			"namespace", secret.GetNamespace(), "name", secret.GetName())
+	}
+
 	log.V(util.DebugLevel).Info("reconciling resource", "namespace", req.Namespace, "name", req.Name)
 
 	// clean the object up if it's being deleted

diff --git a/internal/controllers/configuration/zz_generated_controllers.go b/internal/controllers/configuration/zz_generated_controllers.go
diff --git a/internal/controllers/gateway/gateway_controller.go b/internal/controllers/gateway/gateway_controller.go
@@ -41,10 +41,6 @@ import (
 var (
 	ErrUnmanagedAnnotation = errors.New("invalid unmanaged annotation value")
 	gatewayV1beta1Group    = gatewayv1beta1.Group(gatewayv1beta1.GroupName)
-	gatewayTypeMeta        = metav1.TypeMeta{
-		APIVersion: gatewayv1beta1.GroupVersion.String(),
-		Kind:       "Gateway",
-	}
 )
 
 // -----------------------------------------------------------------------------
@@ -343,7 +339,6 @@ func (r *GatewayReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
 	// gather the gateway object based on the reconciliation trigger. It's possible for the object
 	// to be gone at this point in which case it will be ignored.
 	gateway := new(gatewayv1beta1.Gateway)
-	gateway.TypeMeta = gatewayTypeMeta
 	if err := r.Get(ctx, req.NamespacedName, gateway); err != nil {
 		if apierrors.IsNotFound(err) {
 			gateway.Namespace = req.Namespace
@@ -358,6 +353,13 @@ func (r *GatewayReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
 		}
 		return ctrl.Result{Requeue: true}, err
 	}
+
+	err := util.PopulateTypeMeta(gateway)
+	if err != nil {
+		r.Log.Error(err, "could not set resource TypeMeta",
+			"namespace", gateway.GetNamespace(), "name", gateway.GetName())
+	}
+
 	debug(log, gateway, "processing gateway")
 
 	// though our watch configuration eliminates reconciliation of unsupported gateways it's