From b159aa365f5f32d6ca9bf4edaebc1a9f00a54850 Mon Sep 17 00:00:00 2001 From: Ricardo Katz Date: Sun, 14 Jul 2024 22:27:34 +0000 Subject: [PATCH] Do some more migration --- internal/ingress/controller/template/crossplane.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/internal/ingress/controller/template/crossplane.go b/internal/ingress/controller/template/crossplane.go index dec21b973..f4bbb4441 100644 --- a/internal/ingress/controller/template/crossplane.go +++ b/internal/ingress/controller/template/crossplane.go @@ -8,7 +8,6 @@ import ( crossplane "github.com/nginxinc/nginx-go-crossplane" "k8s.io/ingress-nginx/internal/ingress/controller/config" - "k8s.io/ingress-nginx/pkg/apis/ingress" ) /* @@ -136,7 +135,7 @@ func (c *crossplaneTemplate) buildHTTP() { }), } - httpBlock = append(httpBlock, buildLuaSharedDictionariesForCrossplane(c.tplConfig.Cfg, c.tplConfig.Servers)...) + httpBlock = append(httpBlock, buildLuaSharedDictionariesForCrossplane(c.tplConfig.Cfg)...) // Real IP dealing if (cfg.UseForwardedHeaders || cfg.UseProxyProtocol) || cfg.EnableRealIP { @@ -264,7 +263,7 @@ func buildDirective(directive string, args ...any) *crossplane.Directive { } } -func buildLuaSharedDictionariesForCrossplane(cfg config.Configuration, s []*ingress.Server) []*crossplane.Directive { +func buildLuaSharedDictionariesForCrossplane(cfg config.Configuration) []*crossplane.Directive { out := make([]*crossplane.Directive, 0, len(cfg.LuaSharedDicts)) for name, size := range cfg.LuaSharedDicts { sizeStr := dictKbToStr(size)