kubes 0.7.6 → 0.7.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e73d57fba41a00e9ace349a4b3d9da7815e52a5025fcda97b64cfc185797ba35
-  data.tar.gz: a6114d33d48893ed2f748b0720aaf7dca8f71a75b4b3e3f4ae3f690680b35f26
+  metadata.gz: 6529d951f35f31cf105591f8d5ea0f3b8819e358f0b3388f22d17340af1f2bbf
+  data.tar.gz: d1c6e87a899a75a8f7078046c4058c69c46328c3b7138b4a934dae7fe287be4d
 SHA512:
-  metadata.gz: e28f97ff9b675adbce4066afbbde6fa4c853f2172e430659db25b8865409d5fb19aace0a464c809a95ddee6152e8f389cd9e43c6dc9696c9297fd2b8465c5c77
-  data.tar.gz: 42c6780d303119bb42d65075043bcaaf38fd1eec20a8b4448695a598ae22e7ab1b28f6d3920116c7cd9c76630be4d332871833f194383e1c05537ac3bab00a73
+  metadata.gz: 245ca41ceec0499da84ef056b19ad6f99e422f3c1013718d3e466128aeab6503fc1d0c3be19892633dab1acff1865816885fa6f7d1589c60d5ebe65cfaffab50
+  data.tar.gz: 551a265282d0a6af874517382859492bbe27bcd201790e94f3f7a9540d6ffeb4b6dc678b0aa1cfeab4e5983a0a591625da21ef7ec59bb01fe8c33fdbf681e8c2

data/CHANGELOG.md

@@ -3,6 +3,24 @@
 All notable changes to this project will be documented in this file.
 This project *loosely tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [0.7.10] - 2021-12-18
+- [#56](https://github.com/boltops-tools/kubes/pull/56) New hook generator
+- [#57](https://github.com/boltops-tools/kubes/pull/57) Fix activesupport require
+- add nokogiri dependency. looks like aws-sdk removed it and its breaking specs
+- hook generator docs
+- new hook generator
+
+## [0.7.9] - 2021-11-07
+- [#55](https://github.com/boltops-tools/kubes/pull/55) make helper methods available in variables files
+
+## [0.7.8] - 2021-10-29
+- [#54](https://github.com/boltops-tools/kubes/pull/54) fix configMap and secret hash when not first element in Array
+
+## [0.7.7] - 2021-10-21
+- [#51](https://github.com/boltops-tools/kubes/pull/51) add hash checksum for tls secretName
+- [#52](https://github.com/boltops-tools/kubes/pull/52) add role all layer to pre_layers
+- [#53](https://github.com/boltops-tools/kubes/pull/53) Merger options
+
 ## [0.7.6] - 2021-10-12
 - remove init yaml templates, removed duplication
 - write full.yaml to .kubes/tmp instead

data/README.md

@@ -17,8 +17,8 @@ Official Docs Site: [kubes.guru](https://kubes.guru)
 Kubes will:
 
 1. Build the docker image and push it to repo
-2. Compile Kubernetes YAML files from YAML/ERB or a DSL and adjusts the Docker build image
-3. Deploy via kubectl apply on the compiled Kubernetes YAML files
+2. Compile Kubernetes YAML files from YAML/ERB or a DSL with built Docker image
+3. Deploy via `kubectl apply` on the compiled Kubernetes YAML files
 
 ## Usage
 
@@ -42,7 +42,7 @@ Now, use `kubectl` directly in the proper order:
     kubectl apply -f .kubes/output/web/service.yaml
     kubectl apply -f .kubes/output/web/deployment.yaml
 
-You can also apply with kubes. This will compile the automatically files also.
+You can also apply with kubes. This will automatically compile the files also.
 
     kubes apply
 
@@ -50,7 +50,7 @@ The deploy command, does all 3 steps: builds the docker image, compiles the `.ku
 
     kubes deploy
 
-## Multiple Enviroments
+## Multiple Environments
 
 You can easily create multiple environments with the same YAML configs. Example:
 

data/docs/.gitignore

@@ -3,3 +3,4 @@ _site
 .jekyll-metadata
 .jekyll-cache
 Gemfile.lock
+_config-dev.yml

data/docs/Gemfile

@@ -7,6 +7,7 @@ gem "opal-browser"
 gem "opal-jquery"
 gem "rake"
 gem "rerun"
+gem "webrick"
 
 # GitHub pages does not support this plugin.
 # GitHub pages will not serve zipped assets even if we precompress them before hand.

data/docs/_config.yml

@@ -69,3 +69,5 @@ defaults:
 
 plugins_dir:
   # - jekyll-gzip - GitHub pages does not support this plugin.
+
+ads_url: "https://ads.boltops.com"

data/docs/_docs/config/hooks/docker.md

@@ -4,6 +4,8 @@ nav_text: Docker
 categories: hooks
 ---
 
+{% include config/hooks/generator.md type="docker" %}
+
 Here are some examples of running custom hooks before and after the docker commands.
 
 ## Build Hooks

data/docs/_docs/config/hooks/generator.md

@@ -0,0 +1,16 @@
+---
+title: Hook Generator
+nav_text: Generator
+categories: hooks
+order: 9
+---
+
+## Examples
+
+    $ kubes new hook docker
+          create  .kubes/config/hooks/docker.rb
+    $ kubes new hook kubectl
+          create  .kubes/config/hooks/kubectl.rb
+    $ kubes new hook kubes
+          create  .kubes/config/hooks/kubes.rb
+    $

data/docs/_docs/config/hooks/kubectl.md

@@ -4,6 +4,8 @@ nav_text: Kubectl
 categories: hooks
 ---
 
+{% include config/hooks/generator.md type="kubectl" %}
+
 You can use hooks to run scripts at any part of the `kubectl` commands. Here's an example of running a script before and after the `kubectl apply` command for the `web/deployment` resource.
 
 .kubes/config/hooks/kubectl.rb

data/docs/_docs/config/hooks/kubes.md

@@ -4,6 +4,8 @@ nav_text: Kubes
 categories: hooks
 ---
 
+{% include config/hooks/generator.md type="kubes" %}
+
 You can use hooks to run scripts at specific steps of the `kubes deploy` lifecycle.
 
 ## Lifecycle Hooks

data/docs/_docs/config/reference.md

@@ -20,3 +20,4 @@ repo_auto_auth | Whether or not to try to auth authorize docker repo registry if
 skip | List of resources to skip. Can also be set with the `KUBES_SKIP` env var. `KUBES_SKIP` should be a list of strings separated by spaces. It adds onto the `config.skip` option. | []
 state.path | Where to store the state file with the last build Docker image. | .kubes/state/KUBES_ENV/data.json
 suffix_hash | Whether or not to append suffix hash to ConfigMap and Secret | true
+merger.options | Merger options that control how Hashes are merged. More info: [Merger Options]({% link _docs/layering/merge-options.md %}) | `{overwrite_arrays: true}`

data/docs/_docs/dsl/resources.md

@@ -6,7 +6,7 @@ Here's a list of the resources supported by the Kubes DSL.
 
 {% assign docs = site.docs | where: "categories","dsl" %}
 {% for doc in docs -%}
-* [{{ doc.nav_text }}]({{ doc.url }})
+* [{{ doc.title }}]({{ doc.url }})
 {% endfor %}
 
 For resources, that are not supported, you can use the [Generic resource]({% link _docs/dsl/resources/generic.md %}) or use [YAML]({% link _docs/yaml.md %}) instead. You can use a mix of DSL and YAML definitions in the `.kubes/resources` folder.

data/docs/_docs/dsl.md

@@ -58,9 +58,9 @@ Notice how `port` and `targetPort` correspond to `spec.ports.port` and `spec.por
 
 In general:
 
-* The DSL methods behave as reader methods when no arguments are passed to it. IE: `name "demo-web"` sets the value.
-* The DSL methods behave as writer methods when arguments are passed to it. IE: `name` returns the value.
+* The DSL methods behave as reader methods when no arguments are passed to it. IE: `name` returns the value.
+* The DSL methods behave as writer methods when arguments are passed to it. IE: `name "demo-web"` sets the value.
 
 ## Merge Behavior
 
-Generally, the merge should behave as expected. For example, map or Hash fields are merged together from multiple layers. Strings are simply replaced. See more details at [Layering Merge Behavior]({% link _docs/layering/merge.md %})
+Generally, the merge should behave as expected. For example, map or Hash fields are merged together from multiple layers. Strings are simply replaced. See more details at [Layering Merge Behavior]({% link _docs/layering/merge-dsl.md %})

data/docs/_docs/helpers/aws/iam-role.md

@@ -16,6 +16,7 @@ iam_role = KubesAws::IamRole.new(
   namespace: "demo-#{Kubes.env}", # defaults to APP-ENV when not set. IE: demo-dev
   managed_policies: ["AmazonS3ReadOnlyAccess", "AmazonSSMReadOnlyAccess"], # defaults to empty when not set
   inline_policies: [:secrets_read_only], # See Secrets Read Only Inline Policy at the bottom
+  # cluster: "eks-cluster-name", # inferred with kubectl when not set
 )
 before("apply",
   label: "create iam role",

data/docs/_docs/helpers/google/gke.md

@@ -49,7 +49,7 @@ To build kubes as a Docker image entrypoint for [Google CloudBuild Custom Builde
 
 Be sure to set GOOGLE_PROJECT to your own project id.
 
-## Example Codebuild YAML
+## Example Cloudbuild YAML
 
 cloudbuild.yaml:
 

data/docs/_docs/intro/structure.md

@@ -34,10 +34,10 @@ Here's what a .kubes folder structure can look like this:
 
 Name | Description
 --- | ---
-base | The base folder is processed first and can be used to define common fields and resources. Learn more on the [Layering Docs]({% link _docs/layering.md %}).
 config | The config folder can be used to configure behavior of Kubes.  The [docker]({% link _docs/config/docker.md %}) config is used to customize the docker command. The [env]({% link _docs/config/env.md %}) config is used to override `config.rb` settings on a `KUBES_ENV` basis. The [kubectl]({% link _docs/config/kubectl.md %}) config is used to customize the kubectl command.
 config.rb | The main thing to configure here is the repo to push the docker image to.
 output | Where kubes builds and writes the Kubernetes YAML to.
 resources | Where you define your Kubernetes resources.
-shared | The shared folder is where you can put shared resources. This folder gets applied first. More info: [Ordering]({% link _docs/intro/ordering.md %}).
+resources/base | The base folder is processed first and can be used to define common fields and resources. Learn more on the [Layering Docs]({% link _docs/layering.md %}).
+resources/shared | The shared folder is where you can put shared resources. This folder gets applied first. More info: [Ordering]({% link _docs/intro/ordering.md %}).
 state | Temporary state info that stores the built Docker image name.

data/docs/_docs/layering/merge-options.md

@@ -0,0 +1,76 @@
+---
+title: Merge Options
+---
+
+Underneath the hood, Kubes uses the [danielsdeleo/deep_merge](https://github.com/danielsdeleo/deep_merge) library to merge layers together. You can control the merge behavior options with [config.merger.options]({% link _docs/config/reference.md %}).
+
+The default merge options is:
+
+    {overwrite_arrays: true}
+
+You can control the merge behavior by setting:
+
+.kubes/config.rb
+
+```ruby
+Kubes.configure do |config|
+  # ...
+  config.merger.options = {overwrite_arrays: false}
+end
+```
+
+See the [danielsdeleo/deep_merge](https://github.com/danielsdeleo/deep_merge) docs for the different options.
+
+## Example of overwrite_arrays false
+
+An example of where you might want to use `{overwrite_arrays: false}` is if you are using YAML and want a base sidecar container in all of your deployments.
+
+.kubes/resources/base/deployment.yaml
+
+```yaml
+spec:
+  template:
+    spec:
+      containers:
+      - name: sidecar
+        image: sidecar-image
+```
+
+.kubes/resources/web/deployment.yaml
+
+```yaml
+spec:
+  template:
+    metadata:
+      labels:
+        role: web
+    spec:
+      containers:
+      - name: web
+        image: <%= docker_image %>
+```
+
+Produces:
+
+```yaml
+# ...
+spec:
+  template:
+    metadata:
+      labels:
+        role: web
+    spec:
+      containers:
+      - name: sidecar
+        image: sidecar-image
+      - name: web
+        image: gcr.io/boltops-learn/demo:kubes-2021-10-21T18-06-48
+# ...
+```
+
+However, using this merge behavior will also add additional ports if you are assigning a `targetPort` in the DSL. See:
+
+* [DSL in service creates always default port 80 #45](https://github.com/boltops-tools/kubes/issues/45)
+* [use deep_merge overwrite_arrays option #48](https://github.com/boltops-tools/kubes/pull/48)
+
+Will welcome PRs for improvements.

data/docs/_docs/layering.md

@@ -7,4 +7,4 @@ Kubes supports layering files together so you can use the same Kubernetes files
 * [YAML Layering]({% link _docs/layering/yaml.md %})
 * [DSL Layering]({% link _docs/layering/dsl.md %})
 * [Mix Layering]({% link _docs/layering/mix.md %})
-* [Merge Behavior]({% link _docs/layering/merge.md %})
+* [Merge Behavior]({% link _docs/layering/merge-dsl.md %})

data/docs/_docs/vs/kustomize.md

@@ -135,7 +135,7 @@ You can even define your own custom helpers for even more control. See: [Helpers
 
 ## Kubes Features
 
-Kubes does a lot more than build YAML files. Here's a list of features:
+Kubes does a lot more than building YAML files. Here's a list of features:
 
 {% include intro/features.md %}
 

data/docs/_includes/banner/foot.html

@@ -0,0 +1,2 @@
+<div id="foot-banner" class="foot-banner">
+</div>

data/docs/_includes/banner/head.html

@@ -0,0 +1,5 @@
+{% assign buildtime = "now" | date: "%Y%m%d%H%M%S" %}
+<link rel="preload" href="{{ site.ads_url }}/ads/{{ site.time | date: '%s' }}.js" as="script" />
+<script data-cfasync="false" async src="{{ site.ads_url }}/ads/{{ site.time | date: '%s' }}.js"></script>
+
+<div id="head-banner" class="head-banner"></div>

data/docs/_includes/config/hooks/generator.md

@@ -0,0 +1,6 @@
+## Hook Generator
+
+To generator a starter hook:
+
+    $ kubes new hook {{ include.type }}
+          create  .kubes/config/hooks/{{ include.type }}.rb

data/docs/_includes/intro/install.md

@@ -16,4 +16,4 @@ Kubes calls docker. Kubes has been tested with docker 18.x-ce+. Generally, it sh
 
 ## gcloud
 
-If you are using the [gcloud builder](% link _docs/config/builder.md %), set up and configure the [gcloud cli](https://cloud.google.com/sdk/install).
+If you are using the [gcloud builder]({% link _docs/config/builder.md %}), set up and configure the [gcloud cli](https://cloud.google.com/sdk/install).

data/docs/_includes/layering/layers.md

@@ -11,6 +11,7 @@ Here's an example structure, so we can understand how layering works.
     ├── clock
     │   └── deployment.{{ include.ext }}
     └── web
+        ├── all.{{ include.ext }}
         ├── deployment
         │   ├── dev.{{ include.ext }}
         │   └── prod.{{ include.ext }}
@@ -34,16 +35,17 @@ Notes
 
 Here's a table showing the the full layering.
 
-Folder/Pattern     | Example
--------------------|--------------------------------------------
-base/all.{{ include.ext }}       | base/all.{{ include.ext }}
-base/all/ENV.{{ include.ext }}   | base/all/dev.{{ include.ext }}
-base/KIND.{{ include.ext }}      | base/deployment.{{ include.ext }}
-base/KIND/base.{{ include.ext }} | base/deployment/base.{{ include.ext }}
-base/KIND/ENV.{{ include.ext }}  | base/deployment/dev.{{ include.ext }}
-ROLE/KIND.{{ include.ext }}      | web/deployment.{{ include.ext }}
-ROLE/KIND/base.{{ include.ext }} | web/deployment/base.{{ include.ext }}
-ROLE/KIND/ENV.{{ include.ext }}  | web/deployment/dev.{{ include.ext }}
+Type | Folder/Pattern | Example
+---|---|---
+pre | base/all.{{ include.ext }}        | base/all.{{ include.ext }}
+pre | base/all/ENV.{{ include.ext }}    | base/all/dev.{{ include.ext }}
+pre | base/KIND.{{ include.ext }}       | base/deployment.{{ include.ext }}
+pre | base/KIND/base.{{ include.ext }}  | base/deployment/base.{{ include.ext }}
+pre | base/KIND/ENV.{{ include.ext }}   | base/deployment/dev.{{ include.ext }}
+pre | ROLE/all.{{ include.ext }}        | web/all.{{ include.ext }}
+main | ROLE/KIND.{{ include.ext }}      | web/deployment.{{ include.ext }}
+post | ROLE/KIND/base.{{ include.ext }} | web/deployment/base.{{ include.ext }}
+post | ROLE/KIND/ENV.{{ include.ext }}  | web/deployment/dev.{{ include.ext }}
 
 ## Real-World Uses
 

data/docs/_includes/learn/next-steps.md

@@ -4,3 +4,14 @@ You've seen how to get started with Kubes. From here, you can check out the Docs
 * [Layering]({% link _docs/layering.md %}): Use the same Kubernetes YAML to build multiple environments like dev and prod with [layering]({% link _docs/layering.md %}).
 * [CLI Customizations]({% link _docs/config.md %}): You can customize the [cli args]({% link _docs/config/kubectl.md %}). You can also run hooks before and after kubectl commands.
 * [Extra Env]({% link _docs/extra-env.md %}): Create additional envs with little effort.
+
+## Learn Videos
+
+Watch BoltOps Learn Kubes videos:
+
+* [BoltOps Learn Kubes Videos](https://learn.boltops.com/tagged/kubes)
+
+
+## Kubes Features
+
+{% include intro/features.md %}

data/docs/_includes/sidebar.html

@@ -72,7 +72,7 @@
           </li>
           <li><a href="{% link _docs/config/hooks.md %}">Hooks</a>
             <ul>
-            {% assign docs = site.docs | where: "categories","hooks" %}
+            {% assign docs = site.docs | where: "categories","hooks" | sort: "order" %}
             {% for doc in docs -%}
               <li><a href="{{ doc.url }}">{{ doc.nav_text }}</a></li>
             {% endfor %}
@@ -97,7 +97,8 @@
           <li><a href="{% link _docs/layering/yaml.md %}">YAML</a></li>
           <li><a href="{% link _docs/layering/dsl.md %}">DSL</a></li>
           <li><a href="{% link _docs/layering/mix.md %}">Mix</a></li>
-          <li><a href="{% link _docs/layering/merge.md %}">Merge Behavior</a></li>
+          <li><a href="{% link _docs/layering/merge-dsl.md %}">Merge DSL</a></li>
+          <li><a href="{% link _docs/layering/merge-options.md %}">Merge Options</a></li>
         </ul>
       </li>
       <li><a href="{% link _docs/dsl.md %}">DSL</a>

data/docs/_layouts/default.html

@@ -27,9 +27,11 @@
 </head>
 
 <body>
+  {% include banner/head.html %}
   {% include header.html %}
   {% include content.html %}
   {% include footer.html %}
+  {% include banner/foot.html %}
   {% include js.html %}
 </body>
 </html>

data/docs/_reference/kubes-new-hook.md

@@ -0,0 +1,30 @@
+---
+title: kubes new hook
+reference: true
+---
+
+## Usage
+
+    kubes new hook
+
+## Description
+
+Generates kubes hook file.
+
+## Examples
+
+    $ kubes new hook docker
+          create  .kubes/config/hooks/docker.rb
+    $ kubes new hook kubectl
+          create  .kubes/config/hooks/kubectl.rb
+    $ kubes new hook kubes
+          create  .kubes/config/hooks/kubes.rb
+    $
+
+
+## Options
+
+```
+y, [--force]  # Bypass overwrite are you sure prompt for existing files
+```
+

data/docs/_reference/kubes-new-variable.md

@@ -11,6 +11,13 @@ reference: true
 
 Generates kubes variable file.
 
+## Examples
+
+    $ kubes new variable
+          create  .kubes/variables/dev.rb
+    $ KUBES_ENV=prod kubes new variable
+          create  .kubes/variables/prod.rb
+
 
 ## Options
 

data/docs/_reference/kubes-new.md

@@ -14,6 +14,7 @@ Generates new resource.
 ## Subcommands
 
 * [kubes new helper]({% link _reference/kubes-new-helper.md %}) - Generates kubes helper file.
+* [kubes new hook]({% link _reference/kubes-new-hook.md %}) - Generates kubes hook file.
 * [kubes new resource]({% link _reference/kubes-new-resource.md %}) - Generates Kubes Kubernetes resource definition.
 * [kubes new variable]({% link _reference/kubes-new-variable.md %}) - Generates kubes variable file.
 

data/docs/bin/web

@@ -5,4 +5,4 @@
 #   bin/web -P 8888
 
 bundle exec jekyll clean
-exec bundle exec jekyll serve "$@"
+exec bundle exec jekyll serve --trace --config _config.yml,_config-dev.yml --port 4002 --host 0.0.0.0 "$@"

data/kubes.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "dsl_evaluator"
   spec.add_dependency "hash_squeezer"
   spec.add_dependency "memoist"
+  spec.add_dependency "nokogiri"
   spec.add_dependency "rainbow"
   spec.add_dependency "render_me_pretty"
   spec.add_dependency "thor"

data/lib/kubes/cli/help/new/hook.md

@@ -0,0 +1,9 @@
+## Examples
+
+    $ kubes new hook docker
+          create  .kubes/config/hooks/docker.rb
+    $ kubes new hook kubectl
+          create  .kubes/config/hooks/kubectl.rb
+    $ kubes new hook kubes
+          create  .kubes/config/hooks/kubes.rb
+    $

data/lib/kubes/cli/help/new/variable.md

@@ -0,0 +1,6 @@
+## Examples
+
+    $ kubes new variable
+          create  .kubes/variables/dev.rb
+    $ KUBES_ENV=prod kubes new variable
+          create  .kubes/variables/prod.rb

data/lib/kubes/cli/new/hook.rb

@@ -0,0 +1,18 @@
+class Kubes::CLI::New
+  class Hook < Kubes::CLI::Sequence
+    argument :type, default: "kubes", description: "IE: docker, kubectl, kubes" # description doesnt really show up
+
+    def self.options
+      [
+        [:force, aliases: ["y"], type: :boolean, desc: "Bypass overwrite are you sure prompt for existing files"],
+      ]
+    end
+    options.each { |args| class_option(*args) }
+
+  public
+    def create_hook
+      set_source("new/hooks")
+      template "#{type}.rb", ".kubes/config/hooks/#{type}.rb"
+    end
+  end
+end

data/lib/kubes/cli/new.rb

@@ -11,5 +11,9 @@ class Kubes::CLI
     long_desc Help.text("new/variable")
     Variable.options.each { |args| option(*args) }
     register(Variable, "variable", "variable", "Generates kubes variable file.")
+
+    long_desc Help.text("new/hook")
+    Hook.options.each { |args| option(*args) }
+    register(Hook, "hook", "hook", "Generates kubes hook file.")
   end
 end

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/hashable.rb

@@ -9,7 +9,7 @@ module Kubes::Compiler::Decorator
       name = @data.dig('metadata','name')
       return @data unless name
 
-      # puts "name #{name}" # TODO: scope Kind so Secret and ConfigMap can have the same name...
+      # scope Kind so Secret and ConfigMap can have same name
       md5 = md5(@data)
       @data['metadata']['name'] = "#{name}-#{md5}"
       Storage.store(@data['kind'], name, md5)

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/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/shared/runtime_helpers.rb

@@ -3,9 +3,9 @@ module Kubes::Compiler::Shared
     include Kubes::Compiler::Shared::Helpers
 
     def load_runtime_helpers
-      load_custom_variables # also load custom variables
       load_plugin_helpers
       load_custom_helpers
+      load_custom_variables # also load custom variables
     end
 
     @@custom_helpers_loaded = false

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

@@ -37,7 +37,7 @@ module Kubes
 
     # wrapper to ensure we use the same deeper_merge options everywhere
     def deep_merge!(a, b)
-      a.deeper_merge!(b, overwrite_arrays: true)
+      a.deeper_merge!(b, config.merger.options)
       a
     end
   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.6"
+  VERSION = "0.7.10"
 end

data/lib/kubes.rb

@@ -5,6 +5,7 @@ $:.unshift(File.expand_path("../", __FILE__))
 require "kubes/autoloader"
 Kubes::Autoloader.setup
 
+require "active_support"
 require "active_support/core_ext/class"
 require "active_support/core_ext/hash"
 require "active_support/core_ext/string"

data/lib/templates/new/hooks/docker.rb

@@ -0,0 +1,9 @@
+# Docs: https://kubes.guru/docs/config/hooks/docker/
+
+before("build",
+  execute: "echo 'docker build before hook'",
+)
+
+after("build",
+  execute: "echo 'docker build after hook'",
+)

data/lib/templates/new/hooks/kubectl.rb

@@ -0,0 +1,11 @@
+# Docs: https://kubes.guru/docs/config/hooks/kubectl/
+
+before("apply",
+  on: "web/deployment",
+  execute: "echo 'before apply hook test'",
+)
+
+after("delete",
+  on: "web/deployment",
+  execute: "echo 'after delete hook test'",
+)

data/lib/templates/new/hooks/kubes.rb

@@ -0,0 +1,9 @@
+# Docs: https://kubes.guru/docs/config/hooks/kubes/
+
+before("apply",
+  execute: "echo 'kubes before apply hook'",
+)
+
+after("apply",
+  execute: "echo 'kubes after apply hook'",
+)

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

@@ -2,7 +2,9 @@ spec:
   selector:
     matchLabels:
       app: <%= app %>
+      env: <%= Kubes.env %>
   template:
     metadata:
       labels:
         app: <%= app %>
+        env: <%= Kubes.env %>

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

data/spec/kubes/compiler/decorator/post/deployment_spec.rb

@@ -135,4 +135,29 @@ describe Kubes::Compiler::Decorator::Post do
       end
     end
   end
+
+  context "order" do
+    # spec to fix issue https://github.com/boltops-tools/kubes/issues/49
+    describe "name first" do
+      let(:data) { fixture("configMap/volumes-name-first") }
+      it "run" do
+        decorator.run
+        data = decorator.data
+        volumes = data['volumes']
+        name = volumes[0]['configMap']['name']
+        expect(name).to eq("demo-config-map-fakehash-config")
+      end
+    end
+
+    describe "name second" do
+      let(:data) { fixture("configMap/volumes-name-second") }
+      it "run" do
+        decorator.run
+        data = decorator.data
+        volumes = data['volumes']
+        name = volumes[0]['configMap']['name']
+        expect(name).to eq("demo-config-map-fakehash-config")
+      end
+    end
+  end
 end

data/spec/kubes/compiler/decorator/post/ingress_spec.rb

@@ -0,0 +1,22 @@
+describe Kubes::Compiler::Decorator::Post do
+  let(:decorator) { described_class.new(data) }
+
+  def fixture(name)
+    YAML.load_file("spec/fixtures/decorators/ingress/#{name}.yaml")
+  end
+  before(:each) do
+    allow(Kubes::Compiler::Decorator::Hashable::Storage).to receive(:fetch).and_return("fakehash")
+  end
+
+  context "ingress" do
+    describe "tls" do
+      let(:data) { fixture("tls") }
+      it "run" do
+        decorator.run
+        data = decorator.data
+        name = data['spec']['tls'][0]['secretName']
+        expect(name).to eq("tls-secret-fakehash")
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kubes
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.7.10
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-12 00:00:00.000000000 Z
+date: 2021-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -281,6 +295,7 @@ files:
 - docs/_docs/config/env.md
 - docs/_docs/config/hooks.md
 - docs/_docs/config/hooks/docker.md
+- docs/_docs/config/hooks/generator.md
 - docs/_docs/config/hooks/kubectl.md
 - docs/_docs/config/hooks/kubes.md
 - docs/_docs/config/hooks/ruby.md
@@ -336,7 +351,8 @@ files:
 - docs/_docs/intro/structure.md
 - docs/_docs/layering.md
 - docs/_docs/layering/dsl.md
-- docs/_docs/layering/merge.md
+- docs/_docs/layering/merge-dsl.md
+- docs/_docs/layering/merge-options.md
 - docs/_docs/layering/mix.md
 - docs/_docs/layering/yaml.md
 - docs/_docs/learn/dsl.md
@@ -385,7 +401,10 @@ files:
 - docs/_docs/yaml.md
 - docs/_docs/yaml/multiple-files.md
 - docs/_docs/yaml/multiple-resources.md
+- docs/_includes/banner/foot.html
+- docs/_includes/banner/head.html
 - docs/_includes/commands.html
+- docs/_includes/config/hooks/generator.md
 - docs/_includes/config/hooks/options.md
 - docs/_includes/content.html
 - docs/_includes/dsl/methods.md
@@ -434,6 +453,7 @@ files:
 - docs/_reference/kubes-logs.md
 - docs/_reference/kubes-new-help.md
 - docs/_reference/kubes-new-helper.md
+- docs/_reference/kubes-new-hook.md
 - docs/_reference/kubes-new-resource.md
 - docs/_reference/kubes-new-variable.md
 - docs/_reference/kubes-new.md
@@ -577,11 +597,14 @@ files:
 - lib/kubes/cli/help/deploy.md
 - lib/kubes/cli/help/exec.md
 - lib/kubes/cli/help/new/helper.md
+- lib/kubes/cli/help/new/hook.md
 - lib/kubes/cli/help/new/resource.md
+- lib/kubes/cli/help/new/variable.md
 - lib/kubes/cli/init.rb
 - lib/kubes/cli/logs.rb
 - lib/kubes/cli/new.rb
 - lib/kubes/cli/new/helper.rb
+- lib/kubes/cli/new/hook.rb
 - lib/kubes/cli/new/resource.rb
 - lib/kubes/cli/new/variable.rb
 - lib/kubes/cli/prune.rb
@@ -682,6 +705,9 @@ files:
 - lib/templates/dsl/.kubes/resources/web/deployment/prod.rb
 - lib/templates/dsl/.kubes/resources/web/service.rb
 - lib/templates/new/helper/file.rb
+- lib/templates/new/hooks/docker.rb
+- lib/templates/new/hooks/kubectl.rb
+- lib/templates/new/hooks/kubes.rb
 - lib/templates/new/resource/dsl/backend_config.rb
 - lib/templates/new/resource/dsl/config_map.rb
 - lib/templates/new/resource/dsl/daemon_set.rb
@@ -731,10 +757,13 @@ files:
 - spec/fixtures/decorators/deployment/both/volumes.yaml
 - spec/fixtures/decorators/deployment/configMap/envFrom.yaml
 - spec/fixtures/decorators/deployment/configMap/valueFrom.yaml
+- spec/fixtures/decorators/deployment/configMap/volumes-name-first.yaml
+- spec/fixtures/decorators/deployment/configMap/volumes-name-second.yaml
 - spec/fixtures/decorators/deployment/configMap/volumes.yaml
 - spec/fixtures/decorators/deployment/secret/envFrom.yaml
 - spec/fixtures/decorators/deployment/secret/valueFrom.yaml
 - spec/fixtures/decorators/deployment/secret/volumes.yaml
+- spec/fixtures/decorators/ingress/tls.yaml
 - spec/fixtures/decorators/pod/configMap/envFrom.yaml
 - spec/fixtures/decorators/pod/configMap/valueFrom.yaml
 - spec/fixtures/decorators/pod/configMap/volumes.yaml
@@ -761,6 +790,7 @@ files:
 - spec/fixtures/syntax/.kubes/resources/web/pod.rb
 - spec/kubes/cli/prune_spec.rb
 - spec/kubes/compiler/decorator/post/deployment_spec.rb
+- spec/kubes/compiler/decorator/post/ingress_spec.rb
 - spec/kubes/compiler/decorator/post/pod_spec.rb
 - spec/kubes/compiler/strategy/dispatcher_spec.rb
 - spec/kubes/compiler_spec.rb
@@ -791,7 +821,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: 'Kubernetes Deployment Tool: build docker image, compile Kubernetes YAML
@@ -806,10 +836,13 @@ test_files:
 - spec/fixtures/decorators/deployment/both/volumes.yaml
 - spec/fixtures/decorators/deployment/configMap/envFrom.yaml
 - spec/fixtures/decorators/deployment/configMap/valueFrom.yaml
+- spec/fixtures/decorators/deployment/configMap/volumes-name-first.yaml
+- spec/fixtures/decorators/deployment/configMap/volumes-name-second.yaml
 - spec/fixtures/decorators/deployment/configMap/volumes.yaml
 - spec/fixtures/decorators/deployment/secret/envFrom.yaml
 - spec/fixtures/decorators/deployment/secret/valueFrom.yaml
 - spec/fixtures/decorators/deployment/secret/volumes.yaml
+- spec/fixtures/decorators/ingress/tls.yaml
 - spec/fixtures/decorators/pod/configMap/envFrom.yaml
 - spec/fixtures/decorators/pod/configMap/valueFrom.yaml
 - spec/fixtures/decorators/pod/configMap/volumes.yaml
@@ -836,6 +869,7 @@ test_files:
 - spec/fixtures/syntax/.kubes/resources/web/pod.rb
 - spec/kubes/cli/prune_spec.rb
 - spec/kubes/compiler/decorator/post/deployment_spec.rb
+- spec/kubes/compiler/decorator/post/ingress_spec.rb
 - spec/kubes/compiler/decorator/post/pod_spec.rb
 - spec/kubes/compiler/strategy/dispatcher_spec.rb
 - spec/kubes/compiler_spec.rb