feat(docker): dive tool support

saltstack-formulas · Jul 10, 2020 · d28ced0 · d28ced0
1 parent 8cae5c7
commit d28ced0
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 0 deletions.
diff --git a/kubernetes/defaults.yaml b/kubernetes/defaults.yaml
@@ -48,7 +48,20 @@ kubernetes:
       - kubens
       - cue
       - audit2rbac
+      - dive
     pkg:
+      dive:
+        version: '0.9.2'
+        use_upstream_archive: true
+        uri: https://github.com/wagoodman/dive/releases/download
+        suffix: tar.gz
+        commands:
+          - dive
+        archive:
+          name: null  # set in map.jinja
+          source: null # set in map.jinja
+          source_hash: fb0b6ee68831fbfc59a06d88638becea09e85da3bb2093a1de4a47ebd4e40296  # x86_64
+
       kubectx:
         version: '0.9.1'
         use_upstream_archive: true

diff --git a/kubernetes/map.jinja b/kubernetes/map.jinja
@@ -114,6 +114,11 @@
                 {%- set url = '%s/v%s/%s_%s_%s_%s.%s'|format(d[comp]['pkg'][item]['uri'],
                                d[comp]['pkg'][item]['version'], item, d[comp]['pkg'][item]['version'],
                                grains.kernel, arch, d[comp]['pkg'][item]['suffix']) %}
+            {%- elif item in ('dive',) %}
+                {%- set arch = 'amd64' if d.arch in ('x86_64', 'amd64') else d.arch %}
+                {%- set url = '%s/v%s/%s_%s_%s_%s.%s'|format(d[comp]['pkg'][item]['uri'],
+                               d[comp]['pkg'][item]['version'], item, d[comp]['pkg'][item]['version'],
+                               grains.kernel, arch, d[comp]['pkg'][item]['suffix']) %}
             {%- endif %}
 
             {%- do d[comp]['pkg'][item]['archive'].update({'name': d.dir.archive ~ '/' ~ dirname, 'source': url }) %}

diff --git a/kubernetes/osfamilymap.yaml b/kubernetes/osfamilymap.yaml
@@ -153,6 +153,10 @@ Windows:
       audit2rbac:
         archive:
           source_hash: 57e1b6f108141da818eb29ad5755d386f56be067737302fabfa092e335c6ce57
+      dive:
+        archive:
+          suffix: zip
+          source_hash: 4e8e48263077f94fccfb1f1c385a95640ef3c7a48fd8ca41cc7e5889ba82da28  # amd64
 
 MacOS:
   identity:
@@ -217,6 +221,9 @@ MacOS:
       cue:
         archive:
           source_hash: 2b2038feaa2732f25bfb8c563627f990fa890bc654acee34c915bafa5279bc04  # x86_64
+      dive:
+        archive:
+          source_hash: 1da3581355d432db38154d80ca9929fc3bca55c473ba286e7869814718f6d578  # x86_64
       audit2rbac:
         archive:
           source_hash: e89d9e7e6e68d7fdf135ab0912f57afda0fea07931ac443a367d35671f83d1b1