refactor(config): simplify & fix config states

kubernetes/kubectl/config/clean.sls

@@ -1,7 +1,24 @@
 # -*- coding: utf-8 -*-
 # vim: ft=sls
 
+{%- set tplroot = tpldir.split('/')[0] %}
+{%- from tplroot ~ "/map.jinja" import kubernetes as k8s with context %}
+{%- set sls_binary_clean = tplroot ~ '.kubectl.binary.clean' %}
+{%- set sls_package_clean = tplroot ~ '.kubectl.package.clean' %}
+{%- set sls_source_clean = tplroot ~ '.kubectl.source.clean' %}
+
 include:
-  - .file.clean
-  - .environ.clean
+  {{ '- ' + sls_package_clean if k8s.kubectl.pkg.use_upstream_repo else '' }}
+  {{ '- ' + sls_source_clean if k8s.kubectl.pkg.use_upstream_source else '' }}
+  {{ '- ' + sls_binary_clean if k8s.kubectl.pkg.use_upstream_binary else '' }}
   - .alternatives.clean
+
+k8s-kubectl-config-clean-file-absent:
+  file.absent:
+    - names:
+      - {{ k8s.kubectl.config_file }}
+      - {{ k8s.kubectl.environ_file }}
+    - require:
+      {{ '- sls: ' + sls_package_clean if k8s.kubectl.pkg.use_upstream_repo else '' }}
+      {{ '- sls: ' + sls_source_clean if k8s.kubectl.pkg.use_upstream_source else '' }}
+      {{ '- sls: ' + sls_binary_clean if k8s.kubectl.pkg.use_upstream_binary else '' }}

kubernetes/kubectl/config/environ/install.sls → kubernetes/kubectl/config/environ.sls

@@ -1,20 +1,19 @@
 # -*- coding: utf-8 -*-
 # vim: ft=sls
 
-{#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- from tplroot ~ "/map.jinja" import kubernetes as k8s with context %}
-{%- set sls_binary_install = tplroot ~ '.kubectl.binary' %}
-{%- set sls_package_install = tplroot ~ '.kubectl.package' %}
-{%- set sls_source_install = tplroot ~ '.kubectl.source' %}
+{%- set sls_binary_install = tplroot ~ '.kubectl.binary.install' %}
+{%- set sls_package_install = tplroot ~ '.kubectl.package.install' %}
+{%- set sls_source_install = tplroot ~ '.kubectl.source.install' %}
 
     {%- if 'environ' in k8s.kubectl and k8s.kubectl.environ %}
         {%- from tplroot ~ "/libtofs.jinja" import files_switch with context %}
 
 include:
-  - {{ sls_binary_install }}
-  - {{ sls_package_install }}
-  - {{ sls_source_install }}
+  {{ '- ' + sls_package_install if k8s.kubectl.pkg.use_upstream_repo else '' }}
+  {{ '- ' + sls_source_install if k8s.kubectl.pkg.use_upstream_source else '' }}
+  {{ '- ' + sls_binary_install if k8s.kubectl.pkg.use_upstream_binary else '' }}
 
 k8s-kubectl-config-file-file-managed-environ_file:
   file.managed:
@@ -23,16 +22,16 @@ k8s-kubectl-config-file-file-managed-environ_file:
                               lookup='k8s-kubectl-config-file-file-managed-environ_file'
                  )
               }}
-    - mode: 640
+    - mode: '0640'
     - user: {{ k8s.rootuser }}
     - group: {{ k8s.rootgroup }}
     - makedirs: True
     - template: jinja
     - context:
         environ: {{ k8s.kubectl.environ|json }}
     - require:
-      - sls: {{ sls_binary_install }}
-      - sls: {{ sls_package_install }}
-      - sls: {{ sls_source_install }}
+      {{ '- sls: ' + sls_package_install if k8s.kubectl.pkg.use_upstream_repo else '' }}
+      {{ '- sls: ' + sls_source_install if k8s.kubectl.pkg.use_upstream_source else '' }}
+      {{ '- sls: ' + sls_binary_install if k8s.kubectl.pkg.use_upstream_binary else '' }}
 
     {%- endif %}

kubernetes/minikube/config/clean.sls

@@ -1,7 +1,24 @@
 # -*- coding: utf-8 -*-
 # vim: ft=sls
 
+{%- set tplroot = tpldir.split('/')[0] %}
+{%- from tplroot ~ "/map.jinja" import kubernetes as k8s with context %}
+{%- set sls_binary_clean = tplroot ~ '.minikube.binary.clean' %}
+{%- set sls_package_clean = tplroot ~ '.minikube.package.clean' %}
+{%- set sls_source_clean = tplroot ~ '.minikube.source.clean' %}
+
 include:
-  - .file.clean
-  - .environ.clean
+  {{ '- ' + sls_package_clean if k8s.minikube.pkg.use_upstream_repo else '' }}
+  {{ '- ' + sls_source_clean if k8s.minikube.pkg.use_upstream_source else '' }}
+  {{ '- ' + sls_binary_clean if k8s.minikube.pkg.use_upstream_binary else '' }}
   - .alternatives.clean
+
+k8s-minikube-config-clean-file-absent:
+  file.absent:
+    - names:
+      - {{ k8s.minikube.config_file }}
+      - {{ k8s.minikube.environ_file }}
+    - require:
+      {{ '- sls: ' + sls_package_clean if k8s.minikube.pkg.use_upstream_repo else '' }}
+      {{ '- sls: ' + sls_source_clean if k8s.minikube.pkg.use_upstream_source else '' }}
+      {{ '- sls: ' + sls_binary_clean if k8s.minikube.pkg.use_upstream_binary else '' }}

kubernetes/minikube/config/environ/install.sls → kubernetes/minikube/config/environ.sls

@@ -1,20 +1,19 @@
 # -*- coding: utf-8 -*-
 # vim: ft=sls
 
-{#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- from tplroot ~ "/map.jinja" import kubernetes as k8s with context %}
-{%- set sls_binary_install = tplroot ~ '.minikube.binary' %}
-{%- set sls_package_install = tplroot ~ '.minikube.package' %}
-{%- set sls_source_install = tplroot ~ '.minikube.source' %}
+{%- set sls_binary_install = tplroot ~ '.minikube.binary.install' %}
+{%- set sls_package_install = tplroot ~ '.minikube.package.install' %}
+{%- set sls_source_install = tplroot ~ '.minikube.source.install' %}
 
     {%- if 'environ' in k8s.minikube and k8s.minikube.environ %}
         {%- from tplroot ~ "/libtofs.jinja" import files_switch with context %}
 
 include:
-  - {{ sls_binary_install }}
-  - {{ sls_package_install }}
-  - {{ sls_source_install }}
+  {{ '- ' + sls_package_install if k8s.minikube.pkg.use_upstream_repo else '' }}
+  {{ '- ' + sls_source_install if k8s.minikube.pkg.use_upstream_source else '' }}
+  {{ '- ' + sls_binary_install if k8s.minikube.pkg.use_upstream_binary else '' }}
 
 k8s-minikube-config-file-file-managed-environ_file:
   file.managed:
@@ -31,8 +30,8 @@ k8s-minikube-config-file-file-managed-environ_file:
     - context:
         environ: {{ k8s.minikube.environ|json }}
     - require:
-      - sls: {{ sls_binary_install }}
-      - sls: {{ sls_package_install }}
-      - sls: {{ sls_source_install }}
+      {{ '- sls: ' + sls_package_install if k8s.minikube.pkg.use_upstream_repo else '' }}
+      {{ '- sls: ' + sls_source_install if k8s.minikube.pkg.use_upstream_source else '' }}
+      {{ '- sls: ' + sls_binary_install if k8s.minikube.pkg.use_upstream_binary else '' }}
 
     {%- endif %}

kubernetes/minikube/config/file/install.sls → kubernetes/minikube/config/file.sls

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 # vim: ft=sls
 
-{#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- from tplroot ~ "/map.jinja" import kubernetes as k8s with context %}
 {%- set sls_binary_install = tplroot ~ '.minikube.binary.install' %}