commit e0b570ab90feca3b8699a1b53df584673a6ed3e5
author mcp-jenkins <mcp-jenkins@mirantis.com> Fri Mar 22 12:02:33 2019 +0000
committer Gerrit Code Review <mail@domain.com> Fri Mar 22 12:02:33 2019 +0000
tree fb2df89be74a238a06a9e83e87229f03133aa9aa
parent b3a2c0905044d31e0481d7cb8106223a47bc677e
parent 795385f4e1977f0d1ae5c61aa2a0e46a879742b6

Merge "Add support cri container log format" into release/2019.2.0

kubernetes/_common.sls

diff --git a/kubernetes/_common.sls b/kubernetes/_common.sls
index ae8a851..aaabd23 100644
--- a/kubernetes/_common.sls
+++ b/kubernetes/_common.sls
@@ -134,6 +134,12 @@
     - group: root
     - mode: 0750
 
+/var/log/criproxy:
+  file.directory:
+    - user: root
+    - group: root
+    - mode: 0750
+
 /etc/criproxy/node.conf:
   file.managed:
     - user: root

kubernetes/files/systemd/criproxy.service

diff --git a/kubernetes/files/systemd/criproxy.service b/kubernetes/files/systemd/criproxy.service
index 9980501..3bb3961 100644
--- a/kubernetes/files/systemd/criproxy.service
+++ b/kubernetes/files/systemd/criproxy.service
@@ -24,7 +24,7 @@
           {%- endif %}
           -listen /var/run/criproxy.sock \
           -v 3 \
-          -alsologtostderr \
+          -log_dir=/var/log/criproxy \
 {%- if salt['pkg.version_cmp'](version,'1.8') < 0 %}
           -apiVersion {{ version }} \
 {%- endif %}

kubernetes/master/controller.sls

diff --git a/kubernetes/master/controller.sls b/kubernetes/master/controller.sls
index 112f2d7..fe95cbd 100644
--- a/kubernetes/master/controller.sls
+++ b/kubernetes/master/controller.sls
@@ -335,6 +335,7 @@
 
 {%- endif %}
 
+{%- if master.namespace is defined %}
 
 {%- for name,namespace in master.namespace.items() %}
 
@@ -360,6 +361,8 @@
 
 {%- endfor %}
 
+{%- endif %}
+
 {%- if master.registry.secret is defined %}
 
 {%- for name,registry in master.registry.secret.items() %}