diff --git a/controllers/gce/examples/https/README.md b/controllers/gce/examples/https/README.md index dcbb40cde..a58a43086 100644 --- a/controllers/gce/examples/https/README.md +++ b/controllers/gce/examples/https/README.md @@ -12,7 +12,7 @@ $ kubectl --namespace=kube-system get pod -l name=glbc NAME l7-lb-controller-v0.6.0-1770t ... ``` -Also make sure you have a [firewall rule](https://github.com/kubernetes/contrib/blob/master/ingress/controllers/gce/BETA_LIMITATIONS.md#creating-the-fir-glbc-health-checks) for the node port of the Service. +Also make sure you have a [firewall rule](https://github.com/kubernetes/ingress/blob/master/controllers/gce/BETA_LIMITATIONS.md#creating-the-fir-glbc-health-checks) for the node port of the Service. Create Ingress ```console diff --git a/controllers/nginx/Changelog.md b/controllers/nginx/Changelog.md index b7a014152..a7dc039c4 100644 --- a/controllers/nginx/Changelog.md +++ b/controllers/nginx/Changelog.md @@ -1,7 +1,5 @@ Changelog -Changelog - ### 0.9-beta.11 **Image:** `gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.11` diff --git a/controllers/nginx/rootfs/etc/nginx/template/nginx.tmpl b/controllers/nginx/rootfs/etc/nginx/template/nginx.tmpl index bfaffab98..05805da3d 100644 --- a/controllers/nginx/rootfs/etc/nginx/template/nginx.tmpl +++ b/controllers/nginx/rootfs/etc/nginx/template/nginx.tmpl @@ -498,7 +498,7 @@ http { server { # Use the port 18080 (random value just to avoid known ports) as default port for nginx. # Changing this value requires a change in: - # https://github.com/kubernetes/contrib/blob/master/ingress/controllers/nginx/nginx/command.go#L104 + # https://github.com/kubernetes/ingress/blob/master/controllers/nginx/pkg/cmd/controller/nginx.go listen 18080 default_server reuseport backlog={{ .BacklogSize }}; {{ if $IsIPV6Enabled }}listen [::]:18080 default_server reuseport backlog={{ .BacklogSize }};{{ end }} set $proxy_upstream_name "-"; diff --git a/examples/multi-tls/nginx/multi-tls.yaml b/examples/multi-tls/nginx/multi-tls.yaml index de27a8f6b..a8446aa62 100644 --- a/examples/multi-tls/nginx/multi-tls.yaml +++ b/examples/multi-tls/nginx/multi-tls.yaml @@ -93,7 +93,7 @@ spec: # The cert must also contain the subj-name foo.bar.com # You can create it via: # make keys secret SECRET=/tmp/foobar.json HOST=foo.bar.com NAME=foobar - # https://github.com/kubernetes/contrib/tree/master/ingress/controllers/gce/https_example + # https://github.com/kubernetes/ingress/tree/master/controllers/gce/examples/https secretName: foobar - hosts: - bar.baz.com @@ -101,7 +101,7 @@ spec: # The cert must also contain the subj-name bar.baz.com # You can create it via: # make keys secret SECRET=/tmp/barbaz.json HOST=bar.baz.com NAME=barbaz - # https://github.com/kubernetes/contrib/tree/master/ingress/controllers/gce/https_example + # https://github.com/kubernetes/ingress/tree/master/controllers/gce/examples/https secretName: barbaz rules: - host: foo.bar.com