kontena-mortar 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a77fe16cb1595691797fd0e60f3ad6906f6d9f2cb8a6c00d3eeecaa1ab0124c
-  data.tar.gz: c4e883dbf83f12ea59f9ff13fb758696bf3daa990ac56d87263584206340486f
+  metadata.gz: 3abcdd031398ea53f8329a09326ad77a033064828a22a09458f6f6280cebfd75
+  data.tar.gz: 4c75c22bfb4b3686648c5947ac9fb0a2892c1f81b80a5a734040231b33fc81dc
 SHA512:
-  metadata.gz: b027bbc656766d3a0c5c29db0c72e8dc3f8e9f6a73b005ee2ea10109ae1f1de503bd91cbc5f9a168f4894faec5ac5e6948ee5f395c8b25725dc44d64fc6f707f
-  data.tar.gz: e734681cb05dfda305b8baf120957f64419ef6111d0a95480cb7a514500c77cb6addc597df8a4215d57cb77f69fbc768141dfe32dac538bbbe12e5c162708094
+  metadata.gz: d9dc6c7c5e0c50258adc34284cef4ff6ec1372e0481a9487e1a0e678f052013351b4837d2c74a0143d5b555f2c66c60b89cad40ff16d60f326dbe97e485bb33b
+  data.tar.gz: 418a8adc43b49908614f2f5ad72f02353251e4db29f92b2ed6b4cd595a7b62f6a8bc9cb2e61b96fac0609208c48188c25ecff4dbfde0b258d1520016a3b6d9d3

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    kontena-mortar (0.4.2)
+    kontena-mortar (0.4.3)
       clamp (~> 1.3)
       deep_merge (~> 1.2)
-      k8s-client (~> 0.10.1)
+      k8s-client (~> 0.10.4)
       pastel (~> 0.7.2)
       rouge (~> 3.2)
       tty-table (~> 0.10.0)
@@ -13,17 +13,17 @@ GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.0)
-    clamp (1.3.0)
+    clamp (1.3.1)
     concurrent-ruby (1.1.5)
     deep_merge (1.2.1)
     diff-lcs (1.3)
     dry-configurable (0.8.3)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.4, >= 0.4.7)
-    dry-container (0.7.0)
+    dry-container (0.7.2)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.4.7)
+    dry-core (0.4.9)
       concurrent-ruby (~> 1.0)
     dry-equalizer (0.2.2)
     dry-inflector (0.1.2)
@@ -44,18 +44,18 @@ GEM
       dry-inflector (~> 0.1, >= 0.1.2)
       dry-logic (~> 0.4, >= 0.4.2)
     equatable (0.5.0)
-    excon (0.62.0)
-    hashdiff (0.3.9)
+    excon (0.67.0)
+    hashdiff (1.0.0)
     ice_nine (0.11.2)
     jaro_winkler (1.5.2)
     jsonpath (0.9.9)
       multi_json
       to_regexp (~> 0.2.1)
-    k8s-client (0.10.1)
+    k8s-client (0.10.4)
       dry-struct (~> 0.5.0)
       dry-types (~> 0.13.0)
-      excon (~> 0.62.0)
-      hashdiff (~> 0.3.7)
+      excon (~> 0.66)
+      hashdiff (~> 1.0.0)
       jsonpath (~> 0.9.5)
       recursive-open-struct (~> 1.1.0)
       yajl-ruby (~> 1.4.0)
@@ -72,7 +72,7 @@ GEM
     rainbow (3.0.0)
     rake (10.5.0)
     recursive-open-struct (1.1.0)
-    rouge (3.3.0)
+    rouge (3.11.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)

data/README.md

@@ -146,7 +146,7 @@ See examples at [examples/templates](examples/templates).
 
 As for any process, environment variables are also available for Mortar during template processing.
 
-```
+```yaml
 kind: Pod
 apiVersion: v1
 metadata:
@@ -168,7 +168,7 @@ Another option to use variables is via command-line options. Use `mortar --var f
 
 Each of the variables defined will be available in the template via `var.<variable name>`.
 
-```
+```yaml
 kind: Pod
 apiVersion: v1
 metadata:
@@ -189,8 +189,9 @@ You could shoot this resource with `mortar --var port.name=some-port --var port.
 
 ### Shot configuration file
 
-It is also possible to pass both [variables](#variables) and [overlays](#overlays) through a configuration file. As your templates complexity and the amount of variables used grows, it might be easier to manage the variables with an yaml configuration file. The config file has the following syntax:
-```
+It is also possible to pass [variables](#variables), [overlays](#overlays) and [labels](#labels) through a configuration file. As your templates complexity and the amount of variables used grows, it might be easier to manage the variables with an yaml configuration file. The config file has the following syntax:
+
+```yaml
 variables:
   ports:
     - name: http
@@ -202,12 +203,28 @@ overlays:
   - bar
 ```
 
-Both `variables` and `overlays` are optional.
+`variables`, `overlays` and `labels` are optional.
 
 For variables the hash is translated into a `RecursiveOpenStruct` object. What that means is that you can access each element with dotted path notation, just like the vars given through `--var` option. And of course arrays can be looped etc.. Check examples folder how to use variables effectively.
 
 The configuration file can be given using `-c` option to `mortar fire` command. By default Mortar will look for `shot.yml` or `shot.yaml` files present in current working directory.
 
+### Labels
+
+It's possible to set global labels for all resources in a shot via options or configuration file.
+
+#### Labels via options
+
+Use `mortar --label foo=bar my-app resource` to set label to all resources in a shot.
+
+#### Labels via configuration file
+
+```yaml
+labels:
+  foo: bar
+  bar: baz
+```
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/kontena/mortar.

data/kontena-mortar.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.post_install_message = "To install shell auto-completions, use:\n  mortar install-completions"
 
   spec.add_runtime_dependency "clamp", "~> 1.3"
-  spec.add_runtime_dependency "k8s-client", "~> 0.10.1"
+  spec.add_runtime_dependency "k8s-client", "~> 0.10.4"
   spec.add_runtime_dependency "rouge", "~> 3.2"
   spec.add_runtime_dependency "deep_merge", "~> 1.2"
   spec.add_runtime_dependency "pastel", "~> 0.7.2"

data/lib/mortar/config.rb

@@ -10,14 +10,25 @@ module Mortar
       raise ConfigError, "Failed to load config, check config file syntax" unless cfg.is_a? Hash
       raise ConfigError, "Failed to load config, overlays needs to be an array" if cfg.key?('overlays') && !cfg['overlays'].is_a?(Array)
 
-      new(variables: cfg['variables'] || {}, overlays: cfg['overlays'] || [])
+      if cfg.key?('labels')
+        raise ConfigError, "Failed to load config, labels needs to be a hash" if !cfg['labels'].is_a?(Hash)
+        raise ConfigError, "Failed to load config, label values need to be strings" if cfg['labels'].values.any? { |value| !value.is_a?(String) }
+      end
+
+      new(
+        variables: cfg['variables'] || {},
+        overlays: cfg['overlays'] || [],
+        labels: cfg['labels'] || {}
+      )
     end
 
-    def initialize(variables: {}, overlays: [])
+    def initialize(variables: {}, overlays: [], labels: {})
       @variables = variables
       @overlays = overlays
+      @labels = labels
     end
 
+    # @param other [Hash]
     # @return [RecursiveOpenStruct]
     def variables(other = {})
       hash = @variables.dup
@@ -25,10 +36,20 @@ module Mortar
       RecursiveOpenStruct.new(hash, recurse_over_arrays: true)
     end
 
+    # @param other [Array<Object>]
+    # @return [Array<Object>]
     def overlays(other = [])
       return @overlays unless other
 
       (@overlays + other).uniq.compact
     end
+
+    # @param other [Hash]
+    # @return [RecursiveOpenStruct]
+    def labels(other = {})
+      hash = @labels.dup
+      hash.merge!(other)
+      RecursiveOpenStruct.new(hash)
+    end
   end
 end

data/lib/mortar/fire_command.rb

@@ -17,6 +17,7 @@ module Mortar
     parameter "NAME", "deployment name"
 
     option ["--var"], "VAR", "set template variables", multivalued: true
+    option ["--label"], "LABEL", "extra labels that are set to all resources", multivalued: true
     option ["--output"], :flag, "only output generated yaml"
     option ["--[no-]prune"], :flag, "automatically delete removed resources", default: true
     option ["--overlay"], "OVERLAY", "overlay dirs", multivalued: true
@@ -45,6 +46,7 @@ module Mortar
       load_config
 
       resources = process_overlays
+      resources = inject_extra_labels(resources, process_extra_labels)
 
       if output?
         puts resources_output(resources)
@@ -89,6 +91,37 @@ module Mortar
       resources
     end
 
+    # @return [Hash]
+    def extra_labels
+      return @extra_labels if @extra_labels
+
+      @extra_labels = {}
+      label_list.each do |label|
+        key, value = label.split('=')
+        @extra_labels[key] = value
+      end
+
+      @extra_labels
+    end
+
+    # @return [Hash]
+    def process_extra_labels
+      @config.labels(extra_labels)
+    end
+
+    # @param resources [Array<K8s::Resource>]
+    # @param labels [Hash]
+    # @return [Array<K8s::Resource>]
+    def inject_extra_labels(resources, labels)
+      resources.map { |resource|
+        resource.merge(
+          metadata: {
+            labels: labels
+          }
+        )
+      }
+    end
+
     # @return [RecursiveOpenStruct]
     def variables_struct
       @variables_struct ||= @configuration.variables(variables_hash)

data/lib/mortar/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mortar
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-mortar
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-05 00:00:00.000000000 Z
+date: 2019-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.10.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.10.4
 - !ruby/object:Gem::Dependency
   name: rouge
   requirement: !ruby/object:Gem::Requirement