From 742dde72bb42e95c548d2da039530c76578f8ac3 Mon Sep 17 00:00:00 2001 From: Fernandez Ludovic Date: Fri, 5 Jan 2018 11:53:31 +0100 Subject: [PATCH] refactor(k8s): template readability. fix(k8s): redirection template. --- templates/kubernetes.tmpl | 158 +++++++++++++++++++------------------- 1 file changed, 78 insertions(+), 80 deletions(-) diff --git a/templates/kubernetes.tmpl b/templates/kubernetes.tmpl index 963ae9cea..74f2a7393 100644 --- a/templates/kubernetes.tmpl +++ b/templates/kubernetes.tmpl @@ -1,25 +1,23 @@ [backends] -{{range $backendName, $backend := .Backends}} +{{range $backendName, $backend := .Backends }} - [backends."{{$backendName}}"] + [backends."{{ $backendName }}"] - {{if $backend.CircuitBreaker}} - [backends."{{$backendName}}".circuitBreaker] - expression = "{{$backend.CircuitBreaker.Expression}}" + {{if $backend.CircuitBreaker }} + [backends."{{ $backendName }} ".circuitBreaker] + expression = "{{ $backend.CircuitBreaker.Expression }}" {{end}} - [backends."{{$backendName}}".loadBalancer] - method = "{{$backend.LoadBalancer.Method}}" - {{if $backend.LoadBalancer.Sticky}} - sticky = true - {{end}} - {{if $backend.LoadBalancer.Stickiness}} - [backends."{{$backendName}}".loadBalancer.stickiness] - cookieName = "{{$backend.LoadBalancer.Stickiness.CookieName}}" + [backends."{{ $backendName }}".loadBalancer] + method = "{{ $backend.LoadBalancer.Method }}" + sticky = {{ $backend.LoadBalancer.Sticky }} + {{if $backend.LoadBalancer.Stickiness }} + [backends."{{ $backendName }}".loadBalancer.stickiness] + cookieName = "{{ $backend.LoadBalancer.Stickiness.CookieName }}" {{end}} - {{if $backend.MaxConn}} - [backends.backend-{{$backendName}}.maxConn] + {{if $backend.MaxConn }} + [backends.backend-{{ $backendName }}.maxConn] amount = {{ $backend.MaxConn.Amount }} extractorFunc = "{{ $backend.MaxConn.ExtractorFunc }}" {{end}} @@ -33,60 +31,60 @@ retryExpression = "{{ $backend.Buffering.RetryExpression }}" {{end}} - {{range $serverName, $server := $backend.Servers}} - [backends."{{$backendName}}".servers."{{$serverName}}"] - url = "{{$server.URL}}" - weight = {{$server.Weight}} + {{range $serverName, $server := $backend.Servers }} + [backends."{{ $backendName }}".servers."{{ $serverName }}"] + url = "{{ $server.URL }}" + weight = {{ $server.Weight }} {{end}} {{end}} [frontends] -{{range $frontendName, $frontend := .Frontends}} +{{range $frontendName, $frontend := .Frontends }} - [frontends."{{$frontendName}}"] - backend = "{{$frontend.Backend}}" - priority = {{$frontend.Priority}} - passHostHeader = {{$frontend.PassHostHeader}} - passTLSCert = {{$frontend.PassTLSCert}} + [frontends."{{ $frontendName }}"] + backend = "{{ $frontend.Backend }}" + priority = {{ $frontend.Priority }} + passHostHeader = {{ $frontend.PassHostHeader }} + passTLSCert = {{ $frontend.PassTLSCert }} - entryPoints = [{{range $frontend.EntryPoints}} + entryPoints = [{{range $frontend.EntryPoints }} "{{.}}", {{end}}] - basicAuth = [{{range $frontend.BasicAuth}} + basicAuth = [{{range $frontend.BasicAuth }} "{{.}}", {{end}}] - whitelistSourceRange = [{{range $frontend.WhitelistSourceRange}} + whitelistSourceRange = [{{range $frontend.WhitelistSourceRange }} "{{.}}", {{end}}] - {{if $frontend.Redirect}} - [frontends."{{$frontendName}}".redirect] - entryPoint = "{{$frontend.RedirectEntryPoint}}" - regex = "{{$frontend.RedirectRegex}}" - replacement = "{{$frontend.RedirectReplacement}}" + {{if $frontend.Redirect }} + [frontends."{{ $frontendName }}".redirect] + entryPoint = "{{ $frontend.Redirect.EntryPoint }}" + regex = "{{ $frontend.Redirect.Regex }}" + replacement = "{{ $frontend.Redirect.Replacement }}" {{end}} - {{ if $frontend.Errors }} - [frontends."frontend-{{$frontendName}}".errors] - {{ range $pageName, $page := $frontend.Errors }} - [frontends."frontend-{{$frontendName}}".errors.{{ $pageName }}] - status = [{{range $page.Status}} + {{if $frontend.Errors }} + [frontends."frontend-{{ $frontendName }}".errors] + {{range $pageName, $page := $frontend.Errors }} + [frontends."frontend-{{ $frontendName }}".errors.{{ $pageName }}] + status = [{{range $page.Status }} "{{.}}", {{end}}] - backend = "{{$page.Backend}}" - query = "{{$page.Query}}" + backend = "{{ $page.Backend }}" + query = "{{ $page.Query }}" {{end}} {{end}} - {{ if $frontend.RateLimit }} - [frontends."frontend-{{$frontendName}}".rateLimit] + {{if $frontend.RateLimit }} + [frontends."frontend-{{ $frontendName }}".rateLimit] extractorFunc = "{{ $frontend.RateLimit.ExtractorFunc }}" - [frontends."frontend-{{$frontendName}}".rateLimit.rateSet] - {{ range $limitName, $limit := $frontend.RateLimit.RateSet }} - [frontends."frontend-{{$frontendName}}".rateLimit.rateSet.{{ $limitName }}] + [frontends."frontend-{{ $frontendName }}".rateLimit.rateSet] + {{range $limitName, $limit := $frontend.RateLimit.RateSet }} + [frontends."frontend-{{ $frontendName }}".rateLimit.rateSet.{{ $limitName }}] period = "{{ $limit.Period }}" average = {{ $limit.Average }} burst = {{ $limit.Burst }} @@ -94,55 +92,55 @@ {{end}} {{if $frontend.Headers }} - [frontends."{{$frontendName}}".headers] - SSLRedirect = {{$frontend.Headers.SSLRedirect}} - SSLTemporaryRedirect = {{$frontend.Headers.SSLTemporaryRedirect}} - SSLHost = "{{$frontend.Headers.SSLHost}}" - STSSeconds = {{$frontend.Headers.STSSeconds}} - STSIncludeSubdomains = {{$frontend.Headers.STSIncludeSubdomains}} - STSPreload = {{$frontend.Headers.STSPreload}} - ForceSTSHeader = {{$frontend.Headers.ForceSTSHeader}} - FrameDeny = {{$frontend.Headers.FrameDeny}} - CustomFrameOptionsValue = "{{$frontend.Headers.CustomFrameOptionsValue}}" - ContentTypeNosniff = {{$frontend.Headers.ContentTypeNosniff}} - BrowserXSSFilter = {{$frontend.Headers.BrowserXSSFilter}} - ContentSecurityPolicy = "{{$frontend.Headers.ContentSecurityPolicy}}" - PublicKey = "{{$frontend.Headers.PublicKey}}" - ReferrerPolicy = "{{$frontend.Headers.ReferrerPolicy}}" - IsDevelopment = {{$frontend.Headers.IsDevelopment}} - {{if $frontend.Headers.AllowedHosts}} - AllowedHosts = [{{range $frontend.Headers.AllowedHosts}} + [frontends."{{ $frontendName }}".headers] + SSLRedirect = {{ $frontend.Headers.SSLRedirect }} + SSLTemporaryRedirect = {{ $frontend.Headers.SSLTemporaryRedirect }} + SSLHost = "{{ $frontend.Headers.SSLHost }}" + STSSeconds = {{ $frontend.Headers.STSSeconds }} + STSIncludeSubdomains = {{ $frontend.Headers.STSIncludeSubdomains }} + STSPreload = {{ $frontend.Headers.STSPreload }} + ForceSTSHeader = {{ $frontend.Headers.ForceSTSHeader }} + FrameDeny = {{ $frontend.Headers.FrameDeny }} + CustomFrameOptionsValue = "{{ $frontend.Headers.CustomFrameOptionsValue }}" + ContentTypeNosniff = {{ $frontend.Headers.ContentTypeNosniff }} + BrowserXSSFilter = {{ $frontend.Headers.BrowserXSSFilter }} + ContentSecurityPolicy = "{{ $frontend.Headers.ContentSecurityPolicy }}" + PublicKey = "{{ $frontend.Headers.PublicKey }}" + ReferrerPolicy = "{{ $frontend.Headers.ReferrerPolicy }}" + IsDevelopment = {{ $frontend.Headers.IsDevelopment }} + {{if $frontend.Headers.AllowedHosts }} + AllowedHosts = [{{range $frontend.Headers.AllowedHosts }} "{{.}}", {{end}}] {{end}} - {{if $frontend.Headers.HostsProxyHeaders}} - HostsProxyHeaders = [{{range $frontend.Headers.HostsProxyHeaders}} + {{if $frontend.Headers.HostsProxyHeaders }} + HostsProxyHeaders = [{{range $frontend.Headers.HostsProxyHeaders }} "{{.}}", {{end}}] {{end}} - {{if $frontend.Headers.CustomRequestHeaders}} - [frontends."{{$frontendName}}".headers.customrequestheaders] - {{range $k, $v := $frontend.Headers.CustomRequestHeaders}} - {{$k}} = "{{$v}}" + {{if $frontend.Headers.CustomRequestHeaders }} + [frontends."{{ $frontendName }}".headers.customRequestHeaders] + {{range $k, $v := $frontend.Headers.CustomRequestHeaders }} + {{ $k }} = "{{ $v }}" {{end}} {{end}} - {{if $frontend.Headers.CustomResponseHeaders}} - [frontends."{{$frontendName}}".headers.customresponseheaders] - {{range $k, $v := $frontend.Headers.CustomResponseHeaders}} - {{$k}} = "{{$v}}" + {{if $frontend.Headers.CustomResponseHeaders }} + [frontends."{{ $frontendName }}".headers.customResponseHeaders] + {{range $k, $v := $frontend.Headers.CustomResponseHeaders }} + {{ $k }} = "{{ $v }}" {{end}} {{end}} - {{if $frontend.Headers.SSLProxyHeaders}} - [frontends."{{$frontendName}}".headers.SSLProxyHeaders] - {{range $k, $v := $frontend.Headers.SSLProxyHeaders}} - {{$k}} = "{{$v}}" + {{if $frontend.Headers.SSLProxyHeaders }} + [frontends."{{ $frontendName }}".headers.SSLProxyHeaders] + {{range $k, $v := $frontend.Headers.SSLProxyHeaders }} + {{ $k }} = "{{ $v }}" {{end}} {{end}} {{end}} - {{range $routeName, $route := $frontend.Routes}} - [frontends."{{$frontendName}}".routes."{{$routeName}}"] - rule = "{{$route.Rule}}" + {{range $routeName, $route := $frontend.Routes }} + [frontends."{{ $frontendName }}".routes."{{ $routeName }}"] + rule = "{{ $route.Rule }}" {{end}} {{end}}