Merge pull request #3 from mceloud/enable_register
Enable register
diff --git a/kubernetes/files/manifest/flannel-server.manifest b/kubernetes/files/manifest/flannel-server.manifest
index e8f6f9d..ac2b1e3 100644
--- a/kubernetes/files/manifest/flannel-server.manifest
+++ b/kubernetes/files/manifest/flannel-server.manifest
@@ -52,7 +52,7 @@
"command": [
"/bin/sh",
"-c",
- "/opt/bin/flanneld -listen 0.0.0.0:10253 -etcd-endpoints {% for member in master.etcd.members %}http://{{ member.host }}:4001{% if not loop.last %},{% endif %}{% endfor %} -etcd-prefix /kubernetes.io/network 2>&1 | tee -a /var/log/flannel_server.log"
+ "/opt/bin/flanneld -listen 0.0.0.0:10253 -etcd-endpoints {% for member in master.etcd.members %}http://{{ member.host }}:4001{% if not loop.last %},{% endif %}{% endfor %} -etcd-prefix /kubernetes.io/network 2>&1 | tee -a /var/log/flannel-server.log"
],
"ports": [
{
diff --git a/kubernetes/files/nginx.conf b/kubernetes/files/nginx.conf
deleted file mode 100644
index 8443add..0000000
--- a/kubernetes/files/nginx.conf
+++ /dev/null
@@ -1,37 +0,0 @@
-server {
- listen 443;
- server_name localhost;
-
- root html;
- index index.html index.htm;
-
- ssl on;
- ssl_certificate /etc/pki/cert/{{ master.ca }}/{{ master.apiserver.address }}.crt;
- ssl_certificate_key /etc/pki/cert/{{ master.ca }}/{{ master.apiserver.address }}.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 / {
-
- # 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";
- }
-}
\ No newline at end of file
diff --git a/kubernetes/master/calico.sls b/kubernetes/master/calico.sls
index 665a4be..3d7539d 100644
--- a/kubernetes/master/calico.sls
+++ b/kubernetes/master/calico.sls
@@ -1,5 +1,6 @@
{%- from "kubernetes/map.jinja" import master with context %}
{%- if master.enabled %}
+
/etc/kubernetes/manifests/calico-etcd.manifest:
file.managed:
- source: salt://kubernetes/files/manifest/calico-etcd.manifest
@@ -10,15 +11,7 @@
- dir_mode: 755
- template: jinja
-/usr/bin/calicoctl:
- file.managed:
- - source: https://github.com/projectcalico/calico-containers/releases/download/{{ master.network.version }}/calicoctl
- - source_hash: md5={{ master.network.hash }}
- - mode: 751
- - user: root
- - group: root
-
-{% if pillar.get('is_systemd') %}
+{%- if not pillar.kubernetes.pool is defined %}
/etc/calico/network-environment:
file.managed:
@@ -36,17 +29,21 @@
- user: root
- group: root
-{% endif %}
+/usr/bin/calicoctl:
+ file.managed:
+ - source: https://github.com/projectcalico/calico-containers/releases/download/{{ master.network.version }}/calicoctl
+ - source_hash: md5={{ master.network.hash }}
+ - mode: 751
+ - user: root
+ - group: root
calico_node:
service.running:
- - enable: True
- - watch:
- - file: /usr/bin/calicoctl
-{% if pillar.get('is_systemd') %}
- - file: /etc/systemd/calico-node.service
-{% else %}
- - file: /etc/init/docker-calico-node.conf
-{% endif %}
+ - names: calico-node
+ - enable: True
+ - watch:
+ - file: /etc/systemd/calico-node.service
+
+{%- endif %}
{%- endif %}
\ No newline at end of file
diff --git a/kubernetes/master/flannel.sls b/kubernetes/master/flannel.sls
index 3f9c3b9..b7bbd65 100644
--- a/kubernetes/master/flannel.sls
+++ b/kubernetes/master/flannel.sls
@@ -1,35 +1,5 @@
{%- from "kubernetes/map.jinja" import master with context %}
{%- if master.enabled %}
-flannel-tar:
- archive:
- - extracted
- - user: root
- - name: /usr/local/src
- - source: https://storage.googleapis.com/kubernetes-release/flannel/flannel-0.5.5-linux-amd64.tar.gz
- - tar_options: v
- - source_hash: md5=972c717254775bef528f040af804f2cc
- - archive_format: tar
- - if_missing: /usr/local/src/flannel/flannel-0.5.5/
-
-flannel-symlink:
- file.symlink:
- - name: /usr/local/bin/flanneld
- - target: /usr/local/src/flannel-0.5.5/flanneld
- - force: true
- - watch:
- - archive: flannel-tar
-
-/var/log/etcd_flannel.log:
- file.managed:
- - user: root
- - group: root
- - mode: 755
-
-/var/log/flannel.log:
- file.managed:
- - user: root
- - group: root
- - mode: 755
/etc/kubernetes/network.json:
file.managed:
@@ -50,6 +20,39 @@
- dir_mode: 755
- template: jinja
+/var/log/etcd-flannel.log:
+ file.managed:
+ - user: root
+ - group: root
+ - mode: 644
+
+/var/log/flannel.log:
+ file.managed:
+ - user: root
+ - group: root
+ - mode: 644
+
+{%- if not pillar.kubernetes.pool is defined %}
+
+flannel-tar:
+ archive:
+ - extracted
+ - user: root
+ - name: /opt/flannel
+ - source: https://storage.googleapis.com/kubernetes-release/flannel/flannel-0.5.5-linux-amd64.tar.gz
+ - tar_options: v
+ - source_hash: md5=972c717254775bef528f040af804f2cc
+ - archive_format: tar
+ - if_missing: /usr/local/src/flannel/flannel-0.5.5/
+
+flannel-symlink:
+ file.symlink:
+ - name: /usr/local/bin/flanneld
+ - target: /usr/local/src/flannel-0.5.5/flanneld
+ - force: true
+ - watch:
+ - archive: flannel-tar
+
/etc/default/flannel:
file.managed:
- source: salt://kubernetes/files/flannel/default.master
@@ -58,19 +61,6 @@
- group: root
- mode: 644
-/etc/init.d/flannel:
- file.managed:
- - source: salt://kubernetes/files/flannel/initd
- - user: root
- - group: root
- - mode: 755
-
-flannel:
- service.running:
- - enable: True
- - watch:
- - file: /usr/local/bin/flanneld
- - file: /etc/init.d/flannel
- - file: /etc/default/flannel
+{%- endif %}
{%- endif %}
\ No newline at end of file
diff --git a/kubernetes/master/kubelet.sls b/kubernetes/master/kubelet.sls
index 78d60da..e6aca1b 100644
--- a/kubernetes/master/kubelet.sls
+++ b/kubernetes/master/kubelet.sls
@@ -1,6 +1,8 @@
{%- from "kubernetes/map.jinja" import master with context %}
{%- if master.enabled %}
+{%- if not pillar.kubernetes.pool is defined %}
+
/etc/default/kubelet:
file.managed:
- source: salt://kubernetes/files/kubelet/default.master
@@ -12,6 +14,15 @@
/etc/kubernetes/config:
file.absent
+master_services:
+ service.running:
+ - names: {{ master.services }}
+ - enable: True
+ - watch:
+ - file: /etc/default/kubelet
+
+{%- endif %}
+
{%- for name,namespace in master.namespace.iteritems() %}
{%- if namespace.enabled %}
@@ -29,11 +40,4 @@
{%- endfor %}
-master_services:
- service.running:
- - names: {{ master.services }}
- - enable: True
- - watch:
- - file: /etc/default/kubelet
-
{%- endif %}
\ No newline at end of file
diff --git a/kubernetes/pool/calico.sls b/kubernetes/pool/calico.sls
index 366effb..cabb7e5 100644
--- a/kubernetes/pool/calico.sls
+++ b/kubernetes/pool/calico.sls
@@ -37,8 +37,6 @@
- dir_mode: 755
- template: jinja
-{% if pillar.get('is_systemd') %}
-
/etc/calico/network-environment:
file.managed:
- source: salt://kubernetes/files/calico/network-environment.pool
@@ -55,17 +53,11 @@
- user: root
- group: root
-{% endif %}
-
calico_node:
service.running:
- - enable: True
- - watch:
- - file: /usr/bin/calicoctl
-{% if pillar.get('is_systemd') %}
- - file: /etc/systemd/calico-node.service
-{% else %}
- - file: /etc/init/docker-calico-node.conf
-{% endif %}
+ - names: calico-node
+ - enable: True
+ - watch:
+ - file: /etc/systemd/calico-node.service
{%- endif %}
\ No newline at end of file
diff --git a/kubernetes/pool/flannel.sls b/kubernetes/pool/flannel.sls
index 7d35da7..6cc2513 100644
--- a/kubernetes/pool/flannel.sls
+++ b/kubernetes/pool/flannel.sls
@@ -5,7 +5,7 @@
archive:
- extracted
- user: root
- - name: /usr/local/src
+ - name: /opt/flannel
- source: https://storage.googleapis.com/kubernetes-release/flannel/flannel-0.5.5-linux-amd64.tar.gz
- tar_options: v
- source_hash: md5=972c717254775bef528f040af804f2cc
@@ -28,19 +28,4 @@
- group: root
- mode: 644
-/etc/init.d/flannel:
- file.managed:
- - source: salt://kubernetes/files/flannel/initd
- - user: root
- - group: root
- - mode: 755
-
-flannel:
- service.running:
- - enable: True
- - watch:
- - file: /usr/local/bin/flanneld
- - file: /etc/init.d/flannel
- - file: /etc/default/flannel
-
{%- endif %}
\ No newline at end of file
diff --git a/metadata/service/master/cluster.yml b/metadata/service/master/cluster.yml
index d199929..b62ab4b 100644
--- a/metadata/service/master/cluster.yml
+++ b/metadata/service/master/cluster.yml
@@ -2,18 +2,8 @@
- kubernetes
classes:
- service.kubernetes.support
-- system.nginx.server.single
- service.kubernetes.common
parameters:
- nginx:
- server:
- site:
- kubernetes_master:
- enabled: true
- type: kubernetes
- name: master
- host:
- name: ${_param:nginx_kubernetes_master_host}
kubernetes:
master:
enabled: true
diff --git a/metadata/service/master/single.yml b/metadata/service/master/single.yml
index 9058c26..9cdded9 100644
--- a/metadata/service/master/single.yml
+++ b/metadata/service/master/single.yml
@@ -2,18 +2,8 @@
- kubernetes
classes:
- service.kubernetes.support
-- system.nginx.server.single
- service.kubernetes.common
parameters:
- nginx:
- server:
- site:
- kubernetes_master:
- enabled: true
- type: kubernetes
- name: master
- host:
- name: ${_param:nginx_kubernetes_master_host}
kubernetes:
master:
enabled: true