kube2sky using kubeconfig secret: take 2. Point system secrets at https://kubernetes. Override in clients that can't use DNS.

2015-04-23 16:42:10 -07:00
parent 7505bed054
commit 80af1c9e40
7 changed files with 51 additions and 52 deletions
--- a/cluster/saltbase/salt/kube-addons/init.sls
+++ b/cluster/saltbase/salt/kube-addons/init.sls
@@ -48,20 +48,6 @@
    - makedirs: True
 {% endif %}

-{% if grains['os_family'] == 'RedHat' %}
-{% set environment_file = '/etc/sysconfig/kube-addons' %}
-{% else %}
-{% set environment_file = '/etc/default/kube-addons' %}
-{% endif %}
-
-{{ environment_file }}:
-  file.managed:
-    - source: salt://kube-addons/default
-    - template: jinja
-    - user: root
-    - group: root
-    - mode: 644
-
 /etc/kubernetes/kube-addons.sh:
  file.managed:
    - source: salt://kube-addons/kube-addons.sh