fix(windows): kubernetes-client fixed

saltstack-formulas · Oct 18, 2020 · 5160842 · 5160842
1 parent bd94157
commit 5160842
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/kubernetes/client/package/install.sls b/kubernetes/client/package/install.sls
@@ -6,6 +6,7 @@
 {%- set formula = d.formula %}
 
     {%- if d.client.pkg.use_upstream in ('package', 'repo') %}
+
         {%- if grains.kernel|lower in ('linux',) %}
             {%- if d.client.pkg.use_upstream == 'repo' %}
 include:
@@ -43,12 +44,14 @@ include:
     - runas: {{ d.identity.rootuser }}
     - unless: test -x /usr/local/bin/kubectl  # if binary is missing
 
-        {%- elif grains.kernel|lower in ('Windows',) %}
+        {%- elif grains.kernel|lower in ('windows',) %}
 
 {{ formula }}-client-package-install-choco:
   chocolatey.installed:
     - name: {{ d.client.pkg.name }}
     - force: True
 
+        {%- else %}
+        # no match
         {%- endif %}
     {%- endif %}
diff --git a/kubernetes/defaults.yaml b/kubernetes/defaults.yaml
@@ -364,8 +364,8 @@ kubernetes:
       use_upstream: archive
       uri_a: 'https://dl.k8s.io'
       archive:
-        source_hash: '7c268bd58e67d3c5016f3fcc9f4b6d2da7558af5a2c708ff3baf767b39e847e3d35d4fd2fa0f640bedbfb09a445036cafbe2f04357a88dada405cfc2ded76972'  # noqa 204
         options: '--strip-components=2'
+        source_hash: '7c268bd58e67d3c5016f3fcc9f4b6d2da7558af5a2c708ff3baf767b39e847e3d35d4fd2fa0f640bedbfb09a445036cafbe2f04357a88dada405cfc2ded76972'  # noqa 204
       suffix: tar.gz
 
   client:
@@ -379,8 +379,8 @@ kubernetes:
       uri_a: 'https://dl.k8s.io'
       uri_b: 'https://storage.googleapis.com/kubernetes-release/release'  # binary
       archive:
-        source_hash: '1590d4357136a71a70172e32820c4a68430d1b94cf0ac941ea17695fbe0c5440d13e26e24a2e9ebdd360c231d4cd16ffffbbe5b577c898c78f7ebdc1d8d00fa3' # noqa 204
         options: '--strip-components=2'
+        source_hash: '1590d4357136a71a70172e32820c4a68430d1b94cf0ac941ea17695fbe0c5440d13e26e24a2e9ebdd360c231d4cd16ffffbbe5b577c898c78f7ebdc1d8d00fa3' # noqa 204
       binary:
         name: kubernetes-client
         source_hash: ''