fix(macos): resolve #31

saltstack-formulas · Jul 9, 2020 · ecd83ac · ecd83ac
1 parent d3f30c7
commit ecd83ac
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 16 deletions.
diff --git a/kubernetes/clean.sls b/kubernetes/clean.sls
@@ -2,16 +2,16 @@
 # vim: ft=sls
 
 include:
-  - .client.client
-  - .octant.client
-  - .minikube.client
-  - .linkerd2.client
-  - .kubebuilder.client
-  - .kudo.client
-  - .k3s.client
-  - .kind.client
-  - .istio.client
-  - .devspace.client
-  - .node.client
-  - .server.client
-  - .client.client
+  - .client.clean
+  - .octant.clean
+  - .minikube.clean
+  - .linkerd2.clean
+  - .kubebuilder.clean
+  - .kudo.clean
+  - .k3s.clean
+  - .kind.clean
+  - .istio.clean
+  - .devspace.clean
+  - .node.clean
+  - .server.clean
+  - .client.clean
diff --git a/kubernetes/defaults.yaml b/kubernetes/defaults.yaml
@@ -106,7 +106,7 @@ kubernetes:
         version: 3.4.0
         uri: https://github.com/integr8ly/grafana-operator/archive
         source_hash: 3921adb8656c74a201e9e189931357d6be767e807d7312e7bd902efb607db089
-      prometheus-operator
+      prometheus-operator:
         version: '0.40.0'
         uri: https://github.com/coreos/prometheus-operator/archive
         source_hash: e9771685650803d2d07c0c8f455508e736e0516606d3182bc109f7986380cbc1

diff --git a/kubernetes/k3s/script/clean.sls b/kubernetes/k3s/script/clean.sls
@@ -5,6 +5,8 @@
 {%- from tplroot ~ "/map.jinja" import data as d with context %}
 {%- set formula = d.formula %}
 
+    {%- if d.k3s.pkg.use_upstream_script %}
+
 {{ formula }}-k3s-script-clean-killall:
   cmd.run:
     - name: {{ d.k3s.pkg.script.killall }}
@@ -26,3 +28,5 @@
     - require:
       - cmd: {{ formula }}-k3s-script-clean-killall
       - cmd: {{ formula }}-k3s-script-clean-uninstall
+
+    {%- endif %}
diff --git a/kubernetes/k3s/script/install.sls b/kubernetes/k3s/script/install.sls
@@ -5,6 +5,8 @@
 {%- from tplroot ~ "/map.jinja" import data as d with context %}
 {%- set formula = d.formula %}
 
+    {%- if d.k3s.pkg.use_upstream_script %}
+
 {{ formula }}-k3s-script-install-prerequisites:
   pkg.installed:
     - names: {{ d.pkg.deps|json }}
@@ -55,3 +57,5 @@
       {%- endif %}
     - require:
       - file: {{ formula }}-k3s-script-download
+
+    {%- endif %}
diff --git a/kubernetes/map.jinja b/kubernetes/map.jinja
@@ -80,10 +80,10 @@
         {%- if 'source_hash' not in d[comp]['pkg']['binary'] %}
             {%- do d[comp]['pkg']['binary'].update({'source_hash': uri ~ '.sha256'}) %}
         {%- endif %}
-        {%- set fallback_url = uri + '/' + d[comp]['pkg']['name'] %}
+        {%- set url = uri if 'name' not in d[comp]['pkg'] else uri + '/' + d[comp]['pkg']['name'] %}
         {%- do d[comp]['pkg']['binary'].update({
             'name': d.dir.binary + '/' + dirname,
-            'source': uri if comp in ('minikube', 'devspace', 'kudo', 'kind') else fallback_url }) %}
+            'source': uri if comp in ('minikube', 'devspace', 'kudo', 'kind') else url }) %}
 
     {%- endif %}
 

diff --git a/kubernetes/osfamilymap.yaml b/kubernetes/osfamilymap.yaml
@@ -153,6 +153,7 @@ MacOS:
         source_hash: 7b9bdc2dc8604e590052a58456ac648d3afd1b436e609118538a6ffe07579cc6
       archive:
         source_hash: 803a0fed122ef6b85f7a120b5485723eaade765b7bc8306d0c0da03bd3df15d800699d15ea2270bb7797fa9ce6a81da90e730dc793ea4ed8c0149b63d26eca30  # noqa 204
+
   minikube:
     check: sysctl -a | grep machdep.cpu.features
     pkg:
@@ -185,3 +186,7 @@ MacOS:
       name: kind      # homebrew
       binary:
         source_hash: cdd8dfe7dff764429badcd636179b0e3eb937640cfe56749dd9b8f9c048cb7db
+  k3s:
+    pkg:
+      use_upstream_binary: true
+      use_upstream_script: false