DevFW-CICD/ingress-nginx-helm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Do some more migration

Browse source
This commit is contained in:
Ricardo Katz 2024-07-14 22:27:34 +00:00
parent f1b304476a
commit b159aa365f
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
internal/ingress/controller/template/crossplane.go
View file

@ -8,7 +8,6 @@ import (
crossplane "github.com/nginxinc/nginx-go-crossplane" crossplane "github.com/nginxinc/nginx-go-crossplane"
"k8s.io/ingress-nginx/internal/ingress/controller/config" "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 // Real IP dealing
if (cfg.UseForwardedHeaders || cfg.UseProxyProtocol) || cfg.EnableRealIP { 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)) out := make([]*crossplane.Directive, 0, len(cfg.LuaSharedDicts))
for name, size := range cfg.LuaSharedDicts { for name, size := range cfg.LuaSharedDicts {
sizeStr := dictKbToStr(size) sizeStr := dictKbToStr(size)