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

@ -14,7 +14,7 @@ spec:
k8s-app: nginx-ingress-lb k8s-app: nginx-ingress-lb
name: nginx-ingress-lb name: nginx-ingress-lb
spec: spec:
terminationGracePeriodSeconds: 60 terminationGracePeriodSeconds: 60
containers: containers:
- image: gcr.io/google_containers/nginx-ingress-controller:0.8.2 - image: gcr.io/google_containers/nginx-ingress-controller:0.8.2
name: nginx-ingress-lb name: nginx-ingress-lb
@ -43,5 +43,5 @@ spec:
hostPort: 443 hostPort: 443
args: args:
- /nginx-ingress-controller - /nginx-ingress-controller
- --default-backend-service=default/default-http-backend - --default-backend-service=$(POD_NAMESPACE)/default-http-backend
- --nginx-configmap=default/nginx-load-balancer-conf - --nginx-configmap=$(POD_NAMESPACE)/nginx-load-balancer-conf

View file

@ -14,7 +14,7 @@ spec:
k8s-app: nginx-ingress-lb k8s-app: nginx-ingress-lb
name: nginx-ingress-lb name: nginx-ingress-lb
spec: spec:
terminationGracePeriodSeconds: 60 terminationGracePeriodSeconds: 60
containers: containers:
- image: gcr.io/google_containers/nginx-ingress-controller:0.8.2 - image: gcr.io/google_containers/nginx-ingress-controller:0.8.2
name: nginx-ingress-lb name: nginx-ingress-lb
@ -43,4 +43,4 @@ spec:
hostPort: 443 hostPort: 443
args: args:
- /nginx-ingress-controller - /nginx-ingress-controller
- --default-backend-service=default/nginx-errors - --default-backend-service=$(POD_NAMESPACE)/nginx-errors

View file

@ -14,7 +14,7 @@ spec:
k8s-app: nginx-ingress-lb k8s-app: nginx-ingress-lb
name: nginx-ingress-lb name: nginx-ingress-lb
spec: spec:
terminationGracePeriodSeconds: 60 terminationGracePeriodSeconds: 60
containers: containers:
- image: gcr.io/google_containers/nginx-ingress-controller:0.8.2 - image: gcr.io/google_containers/nginx-ingress-controller:0.8.2
name: nginx-ingress-lb name: nginx-ingress-lb
@ -43,7 +43,7 @@ spec:
hostPort: 443 hostPort: 443
args: args:
- /nginx-ingress-controller - /nginx-ingress-controller
- --default-backend-service=default/default-http-backend - --default-backend-service=$(POD_NAMESPACE)/default-http-backend
volumeMounts: volumeMounts:
- mountPath: /etc/nginx/template - mountPath: /etc/nginx/template
name: nginx-template-volume name: nginx-template-volume

View file

@ -8,7 +8,7 @@ spec:
labels: labels:
name: nginx-ingress-lb name: nginx-ingress-lb
spec: spec:
terminationGracePeriodSeconds: 60 terminationGracePeriodSeconds: 60
containers: containers:
- image: gcr.io/google_containers/nginx-ingress-controller:0.8.2 - image: gcr.io/google_containers/nginx-ingress-controller:0.8.2
name: nginx-ingress-lb name: nginx-ingress-lb
@ -37,4 +37,4 @@ spec:
hostPort: 443 hostPort: 443
args: args:
- /nginx-ingress-controller - /nginx-ingress-controller
- --default-backend-service=default/default-http-backend - --default-backend-service=$(POD_NAMESPACE)/default-http-backend

View file

@ -11,7 +11,7 @@ spec:
labels: labels:
app: default-http-backend app: default-http-backend
spec: spec:
terminationGracePeriodSeconds: 60 terminationGracePeriodSeconds: 60
containers: containers:
- name: default-http-backend - name: default-http-backend
# Any image is permissable as long as: # Any image is permissable as long as:

View file

@ -14,7 +14,7 @@ spec:
k8s-app: nginx-ingress-lb k8s-app: nginx-ingress-lb
name: nginx-ingress-lb name: nginx-ingress-lb
spec: spec:
terminationGracePeriodSeconds: 60 terminationGracePeriodSeconds: 60
containers: containers:
- image: gcr.io/google_containers/nginx-ingress-controller:0.8.2 - image: gcr.io/google_containers/nginx-ingress-controller:0.8.2
name: nginx-ingress-lb name: nginx-ingress-lb
@ -43,4 +43,4 @@ spec:
hostPort: 443 hostPort: 443
args: args:
- /nginx-ingress-controller - /nginx-ingress-controller
- --default-backend-service=default/default-http-backend - --default-backend-service=$(POD_NAMESPACE)/default-http-backend

View file

@ -15,7 +15,7 @@ spec:
k8s-app: nginx-ingress-lb k8s-app: nginx-ingress-lb
name: nginx-ingress-lb name: nginx-ingress-lb
spec: spec:
terminationGracePeriodSeconds: 60 terminationGracePeriodSeconds: 60
volumes: volumes:
- name: dhparam-example - name: dhparam-example
secret: secret:
@ -53,5 +53,5 @@ spec:
name: dhparam-example name: dhparam-example
args: args:
- /nginx-ingress-controller - /nginx-ingress-controller
- --tcp-services-configmap=default/tcp-configmap-example - --tcp-services-configmap=$(POD_NAMESPACE)/tcp-configmap-example
- --default-backend-service=default/default-http-backend - --default-backend-service=$(POD_NAMESPACE)/default-http-backend

View file

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

View file

@ -65,23 +65,23 @@ spec:
labels: labels:
k8s-app: nginx-ingress-lb k8s-app: nginx-ingress-lb
name: nginx-ingress-lb name: nginx-ingress-lb
spec: spec:
terminationGracePeriodSeconds: 60 terminationGracePeriodSeconds: 60
containers: containers:
- image: alpine:3.4 - image: alpine:3.4
name: sysctl-buddy name: sysctl-buddy
# using kubectl exec you can check which other parameters is possible to change # using kubectl exec you can check which other parameters is possible to change
# IPC Namespace: kernel.msgmax, kernel.msgmnb, kernel.msgmni, kernel.sem, kernel.shmall, # IPC Namespace: kernel.msgmax, kernel.msgmnb, kernel.msgmni, kernel.sem, kernel.shmall,
# kernel.shmmax, kernel.shmmni, kernel.shm_rmid_forced and Sysctls # kernel.shmmax, kernel.shmmni, kernel.shm_rmid_forced and Sysctls
# beginning with fs.mqueue.* # beginning with fs.mqueue.*
# Network Namespace: Sysctls beginning with net.* # Network Namespace: Sysctls beginning with net.*
# #
# kubectl <podname> -c sysctl-buddy -- sysctl -A | grep net # kubectl <podname> -c sysctl-buddy -- sysctl -A | grep net
command: command:
- /bin/sh - /bin/sh
- -c - -c
- | - |
while true; do while true; do
sysctl -w net.core.somaxconn=32768 sysctl -w net.core.somaxconn=32768
sysctl -w net.ipv4.ip_local_port_range='1024 65535' sysctl -w net.ipv4.ip_local_port_range='1024 65535'
sleep 10 sleep 10
@ -120,4 +120,4 @@ spec:
hostPort: 8080 hostPort: 8080
args: args:
- /nginx-ingress-controller - /nginx-ingress-controller
- --default-backend-service=default/default-http-backend - --default-backend-service=$(POD_NAMESPACE)/default-http-backend

View file

@ -14,7 +14,7 @@ spec:
k8s-app: nginx-ingress-lb k8s-app: nginx-ingress-lb
name: nginx-ingress-lb name: nginx-ingress-lb
spec: spec:
terminationGracePeriodSeconds: 60 terminationGracePeriodSeconds: 60
containers: containers:
- image: gcr.io/google_containers/nginx-ingress-controller:0.8.2 - image: gcr.io/google_containers/nginx-ingress-controller:0.8.2
name: nginx-ingress-lb name: nginx-ingress-lb
@ -47,5 +47,5 @@ spec:
hostPort: 9000 hostPort: 9000
args: args:
- /nginx-ingress-controller - /nginx-ingress-controller
- --default-backend-service=default/default-http-backend - --default-backend-service=$(POD_NAMESPACE)/default-http-backend
- --tcp-services-configmap=default/tcp-configmap-example - --tcp-services-configmap=$(POD_NAMESPACE)/tcp-configmap-example

View file

@ -14,7 +14,7 @@ spec:
k8s-app: nginx-ingress-lb k8s-app: nginx-ingress-lb
name: nginx-ingress-lb name: nginx-ingress-lb
spec: spec:
terminationGracePeriodSeconds: 60 terminationGracePeriodSeconds: 60
containers: containers:
- image: gcr.io/google_containers/nginx-ingress-controller:0.8.2 - image: gcr.io/google_containers/nginx-ingress-controller:0.8.2
name: nginx-ingress-lb name: nginx-ingress-lb
@ -43,4 +43,4 @@ spec:
hostPort: 443 hostPort: 443
args: args:
- /nginx-ingress-controller - /nginx-ingress-controller
- --default-backend-service=default/default-http-backend - --default-backend-service=$(POD_NAMESPACE)/default-http-backend

View file

@ -14,7 +14,7 @@ spec:
k8s-app: nginx-ingress-lb k8s-app: nginx-ingress-lb
name: nginx-ingress-lb name: nginx-ingress-lb
spec: spec:
terminationGracePeriodSeconds: 60 terminationGracePeriodSeconds: 60
containers: containers:
- image: gcr.io/google_containers/nginx-ingress-controller:0.8.2 - image: gcr.io/google_containers/nginx-ingress-controller:0.8.2
name: nginx-ingress-lb name: nginx-ingress-lb
@ -45,5 +45,5 @@ spec:
hostPort: 53 hostPort: 53
args: args:
- /nginx-ingress-controller - /nginx-ingress-controller
- --default-backend-service=default/default-http-backend - --default-backend-service=$(POD_NAMESPACE)/default-http-backend
- --udp-services-configmap=default/udp-configmap-example - --udp-services-configmap=$(POD_NAMESPACE)/udp-configmap-example

View file

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