Merge pull request #1571 from marketlogicsoftware/kayrus/fix_default_namespace

Automatic merge from submit-queue

ingress: use POD_NAMESPACE as a namespace in cli parameters

When you deploy ingress not into `default` namespace, ingress RC fails with the `no service with name default/default-http-backend found: services "default-http-backend" not found` error message.

This fix uses `POD_NAMESPACE` which we already pass into the pod ENV.
This commit is contained in:
Kubernetes Submit Queue 2016-08-26 16:11:52 -07:00 committed by GitHub
commit c6a1b820f0
13 changed files with 32 additions and 32 deletions

View file

@ -43,5 +43,5 @@ spec:
hostPort: 443
args:
- /nginx-ingress-controller
- --default-backend-service=default/default-http-backend
- --nginx-configmap=default/nginx-load-balancer-conf
- --default-backend-service=$(POD_NAMESPACE)/default-http-backend
- --nginx-configmap=$(POD_NAMESPACE)/nginx-load-balancer-conf

View file

@ -43,4 +43,4 @@ spec:
hostPort: 443
args:
- /nginx-ingress-controller
- --default-backend-service=default/nginx-errors
- --default-backend-service=$(POD_NAMESPACE)/nginx-errors

View file

@ -43,7 +43,7 @@ spec:
hostPort: 443
args:
- /nginx-ingress-controller
- --default-backend-service=default/default-http-backend
- --default-backend-service=$(POD_NAMESPACE)/default-http-backend
volumeMounts:
- mountPath: /etc/nginx/template
name: nginx-template-volume

View file

@ -37,4 +37,4 @@ spec:
hostPort: 443
args:
- /nginx-ingress-controller
- --default-backend-service=default/default-http-backend
- --default-backend-service=$(POD_NAMESPACE)/default-http-backend

View file

@ -43,4 +43,4 @@ spec:
hostPort: 443
args:
- /nginx-ingress-controller
- --default-backend-service=default/default-http-backend
- --default-backend-service=$(POD_NAMESPACE)/default-http-backend

View file

@ -53,5 +53,5 @@ spec:
name: dhparam-example
args:
- /nginx-ingress-controller
- --tcp-services-configmap=default/tcp-configmap-example
- --default-backend-service=default/default-http-backend
- --tcp-services-configmap=$(POD_NAMESPACE)/tcp-configmap-example
- --default-backend-service=$(POD_NAMESPACE)/default-http-backend

View file

@ -41,5 +41,5 @@ spec:
- containerPort: 443
args:
- /nginx-ingress-controller
- --default-backend-service=default/default-http-backend
- --nginx-configmap=default/nginx-ingress-controller
- --default-backend-service=$(POD_NAMESPACE)/default-http-backend
- --nginx-configmap=$(POD_NAMESPACE)/nginx-ingress-controller

View file

@ -120,4 +120,4 @@ spec:
hostPort: 8080
args:
- /nginx-ingress-controller
- --default-backend-service=default/default-http-backend
- --default-backend-service=$(POD_NAMESPACE)/default-http-backend

View file

@ -47,5 +47,5 @@ spec:
hostPort: 9000
args:
- /nginx-ingress-controller
- --default-backend-service=default/default-http-backend
- --tcp-services-configmap=default/tcp-configmap-example
- --default-backend-service=$(POD_NAMESPACE)/default-http-backend
- --tcp-services-configmap=$(POD_NAMESPACE)/tcp-configmap-example

View file

@ -43,4 +43,4 @@ spec:
hostPort: 443
args:
- /nginx-ingress-controller
- --default-backend-service=default/default-http-backend
- --default-backend-service=$(POD_NAMESPACE)/default-http-backend

View file

@ -45,5 +45,5 @@ spec:
hostPort: 53
args:
- /nginx-ingress-controller
- --default-backend-service=default/default-http-backend
- --udp-services-configmap=default/udp-configmap-example
- --default-backend-service=$(POD_NAMESPACE)/default-http-backend
- --udp-services-configmap=$(POD_NAMESPACE)/udp-configmap-example

View file

@ -99,4 +99,4 @@ spec:
hostPort: 18080
args:
- /nginx-ingress-controller
- --default-backend-service=default/default-http-backend
- --default-backend-service=$(POD_NAMESPACE)/default-http-backend