diff --git a/controllers/nginx/Changelog.md b/controllers/nginx/Changelog.md index 0620d1179..ef6b543e6 100644 --- a/controllers/nginx/Changelog.md +++ b/controllers/nginx/Changelog.md @@ -1,10 +1,21 @@ Changelog -### next + +### 0.8 - [X] [#1063](https://github.com/kubernetes/contrib/pull/1063) watches referenced tls secrets - [X] [#850](https://github.com/kubernetes/contrib/pull/850) adds configurable SSL redirect nginx controller -- [ ] [#1136](https://github.com/kubernetes/contrib/pull/1136) Fix nginx rewrite rule order +- [X] [#1136](https://github.com/kubernetes/contrib/pull/1136) Fix nginx rewrite rule order +- [X] [#1144](https://github.com/kubernetes/contrib/pull/1144) Add cidr whitelist support +- [X] [#1230](https://github.com/kubernetes/contrib/pull/1130) Improve docs and examples +- [X] [#1258](https://github.com/kubernetes/contrib/pull/1258) Avoid sync without a reachable +- [X] [#1235](https://github.com/kubernetes/contrib/pull/1235) Fix stats by country in nginx status page +- [X] [#1236](https://github.com/kubernetes/contrib/pull/1236) Update nginx to add dynamic TLS records and spdy +- [X] [#1238](https://github.com/kubernetes/contrib/pull/1238) Add support for dynamic TLS records and spdy +- [X] [#1239](https://github.com/kubernetes/contrib/pull/1239) Add support for conditional log of urls +- [X] [#1253](https://github.com/kubernetes/contrib/pull/1253) Use delayed queue +- [X] [#1296](https://github.com/kubernetes/contrib/pull/1296) Fix formatting +- [X] [#1299](https://github.com/kubernetes/contrib/pull/1299) Fix formatting ### 0.7 diff --git a/controllers/nginx/Makefile b/controllers/nginx/Makefile index 1ae30e9ef..ec707803d 100644 --- a/controllers/nginx/Makefile +++ b/controllers/nginx/Makefile @@ -1,10 +1,11 @@ all: push # 0.0 shouldn't clobber any release builds -TAG = 0.7 +TAG = 0.8 PREFIX = gcr.io/google_containers/nginx-ingress-controller REPO_INFO=$(shell git config --get remote.origin.url) +UPX:=$(shell command -v upx 2> /dev/null) ifndef VERSION VERSION := git-$(shell git rev-parse --short HEAD) @@ -14,6 +15,10 @@ controller: controller.go clean CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags \ "-s -w -X main.version=${VERSION} -X main.gitRepo=${REPO_INFO}" \ -o nginx-ingress-controller +ifdef UPX + # compressing the binary reduces the size at leat a 75% + upx nginx-ingress-controller +endif container: controller docker build -t $(PREFIX):$(TAG) . diff --git a/controllers/nginx/configuration.md b/controllers/nginx/configuration.md index b95445689..bdff245dd 100644 --- a/controllers/nginx/configuration.md +++ b/controllers/nginx/configuration.md @@ -268,7 +268,7 @@ Default is true **use-gzip:** Enables or disables the use of the nginx module that compresses responses using the ["gzip" module](http://nginx.org/en/docs/http/ngx_http_gzip_module.html) - +The default mime type list to compress is: `application/atom+xml application/javascript aplication/x-javascript application/json application/rss+xml application/vnd.ms-fontobject application/x-font-ttf application/x-web-app-manifest+json application/xhtml+xml application/xml font/opentype image/svg+xml image/x-icon text/css text/plain text/x-component` **use-http2:** Enables or disables the [HTTP/2](http://nginx.org/en/docs/http/ngx_http_v2_module.html) support in secure connections diff --git a/controllers/nginx/examples/custom-configuration/rc-custom-configuration.yaml b/controllers/nginx/examples/custom-configuration/rc-custom-configuration.yaml index c791a8577..77884ab2f 100644 --- a/controllers/nginx/examples/custom-configuration/rc-custom-configuration.yaml +++ b/controllers/nginx/examples/custom-configuration/rc-custom-configuration.yaml @@ -16,7 +16,7 @@ spec: spec: terminationGracePeriodSeconds: 60 containers: - - image: gcr.io/google_containers/nginx-ingress-controller:0.7 + - image: gcr.io/google_containers/nginx-ingress-controller:0.8 name: nginx-ingress-lb imagePullPolicy: Always livenessProbe: diff --git a/controllers/nginx/examples/custom-errors/rc-custom-errors.yaml b/controllers/nginx/examples/custom-errors/rc-custom-errors.yaml index 3d74e9c35..d72fe3f17 100644 --- a/controllers/nginx/examples/custom-errors/rc-custom-errors.yaml +++ b/controllers/nginx/examples/custom-errors/rc-custom-errors.yaml @@ -16,7 +16,7 @@ spec: spec: terminationGracePeriodSeconds: 60 containers: - - image: gcr.io/google_containers/nginx-ingress-controller:0.7 + - image: gcr.io/google_containers/nginx-ingress-controller:0.8 name: nginx-ingress-lb imagePullPolicy: Always livenessProbe: diff --git a/controllers/nginx/examples/custom-template/custom-template.yaml b/controllers/nginx/examples/custom-template/custom-template.yaml index d132221e8..306a7976d 100644 --- a/controllers/nginx/examples/custom-template/custom-template.yaml +++ b/controllers/nginx/examples/custom-template/custom-template.yaml @@ -16,7 +16,7 @@ spec: spec: terminationGracePeriodSeconds: 60 containers: - - image: gcr.io/google_containers/nginx-ingress-controller:0.7 + - image: gcr.io/google_containers/nginx-ingress-controller:0.8 name: nginx-ingress-lb imagePullPolicy: Always livenessProbe: diff --git a/controllers/nginx/examples/daemonset/as-daemonset.yaml b/controllers/nginx/examples/daemonset/as-daemonset.yaml index 859e60cf9..53d4b7b4c 100644 --- a/controllers/nginx/examples/daemonset/as-daemonset.yaml +++ b/controllers/nginx/examples/daemonset/as-daemonset.yaml @@ -10,7 +10,7 @@ spec: spec: terminationGracePeriodSeconds: 60 containers: - - image: gcr.io/google_containers/nginx-ingress-controller:0.7 + - image: gcr.io/google_containers/nginx-ingress-controller:0.8 name: nginx-ingress-lb imagePullPolicy: Always livenessProbe: diff --git a/controllers/nginx/examples/default/rc-default.yaml b/controllers/nginx/examples/default/rc-default.yaml index d2c2731c2..c52071da7 100644 --- a/controllers/nginx/examples/default/rc-default.yaml +++ b/controllers/nginx/examples/default/rc-default.yaml @@ -16,7 +16,7 @@ spec: spec: terminationGracePeriodSeconds: 60 containers: - - image: gcr.io/google_containers/nginx-ingress-controller:0.7 + - image: gcr.io/google_containers/nginx-ingress-controller:0.8 name: nginx-ingress-lb imagePullPolicy: Always livenessProbe: diff --git a/controllers/nginx/examples/full/rc-full.yaml b/controllers/nginx/examples/full/rc-full.yaml index 859bc281d..ef23850b7 100644 --- a/controllers/nginx/examples/full/rc-full.yaml +++ b/controllers/nginx/examples/full/rc-full.yaml @@ -21,7 +21,7 @@ spec: secret: secretName: dhparam-example containers: - - image: gcr.io/google_containers/nginx-ingress-controller:0.7 + - image: gcr.io/google_containers/nginx-ingress-controller:0.8 name: nginx-ingress-lb imagePullPolicy: Always livenessProbe: diff --git a/controllers/nginx/examples/proxy-protocol/nginx-rc.yaml b/controllers/nginx/examples/proxy-protocol/nginx-rc.yaml index 2bad5b8fd..3c9bd91df 100644 --- a/controllers/nginx/examples/proxy-protocol/nginx-rc.yaml +++ b/controllers/nginx/examples/proxy-protocol/nginx-rc.yaml @@ -16,7 +16,7 @@ spec: spec: terminationGracePeriodSeconds: 60 containers: - - image: gcr.io/google_containers/nginx-ingress-controller:0.7 + - image: gcr.io/google_containers/nginx-ingress-controller:0.8 name: nginx-ingress-lb imagePullPolicy: Always livenessProbe: diff --git a/controllers/nginx/examples/tcp/rc-tcp.yaml b/controllers/nginx/examples/tcp/rc-tcp.yaml index 1f0da3c00..1f9ed1be9 100644 --- a/controllers/nginx/examples/tcp/rc-tcp.yaml +++ b/controllers/nginx/examples/tcp/rc-tcp.yaml @@ -16,7 +16,7 @@ spec: spec: terminationGracePeriodSeconds: 60 containers: - - image: gcr.io/google_containers/nginx-ingress-controller:0.7 + - image: gcr.io/google_containers/nginx-ingress-controller:0.8 name: nginx-ingress-lb imagePullPolicy: Always livenessProbe: diff --git a/controllers/nginx/examples/tls/rc-ssl.yaml b/controllers/nginx/examples/tls/rc-ssl.yaml index d2c2731c2..c52071da7 100644 --- a/controllers/nginx/examples/tls/rc-ssl.yaml +++ b/controllers/nginx/examples/tls/rc-ssl.yaml @@ -16,7 +16,7 @@ spec: spec: terminationGracePeriodSeconds: 60 containers: - - image: gcr.io/google_containers/nginx-ingress-controller:0.7 + - image: gcr.io/google_containers/nginx-ingress-controller:0.8 name: nginx-ingress-lb imagePullPolicy: Always livenessProbe: diff --git a/controllers/nginx/examples/udp/rc-udp.yaml b/controllers/nginx/examples/udp/rc-udp.yaml index 5e156f690..7e68825d8 100644 --- a/controllers/nginx/examples/udp/rc-udp.yaml +++ b/controllers/nginx/examples/udp/rc-udp.yaml @@ -16,7 +16,7 @@ spec: spec: terminationGracePeriodSeconds: 60 containers: - - image: gcr.io/google_containers/nginx-ingress-controller:0.7 + - image: gcr.io/google_containers/nginx-ingress-controller:0.8 name: nginx-ingress-lb imagePullPolicy: Always livenessProbe: diff --git a/controllers/nginx/nginx/config/config.go b/controllers/nginx/nginx/config/config.go index 74e4ed6b6..1597cb9b1 100644 --- a/controllers/nginx/nginx/config/config.go +++ b/controllers/nginx/nginx/config/config.go @@ -42,7 +42,7 @@ const ( // If UseProxyProtocol is enabled defIPCIDR defines the default the IP/network address of your external load balancer defIPCIDR = "0.0.0.0/0" - gzipTypes = "application/atom+xml application/javascript application/json application/rss+xml application/vnd.ms-fontobject application/x-font-ttf application/x-web-app-manifest+json application/xhtml+xml application/xml font/opentype image/svg+xml image/x-icon text/css text/plain text/x-component" + gzipTypes = "application/atom+xml application/javascript aplication/x-javascript application/json application/rss+xml application/vnd.ms-fontobject application/x-font-ttf application/x-web-app-manifest+json application/xhtml+xml application/xml font/opentype image/svg+xml image/x-icon text/css text/plain text/x-component" // http://nginx.org/en/docs/http/ngx_http_ssl_module.html#ssl_buffer_size // Sets the size of the buffer used for sending data. diff --git a/controllers/nginx/rc.yaml b/controllers/nginx/rc.yaml index 3230bc1e8..88d56e78b 100644 --- a/controllers/nginx/rc.yaml +++ b/controllers/nginx/rc.yaml @@ -68,7 +68,7 @@ spec: spec: terminationGracePeriodSeconds: 60 containers: - - image: gcr.io/google_containers/nginx-ingress-controller:0.7 + - image: gcr.io/google_containers/nginx-ingress-controller:0.8 name: nginx-ingress-lb imagePullPolicy: Always livenessProbe: