Merge pull request #304 from caiyixiang/changeSStoSSL

change 'buildSSPassthrouthUpstreams' to 'buildSSLPassthroughUpstreams'
kubernetes · Feb 20, 2017 · 463ff2b · 463ff2b
2 parents 7394395 + e68abf0
commit 463ff2b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/controllers/nginx/pkg/template/template.go b/controllers/nginx/pkg/template/template.go
@@ -137,7 +137,7 @@ var (
  "buildProxyPass": buildProxyPass,
  "buildRateLimitZones": buildRateLimitZones,
  "buildRateLimit": buildRateLimit,
- "buildSSPassthroughUpstreams": buildSSPassthroughUpstreams,
+ "buildSSLPassthroughUpstreams": buildSSLPassthroughUpstreams,
  "buildResolvers": buildResolvers,
  "isLocationAllowed": isLocationAllowed,
  "buildStreamUpstreams": buildStreamUpstreams,
@@ -171,7 +171,7 @@ func buildResolvers(a interface{}) string {
  return strings.Join(r, " ")
 }
 
-func buildSSPassthroughUpstreams(b interface{}, sslb interface{}) string {
+func buildSSLPassthroughUpstreams(b interface{}, sslb interface{}) string {
  backends := b.([]*ingress.Backend)
  sslBackends := sslb.([]*ingress.SSLPassthroughBackend)
  buf := bytes.NewBuffer(make([]byte, 0, 10))

diff --git a/controllers/nginx/rootfs/etc/nginx/template/nginx.tmpl b/controllers/nginx/rootfs/etc/nginx/template/nginx.tmpl
@@ -446,7 +446,7 @@ stream {
  server 127.0.0.1:442;
  }
 
- {{ buildSSPassthroughUpstreams $backends .PassthroughBackends }}
+ {{ buildSSLPassthroughUpstreams $backends .PassthroughBackends }}
 
  server {
  listen [::]:443 ipv6only=off{{ if $cfg.UseProxyProtocol }} proxy_protocol{{ end }};