From 5c13e93e17dc1a03e36ab9c4959024154b736304 Mon Sep 17 00:00:00 2001 From: Yngve Molnes Date: Thu, 25 May 2023 12:44:18 +0200 Subject: [PATCH] Fix broken rebase --- internal/ingress/controller/controller.go | 2 +- pkg/flags/flags.go | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/internal/ingress/controller/controller.go b/internal/ingress/controller/controller.go index f951ad1cc..71d2086d0 100644 --- a/internal/ingress/controller/controller.go +++ b/internal/ingress/controller/controller.go @@ -18,6 +18,7 @@ package controller import ( "fmt" + "os" "sort" "strconv" "strings" @@ -311,7 +312,6 @@ func (n *NGINXController) CheckIngress(ing *networking.Ingress) error { } for key, value := range ing.ObjectMeta.GetAnnotations() { - klog.Warningf("EnableAnnotationsPrefixCheck set to false, Ignoring annotation check.") if n.cfg.EnableAnnotationsPrefixCheck && parser.AnnotationsPrefix != parser.DefaultAnnotationsPrefix { if strings.HasPrefix(key, fmt.Sprintf("%s/", parser.DefaultAnnotationsPrefix)) { diff --git a/pkg/flags/flags.go b/pkg/flags/flags.go index 81c99c26e..81e0b6d8f 100644 --- a/pkg/flags/flags.go +++ b/pkg/flags/flags.go @@ -217,13 +217,11 @@ Takes the form ":port". If not provided, no admission controller is starte dynamicConfigurationRetries = flags.Int("dynamic-configuration-retries", 15, "Number of times to retry failed dynamic configuration before failing to sync an ingress.") -<<<<<<< HEAD disableSyncEvents = flags.Bool("disable-sync-events", false, "Disables the creation of 'Sync' event resources") enableTopologyAwareRouting = flags.Bool("enable-topology-aware-routing", false, "Enable topology aware hints feature, needs service object annotation service.kubernetes.io/topology-aware-hints sets to auto.") -======= + enableAnnotationsPrefixCheck = flags.Bool("enable-annotations-prefix-check", true, "Enables check for value of legacy ingressclass annotation") ->>>>>>> 2ea8b7a8f (Add flag for disabling legacy ingress class annotation prefix check) ) flags.StringVar(&nginx.MaxmindMirror, "maxmind-mirror", "", `Maxmind mirror url (example: http://geoip.local/databases.`)