From 172d4e27f14c550d2bb4589ba92d301b852dd7d1 Mon Sep 17 00:00:00 2001 From: Mike Danese Date: Mon, 21 Mar 2016 17:25:28 -0700 Subject: [PATCH] remove unused nginx salt 'aws', 'gce', 'vagrant', 'vsphere' are all the cloud providers --- cluster/saltbase/salt/nginx/init.sls | 64 -------------------- cluster/saltbase/salt/nginx/kubernetes-site | 66 --------------------- cluster/saltbase/salt/nginx/nginx.conf | 61 ------------------- cluster/saltbase/salt/nginx/nginx.json | 60 ------------------- cluster/saltbase/salt/top.sls | 3 - 5 files changed, 254 deletions(-) delete mode 100644 cluster/saltbase/salt/nginx/init.sls delete mode 100644 cluster/saltbase/salt/nginx/kubernetes-site delete mode 100644 cluster/saltbase/salt/nginx/nginx.conf delete mode 100644 cluster/saltbase/salt/nginx/nginx.json diff --git a/cluster/saltbase/salt/nginx/init.sls b/cluster/saltbase/salt/nginx/init.sls deleted file mode 100644 index 201371755d..0000000000 --- a/cluster/saltbase/salt/nginx/init.sls +++ /dev/null @@ -1,64 +0,0 @@ -nginx: - pkg: - - installed - -/etc/nginx/nginx.conf: - file: - - managed - - source: salt://nginx/nginx.conf - - template: jinja - - user: root - - group: root - - mode: 644 - -/etc/nginx/sites-enabled/default: - file: - - managed - - makedirs: true - - source: salt://nginx/kubernetes-site - - user: root - - group: root - - mode: 644 - -/usr/share/nginx/htpasswd: - file: - - managed - - source: salt://nginx/htpasswd - - user: root - - group: root - - mode: 644 - -{% if grains.cloud is defined and grains.cloud in ['gce'] %} -/etc/kubernetes/manifests/nginx.json: - file: - - managed - - source: salt://nginx/nginx.json - - user: root - - group: root - - mode: 644 - - require: - - file: /etc/nginx/nginx.conf - - file: /etc/nginx/sites-enabled/default - - file: /usr/share/nginx/htpasswd - - cmd: kubernetes-cert - - -#stop legacy nginx_service -stop_nginx-service: - service.dead: - - name: nginx - - enable: None - -{% else %} -nginx-service: - service: - - running - - name: nginx - - watch: - - pkg: nginx - - file: /etc/nginx/nginx.conf - - file: /etc/nginx/sites-enabled/default - - file: /usr/share/nginx/htpasswd - - cmd: kubernetes-cert -{% endif %} - diff --git a/cluster/saltbase/salt/nginx/kubernetes-site b/cluster/saltbase/salt/nginx/kubernetes-site deleted file mode 100644 index 818a487110..0000000000 --- a/cluster/saltbase/salt/nginx/kubernetes-site +++ /dev/null @@ -1,66 +0,0 @@ -#server { - #listen 80; ## listen for ipv4; this line is default and implied - #listen [::]:80 default_server ipv6only=on; ## listen for ipv6 - -# root /usr/share/nginx/www; -# index index.html index.htm; - - # Make site accessible from http://localhost/ -# server_name localhost; -# location / { -# auth_basic "Restricted"; -# auth_basic_user_file /usr/share/nginx/htpasswd; - - # Proxy settings. -# proxy_pass http://localhost:8080/; -# proxy_connect_timeout 159s; -# proxy_send_timeout 600s; -# proxy_read_timeout 600s; -# proxy_buffer_size 64k; -# proxy_buffers 16 32k; -# proxy_busy_buffers_size 64k; -# proxy_temp_file_write_size 64k; -# } -#} - -# HTTPS server -# -server { - listen 443; - server_name localhost; - - root html; - index index.html index.htm; - - ssl on; - ssl_certificate /srv/kubernetes/server.cert; - ssl_certificate_key /srv/kubernetes/server.key; - - ssl_session_timeout 5m; - - # don't use SSLv3 because of POODLE - ssl_protocols TLSv1 TLSv1.1 TLSv1.2; - ssl_ciphers ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:ECDH+3DES:DH+3DES:RSA+AESGCM:RSA+AES:RSA+3DES:!aNULL:!MD5:!DSS; - ssl_prefer_server_ciphers on; - - location / { - auth_basic "Restricted"; - auth_basic_user_file /usr/share/nginx/htpasswd; - - # Proxy settings - # disable buffering so that watch works - proxy_buffering off; - proxy_pass http://127.0.0.1:8080/; - proxy_connect_timeout 159s; - proxy_send_timeout 600s; - proxy_read_timeout 600s; - - # Disable retry - proxy_next_upstream off; - - # Support web sockets - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - } -} diff --git a/cluster/saltbase/salt/nginx/nginx.conf b/cluster/saltbase/salt/nginx/nginx.conf deleted file mode 100644 index 00b1961ab6..0000000000 --- a/cluster/saltbase/salt/nginx/nginx.conf +++ /dev/null @@ -1,61 +0,0 @@ -{% if grains['os_family'] == 'RedHat' %} -user nginx; -{% else %} -user www-data; -{% endif %} - -worker_processes 4; -pid /var/run/nginx.pid; - -events { - worker_connections 768; - # multi_accept on; -} - -http { - - ## - # Basic Settings - ## - - sendfile on; - tcp_nopush on; - tcp_nodelay on; - keepalive_timeout 65; - types_hash_max_size 2048; - # server_tokens off; - - # server_names_hash_bucket_size 64; - # server_name_in_redirect off; - - include /etc/nginx/mime.types; - default_type application/octet-stream; - - ## - # Logging Settings - ## - - access_log /var/log/nginx/access.log; - error_log /var/log/nginx/error.log; - - ## - # Gzip Settings - ## - - gzip on; - gzip_disable "msie6"; - - # gzip_vary on; - # gzip_proxied any; - # gzip_comp_level 6; - # gzip_buffers 16 8k; - # gzip_http_version 1.1; - # gzip_types text/plain text/css application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript; - - ## - # Virtual Host Configs - ## - - include /etc/nginx/conf.d/*.conf; - include /etc/nginx/sites-enabled/*; -} diff --git a/cluster/saltbase/salt/nginx/nginx.json b/cluster/saltbase/salt/nginx/nginx.json deleted file mode 100644 index 44c41c27d1..0000000000 --- a/cluster/saltbase/salt/nginx/nginx.json +++ /dev/null @@ -1,60 +0,0 @@ -{ -"apiVersion": "v1", -"kind": "Pod", -"metadata": {"name":"nginx"}, -"spec":{ -"hostNetwork": true, -"containers":[ - { - "name": "nginx", - "image": "gcr.io/google-containers/nginx:v1", - "resources": { - "limits": { - "cpu": "200m" - } - }, - "command": [ - "nginx", - "-g", - "daemon off;" - ], - "ports":[ - { "name": "https", - "containerPort": 443, - "hostPort": 443} - ], - "volumeMounts": [ - { "name": "nginx", - "mountPath": "/etc/nginx", - "readOnly": true}, - { "name": "k8s", - "mountPath": "/srv/kubernetes", - "readOnly": true}, - { "name": "logs", - "mountPath": "/var/log/nginx", - "readOnly": false}, - { "name": "passwd", - "mountPath": "/usr/share/nginx", - "readOnly": true} - ] - } -], -"volumes":[ - { "name": "nginx", - "hostPath": { - "path": "/etc/nginx"} - }, - { "name": "k8s", - "hostPath": { - "path": "/srv/kubernetes"} - }, - { "name": "passwd", - "hostPath": { - "path": "/usr/share/nginx"} - }, - { "name": "logs", - "hostPath": { - "path": "/var/logs/nginx"} - } -] -}} diff --git a/cluster/saltbase/salt/top.sls b/cluster/saltbase/salt/top.sls index 0f1db45d91..b0c1fd01f4 100644 --- a/cluster/saltbase/salt/top.sls +++ b/cluster/saltbase/salt/top.sls @@ -55,9 +55,6 @@ base: - kube-controller-manager - kube-scheduler - supervisor -{% if grains['cloud'] is defined and not grains.cloud in [ 'aws', 'gce', 'vagrant', 'vsphere'] %} - - nginx -{% endif %} - cadvisor - kube-client-tools - kube-master-addons