Skip to content

Commit

Permalink
Update examples and docs
Browse files Browse the repository at this point in the history
  • Loading branch information
aledbf committed Oct 17, 2016
1 parent 896cdb1 commit 9185911
Show file tree
Hide file tree
Showing 15 changed files with 47 additions and 14 deletions.
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,11 @@ notifications:

go:
- 1.7
- tip

env:
global:
- ETCD_VERSION=3.0.12
- K8S_VERSION=1.4.2
- K8S_VERSION=1.4.3

before_install:
- sudo bash -c 'sysctl net.ipv6.conf.all.disable_ipv6=0'
Expand Down
28 changes: 28 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,33 @@
Changelog

### 0.9

- [X] [#1498](https://github.com/kubernetes/contrib/pull/1498) Refactoring of template handling
- [X] [#1571](https://github.com/kubernetes/contrib/pull/1571) use POD_NAMESPACE as a namespace in cli parameters
- [X] [#1591](https://github.com/kubernetes/contrib/pull/1591) Always listen on port 443, even without ingress rules
- [X] [#1596](https://github.com/kubernetes/contrib/pull/1596) Adapt nginx hash sizes to the number of ingress
- [X] [#1653](https://github.com/kubernetes/contrib/pull/1653) Update image version
- [X] [#1672](https://github.com/kubernetes/contrib/pull/1672) Add firewall rules and ing class clarifications
- [X] [#1711](https://github.com/kubernetes/contrib/pull/1711) Add function helpers to nginx template
- [X] [#1743](https://github.com/kubernetes/contrib/pull/1743) Allow customisation of the nginx proxy_buffer_size directive via ConfigMap
- [X] [#1749](https://github.com/kubernetes/contrib/pull/1749) Readiness probe that works behind a CP lb
- [X] [#1751](https://github.com/kubernetes/contrib/pull/1751) Add the name of the upstream in the log
- [X] [#1758](https://github.com/kubernetes/contrib/pull/1758) Update nginx to 1.11.4
- [X] [#1759](https://github.com/kubernetes/contrib/pull/1759) Add support for default backend in Ingress rule
- [X] [#1762](https://github.com/kubernetes/contrib/pull/1762) Add cloud detection
- [X] [#1766](https://github.com/kubernetes/contrib/pull/1766) Clarify the controller uses endpoints and not services
- [X] [#1767](https://github.com/kubernetes/contrib/pull/1767) Update godeps
- [X] [#1772](https://github.com/kubernetes/contrib/pull/1772) Avoid replacing nginx.conf file if the new configuration is invalid
- [X] [#1773](https://github.com/kubernetes/contrib/pull/1773) Add annotation to add CORS support
- [X] [#1786](https://github.com/kubernetes/contrib/pull/1786) Add docs about go template
- [X] [#1796](https://github.com/kubernetes/contrib/pull/1796) Add external authentication support using auth_request
- [X] [#1802](https://github.com/kubernetes/contrib/pull/1802) Initialize proxy_upstream_name variable
- [X] [#1806](https://github.com/kubernetes/contrib/pull/1806) Add docs about the log format
- [X] [#1808](https://github.com/kubernetes/contrib/pull/1808) WebSocket documentation
- [X] [#1847](https://github.com/kubernetes/contrib/pull/1847) Change structure of packages
- [X] Add annotation for custom upstream timeouts
- [X] Mutual TLS auth (https://github.com/kubernetes/contrib/issues/1870)

### 0.8.3

- [X] [#1450](https://github.com/kubernetes/contrib/pull/1450) Check for errors in nginx template
Expand Down
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
This is an nginx Ingress controller that uses [ConfigMap](https://github.com/kubernetes/kubernetes/blob/master/docs/design/configmap.md) to store the nginx configuration. See [Ingress controller documentation](../README.md) for details on how it works.

## Contents
* [Recent changes](#recent-changes)
* [Conventions](#conventions)
* [Requirements](#what-it-provides)
* [Dry running](#dry-running-the-ingress-controller)
Expand Down Expand Up @@ -35,6 +36,11 @@ This is an nginx Ingress controller that uses [ConfigMap](https://github.com/kub
* [Limitations](#limitations)
* [NGINX Notes](#nginx-notes)

## Recent changes

Change history is available in [CHANGELOG.md](CHANGELOG.md)


## Conventions

Anytime we reference a tls secret, we mean (x509, pem encoded, RSA 2048, etc). You can generate such a certificate with:
Expand Down
2 changes: 1 addition & 1 deletion examples/custom-configuration/rc-custom-configuration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
spec:
terminationGracePeriodSeconds: 60
containers:
- image: gcr.io/google_containers/nginx-ingress-controller:0.8.3
- image: quay.io/aledbf/nginx-ingress-controller:0.9
name: nginx-ingress-lb
imagePullPolicy: Always
readinessProbe:
Expand Down
2 changes: 1 addition & 1 deletion examples/custom-errors/rc-custom-errors.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
spec:
terminationGracePeriodSeconds: 60
containers:
- image: gcr.io/google_containers/nginx-ingress-controller:0.8.3
- image: quay.io/aledbf/nginx-ingress-controller:0.9
name: nginx-ingress-lb
imagePullPolicy: Always
readinessProbe:
Expand Down
2 changes: 1 addition & 1 deletion examples/custom-template/custom-template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
spec:
terminationGracePeriodSeconds: 60
containers:
- image: gcr.io/google_containers/nginx-ingress-controller:0.8.3
- image: quay.io/aledbf/nginx-ingress-controller:0.9
name: nginx-ingress-lb
imagePullPolicy: Always
readinessProbe:
Expand Down
2 changes: 1 addition & 1 deletion examples/daemonset/as-daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ spec:
spec:
terminationGracePeriodSeconds: 60
containers:
- image: gcr.io/google_containers/nginx-ingress-controller:0.8.3
- image: quay.io/aledbf/nginx-ingress-controller:0.9
name: nginx-ingress-lb
imagePullPolicy: Always
readinessProbe:
Expand Down
2 changes: 1 addition & 1 deletion examples/default/rc-default.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
spec:
terminationGracePeriodSeconds: 60
containers:
- image: gcr.io/google_containers/nginx-ingress-controller:0.8.3
- image: quay.io/aledbf/nginx-ingress-controller:0.9
name: nginx-ingress-lb
imagePullPolicy: Always
readinessProbe:
Expand Down
2 changes: 1 addition & 1 deletion examples/full/rc-full.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
secret:
secretName: dhparam-example
containers:
- image: gcr.io/google_containers/nginx-ingress-controller:0.8.3
- image: quay.io/aledbf/nginx-ingress-controller:0.9
name: nginx-ingress-lb
imagePullPolicy: Always
readinessProbe:
Expand Down
2 changes: 1 addition & 1 deletion examples/proxy-protocol/nginx-rc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
spec:
terminationGracePeriodSeconds: 60
containers:
- image: gcr.io/google_containers/nginx-ingress-controller:0.8.3
- image: quay.io/aledbf/nginx-ingress-controller:0.9
name: nginx-ingress-lb
imagePullPolicy: Always
readinessProbe:
Expand Down
2 changes: 1 addition & 1 deletion examples/sysctl/change-proc-values-rc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ spec:
imagePullPolicy: IfNotPresent
securityContext:
privileged: true
- image: gcr.io/google_containers/nginx-ingress-controller:0.8.3
- image: quay.io/aledbf/nginx-ingress-controller:0.9
name: nginx-ingress-lb
imagePullPolicy: Always
readinessProbe:
Expand Down
2 changes: 1 addition & 1 deletion examples/tcp/rc-tcp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
spec:
terminationGracePeriodSeconds: 60
containers:
- image: gcr.io/google_containers/nginx-ingress-controller:0.8.3
- image: quay.io/aledbf/nginx-ingress-controller:0.9
name: nginx-ingress-lb
imagePullPolicy: Always
readinessProbe:
Expand Down
2 changes: 1 addition & 1 deletion examples/tls/rc-ssl.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
spec:
terminationGracePeriodSeconds: 60
containers:
- image: gcr.io/google_containers/nginx-ingress-controller:0.8.3
- image: quay.io/aledbf/nginx-ingress-controller:0.9
name: nginx-ingress-lb
imagePullPolicy: Always
readinessProbe:
Expand Down
2 changes: 1 addition & 1 deletion examples/udp/rc-udp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
spec:
terminationGracePeriodSeconds: 60
containers:
- image: gcr.io/google_containers/nginx-ingress-controller:0.8.3
- image: quay.io/aledbf/nginx-ingress-controller:0.9
name: nginx-ingress-lb
imagePullPolicy: Always
readinessProbe:
Expand Down
2 changes: 1 addition & 1 deletion rc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ spec:
spec:
terminationGracePeriodSeconds: 60
containers:
- image: gcr.io/google_containers/nginx-ingress-controller:0.8.3
- image: quay.io/aledbf/nginx-ingress-controller:0.9
name: nginx-ingress-lb
imagePullPolicy: Always
readinessProbe:
Expand Down

0 comments on commit 9185911

Please sign in to comment.