fix(jinja): rename conflicting stuff

saltstack-formulas · May 10, 2020 · 9fadf37 · 9fadf37
1 parent 9ed2025
commit 9fadf37
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/kubernetes/kubectl/config/environ/install.sls b/kubernetes/kubectl/config/environ/install.sls
@@ -4,17 +4,17 @@
 {#- Get the `tplroot` from `tpldir` #}
 {%- 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' %}
+{%- set sls_binary_install = tplroot ~ '.kubectl.binary' %}
+{%- set sls_package_install = tplroot ~ '.kubectl.package' %}
+{%- set sls_source_install = tplroot ~ '.kubectl.source' %}
 
     {%- if 'environ' in k8s.kubectl and k8s.kubectl.environ %}
         {%- from tplroot ~ "/libtofs.jinja" import files_switch with context %}
 
 include:
-  - {{ sls_binary_clean }}
-  - {{ sls_package_clean }}
-  - {{ sls_source_clean }}
+  - {{ sls_binary_install }}
+  - {{ sls_package_install }}
+  - {{ sls_source_install }}
 
 k8s-kubectl-config-file-file-managed-environ_file:
   file.managed:
@@ -31,8 +31,8 @@ k8s-kubectl-config-file-file-managed-environ_file:
     - context:
         environ: {{ k8s.kubectl.environ|json }}
     - require:
-      - sls: {{ sls_binary_clean }}
-      - sls: {{ sls_package_clean }}
-      - sls: {{ sls_source_clean }}
+      - sls: {{ sls_binary_install }}
+      - sls: {{ sls_package_install }}
+      - sls: {{ sls_source_install }}
 
     {%- endif %}
diff --git a/kubernetes/kubectl/config/file/install.sls b/kubernetes/kubectl/config/file/install.sls
@@ -11,9 +11,9 @@
         {%- from tplroot ~ "/libtofs.jinja" import files_switch with context %}
 
 include:
-  {{ '- ' + 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 '' }}
+  {{ '- ' + 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-install-file-managed:
   file.managed: