kubes 0.7.4 → 0.7.8

data/docs/search/search.js

@@ -0,0 +1,247 @@
+/**
+ * A simple JSON search
+ * Requires jQuery (v 1.7+)
+ *
+ * @author   Mat Hayward - Erskine Design
+ * @author   Rishikesh Darandale <Rishikesh.Darandale@gmail.com>
+ * @version  1.1
+ */
+
+var q, jsonFeedUrl = "/search/data.json",
+  $searchForm = $("[data-search-form]"),
+  $searchInput = $("[data-search-input]"),
+  $resultTemplate = $("#search-result"),
+  $resultsPlaceholder = $("[data-search-results]"),
+  $foundContainer = $("[data-search-found]"),
+  $foundTerm = $("[data-search-found-term]"),
+  $foundCount = $("[data-search-found-count]"),
+  $foundWord = $("[data-search-found-word]"),
+  allowEmpty = true,
+  showLoader = true,
+  loadingClass = "is--loading",
+  indexVar;
+
+
+$(document).ready( function() {
+  // hide items found string
+  $foundContainer.hide();
+  // initiate search functionality
+  initSearch();
+});
+
+function initSearch() {
+  if(!sessionStorage.getItem("lunrIndex")) {
+    // get the data
+    getData();
+  } else {
+    // Get search results if q parameter is set in querystring
+    if (getParameterByName('q')) {
+      q = decodeURIComponent(getParameterByName('q'));
+      $searchInput.val(q);
+      execSearch(q);
+    }
+  }
+
+  // Get search results on submission of form
+  $(document).on("submit", $searchForm, function(e) {
+    console.log("form submitted");
+    e.preventDefault();
+    q = $searchInput.val();
+    execSearch(q);
+  });
+}
+
+/**
+ * Get the JSON data
+ * Get the generated feeds/feed.json file so lunr.js can search it locally.
+ * Store the index in sessionStorage
+ */
+function getData(indexVar) {
+  jqxhr = $.getJSON(jsonFeedUrl)
+    .done(function(loaded_data){
+      // save the actual data as well
+      sessionStorage.setItem("actualData", JSON.stringify(loaded_data));
+      // set the index fields
+      indexVar = lunr(function () {
+        this.field('id');
+        this.field('title', { boost: 10 });
+        this.field('search_title', { boost: 10 });
+        this.field('content', { boost: 10 });
+        this.field('author');
+        loaded_data.forEach(function (doc, index) {
+          if ( doc.search_omit != "true" ) {
+            console.log("adding to index: " + doc.title);
+            this.add($.extend({ "id": index }, doc));
+          }
+        }, this)
+      });
+      // store the index in sessionStorage
+      sessionStorage.setItem("lunrIndex", JSON.stringify(indexVar));
+      // Get search results if q parameter is set in querystring
+      if (getParameterByName('q')) {
+        q = decodeURIComponent(getParameterByName('q'));
+        $searchInput.val(q);
+        execSearch(q);
+      }
+    })
+    .fail( function() {
+      console.log("get json failed...");
+    })
+    .always( function() {
+      console.log("finally...");
+    });
+}
+
+/**
+ * Get the search result from lunr
+ * @param {String} q
+ * @returns search results
+ */
+function getResults(q) {
+  var savedIndexData = JSON.parse(sessionStorage.getItem("lunrIndex"));
+  console.log("Indexed var from sessionStorage: " + savedIndexData);
+  return lunr.Index.load(savedIndexData).search(q);
+}
+
+/**
+ * Executes search
+ * @param {String} q
+ * @return null
+ */
+function execSearch(q) {
+  if (q != '' || allowEmpty) {
+    if (showLoader) {
+      toggleLoadingClass();
+    }
+    processResultData(getResults(q));
+    changeUrl("Search", "/search/?q=" + encodeURIComponent(q));
+  }
+}
+
+/**
+ * Toggles loading class on results and found string
+ * @return null
+ */
+function toggleLoadingClass() {
+  $resultsPlaceholder.toggleClass(loadingClass);
+  $foundContainer.toggleClass(loadingClass);
+}
+
+/**
+ * Process search result data
+ * @return null
+ */
+function processResultData(searchResults) {
+  $results = [];
+
+  console.log("Search Results: " + searchResults);
+  var resultsCount = 0,
+      results = "";
+
+  // Iterate over the results
+  searchResults.forEach(function(result) {
+    var loaded_data = JSON.parse(sessionStorage.getItem("actualData"));
+    var item = loaded_data[result.ref];
+    var result = populateResultContent($resultTemplate.html(), item);
+        resultsCount++;
+        results += result;
+  });
+
+
+  if (showLoader) {
+    toggleLoadingClass();
+  }
+
+  populateResultsString(resultsCount);
+  showSearchResults(results);
+}
+
+/**
+ * Add search results to placeholder
+ * @param {String} results
+ * @return null
+ */
+function showSearchResults(results) {
+  // Add results HTML to placeholder
+  $resultsPlaceholder.html(results);
+}
+
+/**
+ * Add results content to item template
+ * @param {String} html
+ * @param {object} item
+ * @return {String} Populated HTML
+ */
+function populateResultContent(html, item) {
+  var title = item.search_title || item.title
+  html = injectContent(html, title, '##Title##');
+  html = injectContent(html, item.link, '##Url##');
+  var content = text_truncate(item.content);
+  html = injectContent(html, content, '##Content##');
+  return html;
+}
+
+function text_truncate(str, length, ending) {
+  if (length == null) {
+    length = 255;
+  }
+  if (ending == null) {
+    ending = '...';
+  }
+  if (str.length > length) {
+    return str.substring(0, length - ending.length) + ending;
+  } else {
+    return str;
+  }
+};
+
+/**
+ * Populates results string
+ * @param {String} count
+ * @return null
+ */
+function populateResultsString(count) {
+  $foundTerm.text(q);
+  $foundCount.text(count);
+  if (count == 1)
+    $foundWord.text("result")
+  else
+    $foundWord.text("results")
+  $foundContainer.show();
+}
+
+ /* ==========================================================================
+    Helper functions
+    ========================================================================== */
+
+
+/**
+ * Gets query string parameter - taken from http://stackoverflow.com/questions/901115/how-can-i-get-query-string-values-in-javascript
+ * @param {String} name
+ * @return {String} parameter value
+ */
+function getParameterByName(name) {
+  var match = RegExp('[?&]' + name + '=([^&]*)').exec(window.location.search);
+  return match && decodeURIComponent(match[1].replace(/\+/g, ' '));
+}
+
+/**
+ * Injects content into template using placeholder
+ * @param {String} originalContent
+ * @param {String} injection
+ * @param {String} placeholder
+ * @return {String} injected content
+ */
+function injectContent(originalContent, injection, placeholder) {
+  var regex = new RegExp(placeholder, 'g');
+  return originalContent.replace(regex, injection);
+}
+
+function changeUrl(page, url) {
+  if (typeof(window.history.pushState) != "undefined") {
+    var obj = { Page: page, Url: url };
+    window.history.pushState(obj, obj.Page, obj.Url);
+  } else {
+    console.log("Browser does not support HTML5.");
+  }
+}

data/docs/search/tips.md

@@ -0,0 +1,48 @@
+---
+title: Search Tips
+---
+
+Here are some useful search tips that can help to make searching more effective.
+
+## OR Searches
+
+By default, searches for multiple terms are combined with OR. If a document matches at least one of the search terms, it will show in the results. So:
+
+    install aws
+
+Will always result in more results just `install` by itself.
+
+
+## AND Searches
+
+To do an AND search of "install AND aws" mark both terms as required, you use a `+` sign in front of each term. Example:
+
+    +install +aws
+
+This results in pages only with both exactly install and aws.
+
+## Filter Terms
+
+To filter "keywords", you use a `-` sign in front of each term. Example:
+
+    +install -aws
+
+This results in pages only with install but filter or reject any pages with aws.
+
+## Wildcard
+
+You can use wildcards:
+
+    install*
+
+## Fields
+
+You can target specific fields:
+
+    title:install
+
+For fields see: [search data.json]({% link search/data.json %})
+
+## More Tips
+
+More search tips can be found at: [lunrjs searching](https://lunrjs.com/guides/searching.html)

data/lib/kubes/cli/init.rb

@@ -86,10 +86,11 @@ class Kubes::CLI
       ignores = %w[
         .kubes/output
         .kubes/state
+        .kubes/tmp
       ].map {|l| "#{l}\n"} # the readlines will have lines with \n so keep consistent for processing
       if File.exist?(".gitignore")
         lines = IO.readlines(".gitignore")
-        if lines.detect { |l| l.include?('.kubes/output') }
+        if lines.detect { |l| l.include?('.kubes/tmp') }
           return # early
         else
           lines += ignores

data/lib/kubes/compiler/decorator/hashable/field.rb

@@ -1,52 +1,72 @@
 class Kubes::Compiler::Decorator::Hashable
   class Field
-    # item is full wrapper structure
+    # item is full structure
     #
-    #     secretRef:  <--- wrapper
-    #       name: demo-secret
+    #     secretRef:           <--- wrapper_key
+    #       name: demo-secret  <--- target_key is 'name' from wrapper_map[wrapper_key]
     #
+    attr_reader :item # for debugging
     def initialize(item)
       @item = item
     end
 
     def hashable?
-      x = @item.keys & map.keys
+      x = @item.keys & wrapper_map.keys
       !x.empty?
     end
 
     def kind
-      wrapper =~ /configMap/ ? "ConfigMap" : "Secret"
+      wrapper_key =~ /configMap/ ? "ConfigMap" : "Secret"
     end
 
-    # The key of the hashable value.
+    # The target key of the hashable value is that key used for find value to add hash
     #
     #     envFrom:
-    #     - secretRef:
-    #         name: demo-secret    <--- wrapper is 'name'
+    #     - secretRef:             <--- wrapper_key
+    #         name: demo-secret    <--- target_key is 'name' from wrapper_map[wrapper_key]
     #
-    def key
-      map[wrapper]
+    def target_key
+      wrapper_map[wrapper_key]
     end
 
     # The wrapper field is nested right above the item with the hashable value.
+    # Simple example:
     #
     #     envFrom:
-    #     - secretRef:  <--- wrapper
-    #         name: demo-secret
+    #     - secretRef:           <--- wrapper_key
+    #         name: demo-secret  <--- target_key is 'name' from wrapper_map[wrapper_key]
     #
-    def wrapper
-      @item.keys.first
+    # More complex example where there's a configMap.name key also on the same level.
+    #
+    #     volumes:
+    #     - name: config-map-volume
+    #       configMap:
+    #         name: demo-config-map
+    #
+    # Note: Wont work for case when there's are 2 matching wrapper_map keys,
+    # but don't think Kubernetes allows 2 matching wrapper_map keys.
+    # Example: This is invalid Kubernetes YAML.
+    #
+    #     volumes:
+    #     - name: config-map-volume
+    #       configMap:
+    #         name: demo-config-map
+    #       secretRef:
+    #         name: demo-seret
+    def wrapper_key
+      @item.keys.find { |k| wrapper_map.keys.include?(k) } # this key used for map[wrapper_key]
     end
 
     # wrapper element to key that stores the hashable value
-    def map
+    def wrapper_map
       {
-        'configMapRef' => 'name',
-        'configMapKeyRef' => 'name',
-        'configMap' => 'name',
-        'secretRef' => 'name',
-        'secretKeyRef' => 'name',
-        'secret' => 'secretName',
+        'configMapRef' => 'name',    # containers.env.envFrom.configMapRef.name
+        'configMapKeyRef' => 'name', # containers.env.valueFrom.configMapKeyRef.name
+        'configMap' => 'name',       # containers.env.envFrom.configMapRef.name
+        'secretRef' => 'name',       # containers.env.envFrom.secretRef.name
+        'secretKeyRef' => 'name',    # containers.env.valueFrom.secretKeyRef.name
+        'secret' => 'secretName',    # volumes.secret.secretName
+        'tls' => 'secretName',       # tls.secretName
       }
     end
   end

data/lib/kubes/compiler/decorator/post.rb

@@ -16,12 +16,12 @@ module Kubes::Compiler::Decorator
       # hashable set from previous stack call
       if options[:hashable_field] && item.is_a?(Hash)
         field = options[:hashable_field]
-        value_without_md5 = item[field.key]
+        value_without_md5 = item[field.target_key]
         @reset_hashable_field = true unless value_without_md5
         if field.hashable? && value_without_md5
           md5 = Hashable::Storage.fetch(field.kind, value_without_md5)
           v = [value_without_md5, md5].compact.join('-')
-          item[field.key] = v
+          item[field.target_key] = v
         end
       end
 
@@ -29,10 +29,10 @@ module Kubes::Compiler::Decorator
       # Pretty tricky case. Given:
       #
       #     envFrom:
-      #     - secretRef:
-      #         name: demo-secret
-      #     - configMapRef:
-      #         name: demo-config-map
+      #     - secretRef:               <--- wrapper_key
+      #         name: demo-secret      <--- target_key is 'name' from wrapper_map[wrapper_key]
+      #     - configMapRef:            <--- wrapper_key
+      #         name: demo-config-map  <--- target_key is 'name' from wrapper_map[wrapper_key]
       #
       # Need to reset the stored hashable_field in the call stack.
       # Else the field.kind is cached and the md5 look is incorrect
@@ -52,19 +52,19 @@ module Kubes::Compiler::Decorator
     #
     #     1. envFrom example
     #     envFrom:
-    #     - secretRef:
-    #         name: demo-secret
+    #     - secretRef:          <--- wrapper_key
+    #         name: demo-secret <--- target_key is 'name' from wrapper_map[wrapper_key]
     #
     #     2. valueFrom example
     #     valueFrom:
-    #       secretKeyRef:
-    #         name: demo-secret
+    #       secretKeyRef:       <--- wrapper_key
+    #         name: demo-secret <--- target_key is 'name' from wrapper_map[wrapper_key]
     #         key: password
     #
     #     3. volumes example
     #     volumes:
-    #     - secret:
-    #         secretName: demo-secret
+    #     - secret:                   <--- wrapper_key
+    #         secretName: demo-secret <--- target_key is 'name' from wrapper_map[wrapper_key]
     #
     # This is useful to capture for the next level of the stack call
     #

data/lib/kubes/compiler/dsl/core/fields.rb

@@ -64,7 +64,7 @@ module Kubes::Compiler::Dsl::Core
         result = instance_variable_get(ivar)
         result = {} if mode == "reset" # allow user to override with mode: reset option
         result ||= {} # maintain value for layering
-        result.deeper_merge!(value)
+        Kubes.deep_merge!(result, value)
         instance_variable_set(ivar, result)
       end
     end

data/lib/kubes/compiler/dsl/syntax/resource.rb

@@ -18,7 +18,7 @@ module Kubes::Compiler::Dsl::Syntax
     # top-level of resource is quite common
     def default_result
       data = top.merge(default_top)
-      data.deeper_merge!(default_result_append)
+      Kubes.deep_merge!(data, default_result_append)
       data.deep_stringify_keys!
       HashSqueezer.squeeze(data)
     end
@@ -63,7 +63,7 @@ module Kubes::Compiler::Dsl::Syntax
 
     # For generic kind
     def field(name, data)
-      top.deeper_merge!(name => data)
+      Kubes.deep_merge!(top, {name => data})
     end
   end
 end

data/lib/kubes/compiler/layering.rb

@@ -6,29 +6,21 @@ class Kubes::Compiler
       ext = File.extname(@path)
       kind = File.basename(@path).sub(ext,'') # IE: deployment
       kind = kind.pluralize if @block_form
+      role = @path.split('/')[-2] # .kubes/resources/web/deployment.yaml
       layers = [
-        "all",
-        "all/#{Kubes.env}",
-        "#{kind}",
-        "#{kind}/#{Kubes.env}",
+        "base/all",
+        "base/all/#{Kubes.env}",
+        "base/#{kind}",
+        "base/#{kind}/#{Kubes.env}",
+        "#{role}/all",
       ]
       layers = add_exts(layers)
       layers.map! do |layer|
-        "#{Kubes.root}/.kubes/resources/base/#{layer}"
+        "#{Kubes.root}/.kubes/resources/#{layer}"
       end
       layers.select { |layer| File.exist?(layer) }
     end
 
-    def add_exts(layers)
-      layers.map do |layer|
-        [
-          "#{layer}.rb",
-          "#{layer}.yaml",
-          "#{layer}.yml",
-        ]
-      end.flatten
-    end
-
     def post_layers
       return [] if Kubes.kustomize?
 
@@ -45,5 +37,15 @@ class Kubes::Compiler
       end
       layers.select { |layer| File.exist?(layer) }
     end
+
+    def add_exts(*layers)
+      layers.flatten.map do |layer|
+        [
+          "#{layer}.rb",
+          "#{layer}.yaml",
+          "#{layer}.yml",
+        ]
+      end.flatten
+    end
   end
 end

data/lib/kubes/compiler/strategy/dispatcher.rb

@@ -4,8 +4,8 @@ class Kubes::Compiler::Strategy
       result = render(@path) # main
       results = [result].flatten # ensure array
       data = results.map! do |main|
-        hash = pre_layer.deeper_merge!(main) # need the ! or deep_merge returns original hash
-        hash.deeper_merge!(post_layer)
+        hash = Kubes.deep_merge!(pre_layer, main)
+        Kubes.deep_merge!(hash, post_layer)
       end
       Result.new(@save_file, data)
     end

data/lib/kubes/compiler.rb

@@ -57,7 +57,8 @@ module Kubes
         acc << IO.read(file)
       end
       content = full.join("\n")
-      path = "#{Kubes.root}/.kubes/output/full.yaml"
+      path = "#{Kubes.root}/.kubes/tmp/full.yaml" # write to tmp instead of output so it doesnt interfere with kubes get
+      FileUtils.mkdir_p(File.dirname(path))
       IO.write(path, content)
       logger.debug "Compiled  #{pretty(path)}"
     end

data/lib/kubes/config.rb

@@ -43,6 +43,9 @@ module Kubes
 
       config.suffix_hash = true # append suffix hash to ConfigMap and Secret
 
+      config.merger = ActiveSupport::OrderedOptions.new
+      config.merger.options = {overwrite_arrays: true}
+
       config
     end
 

data/lib/kubes/core.rb

@@ -34,5 +34,11 @@ module Kubes
       logger.error "ERROR: It doesnt look like this is a kubes project. Are you sure you are in a kubes project?".color(:red)
       ENV['TS_TEST'] ? raise : exit(1)
     end
+
+    # wrapper to ensure we use the same deeper_merge options everywhere
+    def deep_merge!(a, b)
+      a.deeper_merge!(b, config.merger.options)
+      a
+    end
   end
 end

data/lib/kubes/docker/args/default.rb

@@ -22,10 +22,6 @@ module Kubes::Docker::Args
 
 
   private
-    def common_args
-      %w[--recursive -f ]
-    end
-
     def resource_path
       [".kubes/output", @options[:role], resource].compact.join('/')
     end

data/lib/kubes/util/consider.rb

@@ -3,8 +3,8 @@ module Kubes::Util
     def consider?(path)
       File.file?(path) &&
       !path.include?('/resources/base') &&
-      !path.include?('/base.yaml') &&
-      !path.include?('/base.yml')
+      !path.include?('/base.') &&
+      !path.include?('/all.')
     end
   end
 end

data/lib/kubes/version.rb

@@ -1,3 +1,3 @@
 module Kubes
-  VERSION = "0.7.4"
+  VERSION = "0.7.8"
 end

data/lib/templates/yaml/.kubes/resources/base/deployment.yaml.tt

@@ -1,6 +1,3 @@
-metadata:
-  labels:
-    app: <%= app %>
 spec:
   selector:
     matchLabels:

data/lib/templates/yaml/.kubes/resources/shared/namespace.yaml.tt

@@ -2,5 +2,3 @@ apiVersion: v1
 kind: Namespace
 metadata:
   name: <%= namespace %>
-  labels:
-    app: <%= app %>

data/spec/fixtures/decorators/deployment/configMap/volumes-name-first.yaml

@@ -0,0 +1,14 @@
+---
+# apiVersion: apps/v1
+# kind: Deployment
+# spec:
+#   template:
+#     spec:
+# only including structure needed for spec
+volumes:
+- name: config-map-volume
+  configMap:
+    name: demo-config-map
+    items:
+    - key: k1
+      path: config-map.conf

data/spec/fixtures/decorators/deployment/configMap/volumes-name-second.yaml

@@ -0,0 +1,14 @@
+---
+# apiVersion: apps/v1
+# kind: Deployment
+# spec:
+#   template:
+#     spec:
+# only including structure needed for spec
+volumes:
+- configMap:
+    name: demo-config-map
+    items:
+    - key: k1
+      path: config-map.conf
+  name: config-map-volume

data/spec/fixtures/decorators/ingress/tls.yaml

@@ -0,0 +1,12 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: web
+spec:
+  tls:
+  - secretName: tls-secret
+  defaultBackend:
+    service:
+      name: web
+      port:
+        number: 80