pkg/k8s: refactor CRD handling

This patch refactors CRD handling. It introduces a new package (crdutils) that includes a CRD type, meant to hold all the information for registering a CRD. Registration code is moved into crdutils, and the caller just needs to specify the CRD objects to register. Signed-off-by: Kornilios Kourtis <[email protected]>
cilium · Oct 12, 2023 · c54bfc2 · c54bfc2
1 parent e3f180f
commit c54bfc2
Show file tree

Hide file tree

Showing 11 changed files with 548 additions and 578 deletions.
diff --git a/api/vendor/modules.txt b/api/vendor/modules.txt
@@ -1,5 +1,5 @@
 # github.com/cilium/tetragon v0.0.0-00010101000000-000000000000 => ../../tetragon
-## explicit; go 1.21.1
+## explicit; go 1.21
 github.com/cilium/tetragon/pkg/matchers/bytesmatcher
 github.com/cilium/tetragon/pkg/matchers/listmatcher
 github.com/cilium/tetragon/pkg/matchers/stringmatcher

diff --git a/operator/crd/crd.go b/operator/crd/crd.go
@@ -17,9 +17,13 @@ import (
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
+
+	"github.com/cilium/tetragon/pkg/k8s/crdutils"
 )
 
-var log = logging.DefaultLogger.WithField(logfields.LogSubsys, "crd")
+var (
+	log = logging.DefaultLogger.WithField(logfields.LogSubsys, "crd")
+)
 
 func RegisterCRDs() {
 	restConfig, err := getConfig()
@@ -52,11 +56,19 @@ func RegisterCRDs() {
 			version.Version(), version.MinimalVersionConstraint)
 	}
 
+	crds := []crdutils.CRD{}
+	for _, crd := range client.AllCRDs {
+		if option.Config.SkipPodInfoCRD && crd.CRDName == client.PodInfoCRD.CRDName {
+			continue
+		}
+		crds = append(crds, crd)
+	}
+
 	// Register the CRDs after validating that we are running on a supported
 	// version of K8s.
 	if !option.Config.SkipCRDCreation {
 		// if skipPodInfoCRD flag set true, don't register Pod Info CRD.
-		if err := client.RegisterCRDs(k8sAPIExtClient, option.Config.SkipPodInfoCRD); err != nil {
+		if err := crdutils.RegisterCRDs(k8sAPIExtClient, crds); err != nil {
 			log.WithError(err).Fatal("Unable to Register CRDs")
 		}
 	} else {

diff --git a/operator/option/config.go b/operator/option/config.go
@@ -3,7 +3,9 @@
 
 package option
 
-import "github.com/spf13/viper"
+import (
+	"github.com/spf13/viper"
+)
 
 const (
 	TetragonOpEnvPrefix = "TETRAGON_OPERATOR"

diff --git a/pkg/k8s/apis/cilium.io/client/register.go b/pkg/k8s/apis/cilium.io/client/register.go
@@ -0,0 +1,43 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright Authors of Tetragon
+
+package client
+
+import (
+	_ "embed"
+
+	"github.com/cilium/tetragon/pkg/k8s/apis/cilium.io/v1alpha1"
+	crdutils "github.com/cilium/tetragon/pkg/k8s/crdutils"
+)
+
+var (
+	//go:embed crds/v1alpha1/cilium.io_tracingpolicies.yaml
+	crdsv1Alpha1TracingPolicies []byte
+
+	TracingPolicyCRD = crdutils.NewCRDBytes(
+		v1alpha1.TPCRDName,
+		v1alpha1.TPName,
+		crdsv1Alpha1TracingPolicies)
+
+	//go:embed crds/v1alpha1/cilium.io_tracingpoliciesnamespaced.yaml
+	crdsv1Alpha1TracingPoliciesNamespaced []byte
+
+	TracingPolicyNamespacedCRD = crdutils.NewCRDBytes(
+		v1alpha1.TPNamespacedCRDName,
+		v1alpha1.TPNamespacedName,
+		crdsv1Alpha1TracingPoliciesNamespaced)
+
+	//go:embed crds/v1alpha1/cilium.io_podinfo.yaml
+	crdsv1Alpha1PodInfo []byte
+
+	PodInfoCRD = crdutils.NewCRDBytes(
+		v1alpha1.PICRDName,
+		v1alpha1.PIName,
+		crdsv1Alpha1PodInfo)
+
+	AllCRDs = []crdutils.CRD{
+		TracingPolicyCRD,
+		TracingPolicyNamespacedCRD,
+		PodInfoCRD,
+	}
+)
diff --git a/pkg/k8s/apis/cilium.io/client/register_v1beta1_crd.go b/pkg/k8s/apis/cilium.io/client/register_v1beta1_crd.go