Fix #16 - bad design of user/context/cluster pillar

helm/files/kubeconfig.yaml.j2

@@ -1,14 +1,12 @@
 {%- from "helm/map.jinja" import client with context %}
 {%- set config = client.kubectl.config %}
-{%- set cluster = config.get("cluster", None) %}
+{%- set cluster = config.get("cluster", {}) %}
 {%- set cluster_name = config.get("cluster_name", "thecluster") %}
-{%- set user_name = config.get("user_name", "theuser") %}
-{%- set context_name = config.get('context_name', "\"\"") %}
-{%- set context = config.get("context", None) %}
-{%- set user = config.get("user", None) %}
+{%- set context = config.get("context", {}) %}
+{%- set user = config.get("user", {}) %}
 apiVersion: v1
 
-{%- if cluster is not none %}
+{%- if cluster and cluster | length > 0 %}
 clusters: 
   - name: {{ cluster_name }}
     cluster: 
@@ -17,12 +15,9 @@ clusters:
 clusters: []
 {%- endif %}
 
-{%- if context is not none %}
+{%- if context and context | length > 0 %}
 contexts: 
-  - name: {{ context_name }}
-    context: 
-      cluster: {{ cluster_name }}
-      user: {{ user_name }}
+  {{ context| yaml(false) | indent(2) }}
 {%- else %}
 contexts: []
 {%- endif %}
@@ -31,10 +26,9 @@ current-context: {{ context_name }}
 kind: Config
 preferences: {}
 
-{%- if user is not none %}
+{%- if user and user | length > 0 %}
 users: 
-  - name: {{ user_name }}
-    {{ config.get("user", "") | yaml(false) | indent(4) }}
+  {{ config.user| yaml(false) | indent(2) }}
 {%- else %}
 users: []
-{%- endif %}
+{%- endif %}