Use networking.TrustBundleLabelKey

knative-extensions · Dec 14, 2023 · fe0c4d2 · fe0c4d2
1 parent 268f7d9
commit fe0c4d2
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 13 deletions.
diff --git a/pkg/generator/ingress_translator.go b/pkg/generator/ingress_translator.go
@@ -40,8 +40,8 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	pkgconfig "knative.dev/net-kourier/pkg/config"
 	envoy "knative.dev/net-kourier/pkg/envoy/api"
-	"knative.dev/net-kourier/pkg/reconciler/informerfiltering"
 	"knative.dev/net-kourier/pkg/reconciler/ingress/config"
+	"knative.dev/networking/pkg/apis/networking"
 	"knative.dev/networking/pkg/apis/networking/v1alpha1"
 	"knative.dev/networking/pkg/certificates"
 	netconfig "knative.dev/networking/pkg/config"
@@ -403,9 +403,9 @@ func (translator *IngressTranslator) buildTrustChain(logger *zap.SugaredLogger)
 		}
 	}
 
-	cms, err := translator.nsConfigmapGetter(informerfiltering.KnativeCABundleLabelKey)
+	cms, err := translator.nsConfigmapGetter(networking.TrustBundleLabelKey)
 	if err != nil {
-		return nil, fmt.Errorf("failed to fetch Configmaps with label: %s in namespace: %s: %w", informerfiltering.KnativeCABundleLabelKey, system.Namespace(), err)
+		return nil, fmt.Errorf("failed to fetch Configmaps with label: %s in namespace: %s: %w", networking.TrustBundleLabelKey, system.Namespace(), err)
 	}
 
 	newline := []byte("\n")

diff --git a/pkg/generator/ingress_translator_test.go b/pkg/generator/ingress_translator_test.go
@@ -40,8 +40,8 @@ import (
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/client-go/kubernetes/fake"
 	envoy "knative.dev/net-kourier/pkg/envoy/api"
-	"knative.dev/net-kourier/pkg/reconciler/informerfiltering"
 	"knative.dev/net-kourier/pkg/reconciler/ingress/config"
+	"knative.dev/networking/pkg/apis/networking"
 	"knative.dev/networking/pkg/apis/networking/v1alpha1"
 	"knative.dev/networking/pkg/certificates"
 	netconfig "knative.dev/networking/pkg/config"
@@ -1957,7 +1957,7 @@ func ingHTTP01Challenge(ns, name string, opts ...func(*v1alpha1.Ingress)) *v1alp
 }
 
 func getConfigmaps(ctx context.Context, kubeclient *fake.Clientset) ([]*corev1.ConfigMap, error) {
-	cms, err := kubeclient.CoreV1().ConfigMaps(system.Namespace()).List(ctx, metav1.ListOptions{LabelSelector: informerfiltering.KnativeCABundleLabelKey})
+	cms, err := kubeclient.CoreV1().ConfigMaps(system.Namespace()).List(ctx, metav1.ListOptions{LabelSelector: networking.TrustBundleLabelKey})
 	if err != nil {
 		return nil, err
 	}
@@ -2026,7 +2026,7 @@ var (
 			Namespace: "knative-testing",
 			Name:      "valid-ca",
 			Labels: map[string]string{
-				informerfiltering.KnativeCABundleLabelKey: "true",
+				networking.TrustBundleLabelKey: "true",
 			},
 		},
 		Data: map[string]string{
@@ -2038,7 +2038,7 @@ var (
 			Namespace: "knative-testing",
 			Name:      "invalid-ca",
 			Labels: map[string]string{
-				informerfiltering.KnativeCABundleLabelKey: "true",
+				networking.TrustBundleLabelKey: "true",
 			},
 		},
 		Data: map[string]string{
@@ -2050,7 +2050,7 @@ var (
 			Namespace: "knative-testing",
 			Name:      "partially-valid-ca",
 			Labels: map[string]string{
-				informerfiltering.KnativeCABundleLabelKey: "true",
+				networking.TrustBundleLabelKey: "true",
 			},
 		},
 		Data: map[string]string{

diff --git a/pkg/reconciler/informerfiltering/util.go b/pkg/reconciler/informerfiltering/util.go
@@ -25,9 +25,6 @@ import (
 	filteredFactory "knative.dev/pkg/client/injection/kube/informers/factory/filtered"
 )
 
-// TODO: rle extract this to pkg
-const KnativeCABundleLabelKey = "knative-ca-trust-bundle"
-
 const EnableSecretInformerFilteringByCertUIDEnv = "ENABLE_SECRET_INFORMER_FILTERING_BY_CERT_UID"
 
 // ShouldFilterByCertificateUID allows to choose whether to apply filtering on certificate related secrets

diff --git a/pkg/reconciler/ingress/controller.go b/pkg/reconciler/ingress/controller.go
@@ -38,8 +38,8 @@ import (
 	"knative.dev/net-kourier/pkg/config"
 	envoy "knative.dev/net-kourier/pkg/envoy/server"
 	"knative.dev/net-kourier/pkg/generator"
-	"knative.dev/net-kourier/pkg/reconciler/informerfiltering"
 	store "knative.dev/net-kourier/pkg/reconciler/ingress/config"
+	"knative.dev/networking/pkg/apis/networking"
 	"knative.dev/networking/pkg/apis/networking/v1alpha1"
 	networkingClientSet "knative.dev/networking/pkg/client/clientset/versioned/typed/networking/v1alpha1"
 	knativeclient "knative.dev/networking/pkg/client/injection/client"
@@ -331,7 +331,7 @@ func NewController(ctx context.Context, cmw configmap.Watcher) *controller.Impl
 
 	nsConfigmapInformer.Informer().AddEventHandler(cache.FilteringResourceEventHandler{
 		FilterFunc: reconciler.ChainFilterFuncs(
-			reconciler.LabelExistsFilterFunc(informerfiltering.KnativeCABundleLabelKey),
+			reconciler.LabelExistsFilterFunc(networking.TrustBundleLabelKey),
 		),
 		Handler: controller.HandleAll(func(obj interface{}) {
 			logger.Info("Doing a global resync due to CA bundle Configmap changes")