From e4de1e62b825ad2c7cbde9440b33eecc29cd6c81 Mon Sep 17 00:00:00 2001 From: kayrus Date: Fri, 19 Aug 2016 10:25:38 +0200 Subject: [PATCH 1/2] ingress: use POD_NAMESPACE as a namespace in cli parameters --- controllers/gce/rc.yaml | 2 +- .../custom-configuration/rc-custom-configuration.yaml | 4 ++-- .../nginx/examples/custom-template/custom-template.yaml | 2 +- controllers/nginx/examples/daemonset/as-daemonset.yaml | 2 +- controllers/nginx/examples/default/rc-default.yaml | 2 +- controllers/nginx/examples/full/rc-full.yaml | 4 ++-- controllers/nginx/examples/proxy-protocol/nginx-rc.yaml | 2 +- controllers/nginx/examples/sysctl/change-proc-values-rc.yaml | 2 +- controllers/nginx/examples/tcp/rc-tcp.yaml | 4 ++-- controllers/nginx/examples/tls/rc-ssl.yaml | 2 +- controllers/nginx/examples/udp/rc-udp.yaml | 2 +- controllers/nginx/rc.yaml | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/controllers/gce/rc.yaml b/controllers/gce/rc.yaml index 3f6fd6650..5515af251 100644 --- a/controllers/gce/rc.yaml +++ b/controllers/gce/rc.yaml @@ -78,5 +78,5 @@ spec: cpu: 100m memory: 50Mi args: - - --default-backend-service=default/default-http-backend + - --default-backend-service=$(POD_NAMESPACE)/default-http-backend - --sync-period=300s diff --git a/controllers/nginx/examples/custom-configuration/rc-custom-configuration.yaml b/controllers/nginx/examples/custom-configuration/rc-custom-configuration.yaml index e7820cf53..51900cb9b 100644 --- a/controllers/nginx/examples/custom-configuration/rc-custom-configuration.yaml +++ b/controllers/nginx/examples/custom-configuration/rc-custom-configuration.yaml @@ -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 diff --git a/controllers/nginx/examples/custom-template/custom-template.yaml b/controllers/nginx/examples/custom-template/custom-template.yaml index 552dccb00..0deeb2193 100644 --- a/controllers/nginx/examples/custom-template/custom-template.yaml +++ b/controllers/nginx/examples/custom-template/custom-template.yaml @@ -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 diff --git a/controllers/nginx/examples/daemonset/as-daemonset.yaml b/controllers/nginx/examples/daemonset/as-daemonset.yaml index 7c65a8344..0b3255ffd 100644 --- a/controllers/nginx/examples/daemonset/as-daemonset.yaml +++ b/controllers/nginx/examples/daemonset/as-daemonset.yaml @@ -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 diff --git a/controllers/nginx/examples/default/rc-default.yaml b/controllers/nginx/examples/default/rc-default.yaml index f27fe8295..11831dee6 100644 --- a/controllers/nginx/examples/default/rc-default.yaml +++ b/controllers/nginx/examples/default/rc-default.yaml @@ -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 diff --git a/controllers/nginx/examples/full/rc-full.yaml b/controllers/nginx/examples/full/rc-full.yaml index e36ec539a..9c77f8dd8 100644 --- a/controllers/nginx/examples/full/rc-full.yaml +++ b/controllers/nginx/examples/full/rc-full.yaml @@ -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 diff --git a/controllers/nginx/examples/proxy-protocol/nginx-rc.yaml b/controllers/nginx/examples/proxy-protocol/nginx-rc.yaml index 04591556f..e208b39c2 100644 --- a/controllers/nginx/examples/proxy-protocol/nginx-rc.yaml +++ b/controllers/nginx/examples/proxy-protocol/nginx-rc.yaml @@ -41,5 +41,5 @@ spec: - containerPort: 443 args: - /nginx-ingress-controller - - --default-backend-service=default/default-http-backend + - --default-backend-service=$(POD_NAMESPACE)/default-http-backend - --nginx-configmap=default/nginx-ingress-controller diff --git a/controllers/nginx/examples/sysctl/change-proc-values-rc.yaml b/controllers/nginx/examples/sysctl/change-proc-values-rc.yaml index 5b5671401..7aedfe5a9 100644 --- a/controllers/nginx/examples/sysctl/change-proc-values-rc.yaml +++ b/controllers/nginx/examples/sysctl/change-proc-values-rc.yaml @@ -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 diff --git a/controllers/nginx/examples/tcp/rc-tcp.yaml b/controllers/nginx/examples/tcp/rc-tcp.yaml index 2185590fb..d8b5ce4a4 100644 --- a/controllers/nginx/examples/tcp/rc-tcp.yaml +++ b/controllers/nginx/examples/tcp/rc-tcp.yaml @@ -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 diff --git a/controllers/nginx/examples/tls/rc-ssl.yaml b/controllers/nginx/examples/tls/rc-ssl.yaml index f27fe8295..11831dee6 100644 --- a/controllers/nginx/examples/tls/rc-ssl.yaml +++ b/controllers/nginx/examples/tls/rc-ssl.yaml @@ -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 diff --git a/controllers/nginx/examples/udp/rc-udp.yaml b/controllers/nginx/examples/udp/rc-udp.yaml index 5d1df5456..efb6c92f0 100644 --- a/controllers/nginx/examples/udp/rc-udp.yaml +++ b/controllers/nginx/examples/udp/rc-udp.yaml @@ -45,5 +45,5 @@ spec: hostPort: 53 args: - /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 diff --git a/controllers/nginx/rc.yaml b/controllers/nginx/rc.yaml index 083933414..183d5a5d9 100644 --- a/controllers/nginx/rc.yaml +++ b/controllers/nginx/rc.yaml @@ -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 From d8fbe2f5824501c0527920f3b28b51fdb241b88a Mon Sep 17 00:00:00 2001 From: kayrus Date: Fri, 19 Aug 2016 10:53:33 +0200 Subject: [PATCH 2/2] ingress: removed unnecessary whitespaces --- controllers/gce/rc.yaml | 2 +- .../custom-configuration/rc-custom-configuration.yaml | 2 +- .../nginx/examples/custom-errors/rc-custom-errors.yaml | 4 ++-- .../examples/custom-template/custom-template.yaml | 2 +- controllers/nginx/examples/daemonset/as-daemonset.yaml | 2 +- controllers/nginx/examples/default-backend.yaml | 2 +- controllers/nginx/examples/default/rc-default.yaml | 2 +- controllers/nginx/examples/full/rc-full.yaml | 2 +- .../nginx/examples/proxy-protocol/nginx-rc.yaml | 2 +- .../nginx/examples/sysctl/change-proc-values-rc.yaml | 10 +++++----- controllers/nginx/examples/tcp/rc-tcp.yaml | 2 +- controllers/nginx/examples/tls/rc-ssl.yaml | 2 +- controllers/nginx/examples/udp/rc-udp.yaml | 4 ++-- 13 files changed, 19 insertions(+), 19 deletions(-) diff --git a/controllers/gce/rc.yaml b/controllers/gce/rc.yaml index 5515af251..3f6fd6650 100644 --- a/controllers/gce/rc.yaml +++ b/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/controllers/nginx/examples/custom-configuration/rc-custom-configuration.yaml b/controllers/nginx/examples/custom-configuration/rc-custom-configuration.yaml index 51900cb9b..8486a3fe5 100644 --- a/controllers/nginx/examples/custom-configuration/rc-custom-configuration.yaml +++ b/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/controllers/nginx/examples/custom-errors/rc-custom-errors.yaml b/controllers/nginx/examples/custom-errors/rc-custom-errors.yaml index 0206efd0d..8575f33e0 100644 --- a/controllers/nginx/examples/custom-errors/rc-custom-errors.yaml +++ b/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/controllers/nginx/examples/custom-template/custom-template.yaml b/controllers/nginx/examples/custom-template/custom-template.yaml index 0deeb2193..d620d1608 100644 --- a/controllers/nginx/examples/custom-template/custom-template.yaml +++ b/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/controllers/nginx/examples/daemonset/as-daemonset.yaml b/controllers/nginx/examples/daemonset/as-daemonset.yaml index 0b3255ffd..b60cc6534 100644 --- a/controllers/nginx/examples/daemonset/as-daemonset.yaml +++ b/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/controllers/nginx/examples/default-backend.yaml b/controllers/nginx/examples/default-backend.yaml index a48d4b9bc..77b4f6742 100644 --- a/controllers/nginx/examples/default-backend.yaml +++ b/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/controllers/nginx/examples/default/rc-default.yaml b/controllers/nginx/examples/default/rc-default.yaml index 11831dee6..d2fee94f4 100644 --- a/controllers/nginx/examples/default/rc-default.yaml +++ b/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/controllers/nginx/examples/full/rc-full.yaml b/controllers/nginx/examples/full/rc-full.yaml index 9c77f8dd8..d091d1177 100644 --- a/controllers/nginx/examples/full/rc-full.yaml +++ b/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/controllers/nginx/examples/proxy-protocol/nginx-rc.yaml b/controllers/nginx/examples/proxy-protocol/nginx-rc.yaml index e208b39c2..c7eb40620 100644 --- a/controllers/nginx/examples/proxy-protocol/nginx-rc.yaml +++ b/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/controllers/nginx/examples/sysctl/change-proc-values-rc.yaml b/controllers/nginx/examples/sysctl/change-proc-values-rc.yaml index 7aedfe5a9..65af29b8f 100644 --- a/controllers/nginx/examples/sysctl/change-proc-values-rc.yaml +++ b/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/controllers/nginx/examples/tcp/rc-tcp.yaml b/controllers/nginx/examples/tcp/rc-tcp.yaml index d8b5ce4a4..a309eee2f 100644 --- a/controllers/nginx/examples/tcp/rc-tcp.yaml +++ b/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/controllers/nginx/examples/tls/rc-ssl.yaml b/controllers/nginx/examples/tls/rc-ssl.yaml index 11831dee6..d2fee94f4 100644 --- a/controllers/nginx/examples/tls/rc-ssl.yaml +++ b/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/controllers/nginx/examples/udp/rc-udp.yaml b/controllers/nginx/examples/udp/rc-udp.yaml index efb6c92f0..9f50b0f9d 100644 --- a/controllers/nginx/examples/udp/rc-udp.yaml +++ b/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