diff --git a/ingress/controllers/gce/rc.yaml b/ingress/controllers/gce/rc.yaml index 5515af2517..3f6fd6650f 100644 --- a/ingress/controllers/gce/rc.yaml +++ b/ingress/controllers/gce/rc.yaml @@ -78,5 +78,5 @@ spec: cpu: 100m memory: 50Mi args: - - --default-backend-service=$(POD_NAMESPACE)/default-http-backend + - --default-backend-service=default/default-http-backend - --sync-period=300s diff --git a/ingress/controllers/nginx/examples/custom-configuration/rc-custom-configuration.yaml b/ingress/controllers/nginx/examples/custom-configuration/rc-custom-configuration.yaml index 51900cb9b7..8486a3fe58 100644 --- a/ingress/controllers/nginx/examples/custom-configuration/rc-custom-configuration.yaml +++ b/ingress/controllers/nginx/examples/custom-configuration/rc-custom-configuration.yaml @@ -14,7 +14,7 @@ spec: k8s-app: nginx-ingress-lb name: nginx-ingress-lb spec: - terminationGracePeriodSeconds: 60 + terminationGracePeriodSeconds: 60 containers: - image: gcr.io/google_containers/nginx-ingress-controller:0.8.2 name: nginx-ingress-lb diff --git a/ingress/controllers/nginx/examples/custom-errors/rc-custom-errors.yaml b/ingress/controllers/nginx/examples/custom-errors/rc-custom-errors.yaml index 0206efd0dd..8575f33e07 100644 --- a/ingress/controllers/nginx/examples/custom-errors/rc-custom-errors.yaml +++ b/ingress/controllers/nginx/examples/custom-errors/rc-custom-errors.yaml @@ -14,7 +14,7 @@ spec: k8s-app: nginx-ingress-lb name: nginx-ingress-lb spec: - terminationGracePeriodSeconds: 60 + terminationGracePeriodSeconds: 60 containers: - image: gcr.io/google_containers/nginx-ingress-controller:0.8.2 name: nginx-ingress-lb @@ -43,4 +43,4 @@ spec: hostPort: 443 args: - /nginx-ingress-controller - - --default-backend-service=default/nginx-errors + - --default-backend-service=$(POD_NAMESPACE)/nginx-errors diff --git a/ingress/controllers/nginx/examples/custom-template/custom-template.yaml b/ingress/controllers/nginx/examples/custom-template/custom-template.yaml index 0deeb21938..d620d16080 100644 --- a/ingress/controllers/nginx/examples/custom-template/custom-template.yaml +++ b/ingress/controllers/nginx/examples/custom-template/custom-template.yaml @@ -14,7 +14,7 @@ spec: k8s-app: nginx-ingress-lb name: nginx-ingress-lb spec: - terminationGracePeriodSeconds: 60 + terminationGracePeriodSeconds: 60 containers: - image: gcr.io/google_containers/nginx-ingress-controller:0.8.2 name: nginx-ingress-lb diff --git a/ingress/controllers/nginx/examples/daemonset/as-daemonset.yaml b/ingress/controllers/nginx/examples/daemonset/as-daemonset.yaml index 0b3255ffd1..b60cc65343 100644 --- a/ingress/controllers/nginx/examples/daemonset/as-daemonset.yaml +++ b/ingress/controllers/nginx/examples/daemonset/as-daemonset.yaml @@ -8,7 +8,7 @@ spec: labels: name: nginx-ingress-lb spec: - terminationGracePeriodSeconds: 60 + terminationGracePeriodSeconds: 60 containers: - image: gcr.io/google_containers/nginx-ingress-controller:0.8.2 name: nginx-ingress-lb diff --git a/ingress/controllers/nginx/examples/default-backend.yaml b/ingress/controllers/nginx/examples/default-backend.yaml index a48d4b9bcb..77b4f67428 100644 --- a/ingress/controllers/nginx/examples/default-backend.yaml +++ b/ingress/controllers/nginx/examples/default-backend.yaml @@ -11,7 +11,7 @@ spec: labels: app: default-http-backend spec: - terminationGracePeriodSeconds: 60 + terminationGracePeriodSeconds: 60 containers: - name: default-http-backend # Any image is permissable as long as: diff --git a/ingress/controllers/nginx/examples/default/rc-default.yaml b/ingress/controllers/nginx/examples/default/rc-default.yaml index 11831dee65..d2fee94f4c 100644 --- a/ingress/controllers/nginx/examples/default/rc-default.yaml +++ b/ingress/controllers/nginx/examples/default/rc-default.yaml @@ -14,7 +14,7 @@ spec: k8s-app: nginx-ingress-lb name: nginx-ingress-lb spec: - terminationGracePeriodSeconds: 60 + terminationGracePeriodSeconds: 60 containers: - image: gcr.io/google_containers/nginx-ingress-controller:0.8.2 name: nginx-ingress-lb diff --git a/ingress/controllers/nginx/examples/full/rc-full.yaml b/ingress/controllers/nginx/examples/full/rc-full.yaml index 9c77f8dd83..d091d11772 100644 --- a/ingress/controllers/nginx/examples/full/rc-full.yaml +++ b/ingress/controllers/nginx/examples/full/rc-full.yaml @@ -15,7 +15,7 @@ spec: k8s-app: nginx-ingress-lb name: nginx-ingress-lb spec: - terminationGracePeriodSeconds: 60 + terminationGracePeriodSeconds: 60 volumes: - name: dhparam-example secret: diff --git a/ingress/controllers/nginx/examples/proxy-protocol/nginx-rc.yaml b/ingress/controllers/nginx/examples/proxy-protocol/nginx-rc.yaml index e208b39c2c..c7eb406208 100644 --- a/ingress/controllers/nginx/examples/proxy-protocol/nginx-rc.yaml +++ b/ingress/controllers/nginx/examples/proxy-protocol/nginx-rc.yaml @@ -42,4 +42,4 @@ spec: args: - /nginx-ingress-controller - --default-backend-service=$(POD_NAMESPACE)/default-http-backend - - --nginx-configmap=default/nginx-ingress-controller + - --nginx-configmap=$(POD_NAMESPACE)/nginx-ingress-controller diff --git a/ingress/controllers/nginx/examples/sysctl/change-proc-values-rc.yaml b/ingress/controllers/nginx/examples/sysctl/change-proc-values-rc.yaml index 7aedfe5a9a..65af29b8f4 100644 --- a/ingress/controllers/nginx/examples/sysctl/change-proc-values-rc.yaml +++ b/ingress/controllers/nginx/examples/sysctl/change-proc-values-rc.yaml @@ -65,23 +65,23 @@ spec: labels: k8s-app: nginx-ingress-lb name: nginx-ingress-lb - spec: + spec: terminationGracePeriodSeconds: 60 containers: - image: alpine:3.4 name: sysctl-buddy # 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, - # kernel.shmmax, kernel.shmmni, kernel.shm_rmid_forced and Sysctls + # IPC Namespace: kernel.msgmax, kernel.msgmnb, kernel.msgmni, kernel.sem, kernel.shmall, + # kernel.shmmax, kernel.shmmni, kernel.shm_rmid_forced and Sysctls # beginning with fs.mqueue.* # Network Namespace: Sysctls beginning with net.* - # + # # kubectl -c sysctl-buddy -- sysctl -A | grep net command: - /bin/sh - -c - | - while true; do + while true; do sysctl -w net.core.somaxconn=32768 sysctl -w net.ipv4.ip_local_port_range='1024 65535' sleep 10 diff --git a/ingress/controllers/nginx/examples/tcp/rc-tcp.yaml b/ingress/controllers/nginx/examples/tcp/rc-tcp.yaml index d8b5ce4a40..a309eee2f9 100644 --- a/ingress/controllers/nginx/examples/tcp/rc-tcp.yaml +++ b/ingress/controllers/nginx/examples/tcp/rc-tcp.yaml @@ -14,7 +14,7 @@ spec: k8s-app: nginx-ingress-lb name: nginx-ingress-lb spec: - terminationGracePeriodSeconds: 60 + terminationGracePeriodSeconds: 60 containers: - image: gcr.io/google_containers/nginx-ingress-controller:0.8.2 name: nginx-ingress-lb diff --git a/ingress/controllers/nginx/examples/tls/rc-ssl.yaml b/ingress/controllers/nginx/examples/tls/rc-ssl.yaml index 11831dee65..d2fee94f4c 100644 --- a/ingress/controllers/nginx/examples/tls/rc-ssl.yaml +++ b/ingress/controllers/nginx/examples/tls/rc-ssl.yaml @@ -14,7 +14,7 @@ spec: k8s-app: nginx-ingress-lb name: nginx-ingress-lb spec: - terminationGracePeriodSeconds: 60 + terminationGracePeriodSeconds: 60 containers: - image: gcr.io/google_containers/nginx-ingress-controller:0.8.2 name: nginx-ingress-lb diff --git a/ingress/controllers/nginx/examples/udp/rc-udp.yaml b/ingress/controllers/nginx/examples/udp/rc-udp.yaml index efb6c92f0d..9f50b0f9d0 100644 --- a/ingress/controllers/nginx/examples/udp/rc-udp.yaml +++ b/ingress/controllers/nginx/examples/udp/rc-udp.yaml @@ -14,7 +14,7 @@ spec: k8s-app: nginx-ingress-lb name: nginx-ingress-lb spec: - terminationGracePeriodSeconds: 60 + terminationGracePeriodSeconds: 60 containers: - image: gcr.io/google_containers/nginx-ingress-controller:0.8.2 name: nginx-ingress-lb @@ -46,4 +46,4 @@ spec: args: - /nginx-ingress-controller - --default-backend-service=$(POD_NAMESPACE)/default-http-backend - - --udp-services-configmap=default/udp-configmap-example + - --udp-services-configmap=$(POD_NAMESPACE)/udp-configmap-example