From 9dec76acda2343e70c59661eab17db76a6f61f5d Mon Sep 17 00:00:00 2001 From: Manuel de Brito Fontes Date: Fri, 30 Jun 2017 10:11:11 -0400 Subject: [PATCH] Fix nginx ingress controller release 0.9-beta.9 --- controllers/nginx/.dockerignore | 2 ++ controllers/nginx/Changelog.md | 6 ++++++ controllers/nginx/Makefile | 2 +- docs/troubleshooting.md | 2 +- examples/aws/nginx/nginx-ingress-controller.yaml | 2 +- .../nginx/nginx-ingress-controller.yaml | 2 +- .../nginx/nginx-custom-configuration.yaml | 2 +- .../customization/custom-errors/nginx/rc-custom-errors.yaml | 2 +- .../custom-headers/nginx/nginx-ingress-controller.yaml | 2 +- examples/customization/custom-template/custom-template.yaml | 2 +- .../custom-vts-metrics/nginx/nginx-ingress-controller.yaml | 2 +- .../ssl-dh-param/nginx/nginx-ingress-controller.yaml | 2 +- examples/daemonset/nginx/nginx-ingress-daemonset.yaml | 2 +- .../deployment/nginx/kubeadm/nginx-ingress-controller.yaml | 2 +- examples/deployment/nginx/nginx-ingress-controller.yaml | 2 +- examples/rbac/nginx/nginx-ingress-controller.yml | 2 +- .../scaling-deployment/nginx/nginx-ingress-deployment.yaml | 2 +- examples/static-ip/nginx/nginx-ingress-controller.yaml | 2 +- examples/tcp/nginx/README.md | 2 +- examples/tcp/nginx/nginx-tcp-ingress-controller.yaml | 2 +- examples/udp/nginx/README.md | 2 +- examples/udp/nginx/nginx-udp-ingress-controller.yaml | 2 +- 22 files changed, 28 insertions(+), 20 deletions(-) create mode 100644 controllers/nginx/.dockerignore diff --git a/controllers/nginx/.dockerignore b/controllers/nginx/.dockerignore new file mode 100644 index 0000000000..7c09b36039 --- /dev/null +++ b/controllers/nginx/.dockerignore @@ -0,0 +1,2 @@ +core + diff --git a/controllers/nginx/Changelog.md b/controllers/nginx/Changelog.md index e3d9979dbb..036917d3d6 100644 --- a/controllers/nginx/Changelog.md +++ b/controllers/nginx/Changelog.md @@ -1,5 +1,11 @@ Changelog +### 0.9-beta.10 + +**Image:** `gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.10` + +Fix release 0.9-beta.9 + ### 0.9-beta.9 **Image:** `gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.9` diff --git a/controllers/nginx/Makefile b/controllers/nginx/Makefile index 5c04702279..b9609ea3e0 100644 --- a/controllers/nginx/Makefile +++ b/controllers/nginx/Makefile @@ -3,7 +3,7 @@ all: push BUILDTAGS= # Use the 0.0 tag for testing, it shouldn't clobber any release builds -TAG?=0.9.0-beta.9 +TAG?=0.9.0-beta.10 REGISTRY?=gcr.io/google_containers GOOS?=linux DOCKER?=gcloud docker -- diff --git a/docs/troubleshooting.md b/docs/troubleshooting.md index 66e108741c..49c3f2e3fb 100644 --- a/docs/troubleshooting.md +++ b/docs/troubleshooting.md @@ -259,7 +259,7 @@ spec: spec: terminationGracePeriodSeconds: 60 containers: - - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.9 + - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.10 name: ingress-nginx imagePullPolicy: Always ports: diff --git a/examples/aws/nginx/nginx-ingress-controller.yaml b/examples/aws/nginx/nginx-ingress-controller.yaml index 2a09dfeefb..e0b1314f0d 100644 --- a/examples/aws/nginx/nginx-ingress-controller.yaml +++ b/examples/aws/nginx/nginx-ingress-controller.yaml @@ -101,7 +101,7 @@ spec: spec: terminationGracePeriodSeconds: 60 containers: - - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.9 + - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.10 name: ingress-nginx imagePullPolicy: Always ports: diff --git a/examples/customization/configuration-snippets/nginx/nginx-ingress-controller.yaml b/examples/customization/configuration-snippets/nginx/nginx-ingress-controller.yaml index 6606c9e457..26792adc3c 100644 --- a/examples/customization/configuration-snippets/nginx/nginx-ingress-controller.yaml +++ b/examples/customization/configuration-snippets/nginx/nginx-ingress-controller.yaml @@ -19,7 +19,7 @@ spec: # hostNetwork: true terminationGracePeriodSeconds: 60 containers: - - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.9 + - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.10 name: nginx-ingress-controller readinessProbe: httpGet: diff --git a/examples/customization/custom-configuration/nginx/nginx-custom-configuration.yaml b/examples/customization/custom-configuration/nginx/nginx-custom-configuration.yaml index 94a7a0393c..62d2809645 100644 --- a/examples/customization/custom-configuration/nginx/nginx-custom-configuration.yaml +++ b/examples/customization/custom-configuration/nginx/nginx-custom-configuration.yaml @@ -22,7 +22,7 @@ spec: # hostNetwork: true terminationGracePeriodSeconds: 60 containers: - - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.9 + - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.10 name: nginx-ingress-controller readinessProbe: httpGet: diff --git a/examples/customization/custom-errors/nginx/rc-custom-errors.yaml b/examples/customization/custom-errors/nginx/rc-custom-errors.yaml index 2c1b1ab679..eaa9705612 100644 --- a/examples/customization/custom-errors/nginx/rc-custom-errors.yaml +++ b/examples/customization/custom-errors/nginx/rc-custom-errors.yaml @@ -16,7 +16,7 @@ spec: spec: terminationGracePeriodSeconds: 60 containers: - - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.9 + - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.10 name: nginx-ingress-lb imagePullPolicy: Always readinessProbe: diff --git a/examples/customization/custom-headers/nginx/nginx-ingress-controller.yaml b/examples/customization/custom-headers/nginx/nginx-ingress-controller.yaml index 6606c9e457..26792adc3c 100644 --- a/examples/customization/custom-headers/nginx/nginx-ingress-controller.yaml +++ b/examples/customization/custom-headers/nginx/nginx-ingress-controller.yaml @@ -19,7 +19,7 @@ spec: # hostNetwork: true terminationGracePeriodSeconds: 60 containers: - - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.9 + - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.10 name: nginx-ingress-controller readinessProbe: httpGet: diff --git a/examples/customization/custom-template/custom-template.yaml b/examples/customization/custom-template/custom-template.yaml index 8d841a4e9e..b39b7206cd 100644 --- a/examples/customization/custom-template/custom-template.yaml +++ b/examples/customization/custom-template/custom-template.yaml @@ -16,7 +16,7 @@ spec: spec: terminationGracePeriodSeconds: 60 containers: - - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.9 + - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.10 name: nginx-ingress-lb imagePullPolicy: Always readinessProbe: diff --git a/examples/customization/custom-vts-metrics/nginx/nginx-ingress-controller.yaml b/examples/customization/custom-vts-metrics/nginx/nginx-ingress-controller.yaml index bbf3b542ca..40ca04ba83 100644 --- a/examples/customization/custom-vts-metrics/nginx/nginx-ingress-controller.yaml +++ b/examples/customization/custom-vts-metrics/nginx/nginx-ingress-controller.yaml @@ -22,7 +22,7 @@ spec: # hostNetwork: true terminationGracePeriodSeconds: 60 containers: - - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.9 + - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.10 name: nginx-ingress-controller readinessProbe: httpGet: diff --git a/examples/customization/ssl-dh-param/nginx/nginx-ingress-controller.yaml b/examples/customization/ssl-dh-param/nginx/nginx-ingress-controller.yaml index 6606c9e457..26792adc3c 100644 --- a/examples/customization/ssl-dh-param/nginx/nginx-ingress-controller.yaml +++ b/examples/customization/ssl-dh-param/nginx/nginx-ingress-controller.yaml @@ -19,7 +19,7 @@ spec: # hostNetwork: true terminationGracePeriodSeconds: 60 containers: - - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.9 + - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.10 name: nginx-ingress-controller readinessProbe: httpGet: diff --git a/examples/daemonset/nginx/nginx-ingress-daemonset.yaml b/examples/daemonset/nginx/nginx-ingress-daemonset.yaml index 741f5229d6..9f674d482f 100644 --- a/examples/daemonset/nginx/nginx-ingress-daemonset.yaml +++ b/examples/daemonset/nginx/nginx-ingress-daemonset.yaml @@ -16,7 +16,7 @@ spec: spec: terminationGracePeriodSeconds: 60 containers: - - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.9 + - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.10 name: nginx-ingress-lb readinessProbe: httpGet: diff --git a/examples/deployment/nginx/kubeadm/nginx-ingress-controller.yaml b/examples/deployment/nginx/kubeadm/nginx-ingress-controller.yaml index 74b41c7aff..5621561b75 100644 --- a/examples/deployment/nginx/kubeadm/nginx-ingress-controller.yaml +++ b/examples/deployment/nginx/kubeadm/nginx-ingress-controller.yaml @@ -71,7 +71,7 @@ spec: hostNetwork: true terminationGracePeriodSeconds: 60 containers: - - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.9 + - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.10 name: nginx-ingress-controller readinessProbe: httpGet: diff --git a/examples/deployment/nginx/nginx-ingress-controller.yaml b/examples/deployment/nginx/nginx-ingress-controller.yaml index e8f7766325..320f6074dd 100644 --- a/examples/deployment/nginx/nginx-ingress-controller.yaml +++ b/examples/deployment/nginx/nginx-ingress-controller.yaml @@ -22,7 +22,7 @@ spec: # hostNetwork: true terminationGracePeriodSeconds: 60 containers: - - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.9 + - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.10 name: nginx-ingress-controller readinessProbe: httpGet: diff --git a/examples/rbac/nginx/nginx-ingress-controller.yml b/examples/rbac/nginx/nginx-ingress-controller.yml index 2d489f5f8a..1fdd39d746 100644 --- a/examples/rbac/nginx/nginx-ingress-controller.yml +++ b/examples/rbac/nginx/nginx-ingress-controller.yml @@ -16,7 +16,7 @@ spec: serviceAccountName: nginx-ingress-serviceaccount containers: - name: nginx-ingress-controller - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.9 + image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.10 args: - /nginx-ingress-controller - --default-backend-service=default/default-http-backend diff --git a/examples/scaling-deployment/nginx/nginx-ingress-deployment.yaml b/examples/scaling-deployment/nginx/nginx-ingress-deployment.yaml index f332caeef7..079e73e8f5 100644 --- a/examples/scaling-deployment/nginx/nginx-ingress-deployment.yaml +++ b/examples/scaling-deployment/nginx/nginx-ingress-deployment.yaml @@ -14,7 +14,7 @@ spec: spec: terminationGracePeriodSeconds: 60 containers: - - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.9 + - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.10 name: nginx-ingress-controller readinessProbe: httpGet: diff --git a/examples/static-ip/nginx/nginx-ingress-controller.yaml b/examples/static-ip/nginx/nginx-ingress-controller.yaml index b283ae7b21..be656b2fe3 100644 --- a/examples/static-ip/nginx/nginx-ingress-controller.yaml +++ b/examples/static-ip/nginx/nginx-ingress-controller.yaml @@ -18,7 +18,7 @@ spec: # hostNetwork: true terminationGracePeriodSeconds: 60 containers: - - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.9 + - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.10 name: nginx-ingress-controller readinessProbe: httpGet: diff --git a/examples/tcp/nginx/README.md b/examples/tcp/nginx/README.md index 182d276837..3ca270440c 100644 --- a/examples/tcp/nginx/README.md +++ b/examples/tcp/nginx/README.md @@ -47,7 +47,7 @@ nginx-ingress-controller 1 1 1 3m $ kubectl -n kube-system describe rc nginx-ingress-controller Name: nginx-ingress-controller Namespace: kube-system -Image(s): gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.9 +Image(s): gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.10 Selector: k8s-app=nginx-tcp-ingress-lb Labels: k8s-app=nginx-ingress-lb Annotations: diff --git a/examples/tcp/nginx/nginx-tcp-ingress-controller.yaml b/examples/tcp/nginx/nginx-tcp-ingress-controller.yaml index 48739d557a..e796aaedb8 100644 --- a/examples/tcp/nginx/nginx-tcp-ingress-controller.yaml +++ b/examples/tcp/nginx/nginx-tcp-ingress-controller.yaml @@ -17,7 +17,7 @@ spec: spec: terminationGracePeriodSeconds: 60 containers: - - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.9 + - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.10 name: nginx-tcp-ingress-lb readinessProbe: httpGet: diff --git a/examples/udp/nginx/README.md b/examples/udp/nginx/README.md index 8936ca4965..278cfc64f2 100644 --- a/examples/udp/nginx/README.md +++ b/examples/udp/nginx/README.md @@ -53,7 +53,7 @@ nginx-udp-ingress-controller 1 1 1 13m $ kubectl -n kube-system describe rc nginx-udp-ingress-controller Name: nginx-udp-ingress-controller Namespace: kube-system -Image(s): gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.9 +Image(s): gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.10 Selector: k8s-app=nginx-udp-ingress-lb Labels: k8s-app=nginx-udp-ingress-lb Annotations: diff --git a/examples/udp/nginx/nginx-udp-ingress-controller.yaml b/examples/udp/nginx/nginx-udp-ingress-controller.yaml index a48dfddcf5..8acc677616 100644 --- a/examples/udp/nginx/nginx-udp-ingress-controller.yaml +++ b/examples/udp/nginx/nginx-udp-ingress-controller.yaml @@ -17,7 +17,7 @@ spec: spec: terminationGracePeriodSeconds: 60 containers: - - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.9 + - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.10 name: nginx-udp-ingress-lb readinessProbe: httpGet: