kubes 0.7.5 → 0.7.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d1ec1d6ee1348fc20d3e56bca7f82275510eee4b6d7cc2d6830aa0ae21016a1
-  data.tar.gz: 2edc8e10565bbeba2551e8b1463ebe2ea122c8c089413bbc41283daefb9eeceb
+  metadata.gz: 8ee8de54a6c00bee7cbcfec249f26c5adc0beaabe0ab5d47d87d2a26fb673f71
+  data.tar.gz: 5c2330ca0688b565f0db169e3c3ce776e51d59fc26375c2ebeee429939a81425
 SHA512:
-  metadata.gz: 7d7ef397578596e7dc9c9225447073eb2d0dedd21b6429d6ee1febd1b5d45cebcea69171fd5d4ed1de1a45772824d919e9287a43306c0796e8d33c295eb250ce
-  data.tar.gz: a3fc1e2e6ba21cbb820ccf290acda1f353bc536be0a72c769467314057a25dd83a1de93bac2aee461b5c3cb70abf59cb60ce83c5250a2e48f28197a311b46d64
+  metadata.gz: 77ca91f3c0ce775bb69f9ab3630fac958625426ee719186a1fc966262d633d31eaccf98fc7052e90f1c62f38c3ac0a365238cb17c769429c9100020a7d9e99c0
+  data.tar.gz: 8b8a284692016d2487bdcb281d757511f2bb5bc2d8db4614de0b1a9ff1c97075d38bf4a9eefa757c005f8244548d5a6ba606163315838f0f6600ad338ef38643

data/CHANGELOG.md

@@ -3,6 +3,21 @@
 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.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
+
 ## [0.7.5] - 2021-06-03
 - [#47](https://github.com/boltops-tools/kubes/pull/47) add search
 - [#48](https://github.com/boltops-tools/kubes/pull/48) use deep_merge overwrite_arrays option fixes #45

data/README.md

@@ -8,7 +8,7 @@
 
 [![BoltOps Badge](https://img.boltops.com/boltops/badges/boltops-badge.png)](https://www.boltops.com)
 
-Kubernetes Deployment Tool: build docker image, compile Kubernetes YAML files, and apply them.
+Kubernetes App Deploy Tool: build docker image, compile Kubernetes YAML files, and apply them.
 
 Please **watch/star** this repo to help grow and support the project.
 
@@ -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/_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/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/how-kubes-works.md

@@ -20,6 +20,8 @@ The deploy command simpifily does all 3 steps: build, compile, and apply.
 
     kubes deploy
 
+Kubes is very transparent about it does.  It prints out the `kubectl` commands as they are being called.
+
 You can also run the `kubectl apply` only. The `kube apply` command compiles but will skip the docker build stage if it's already been built.
 
     kubes apply

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/helm.md

@@ -4,7 +4,7 @@ nav_text: Helm
 categories: vs
 ---
 
-Though both Kubes and Helm can be used to deploy applications to Kubernetes, they work quite differently.  Kubernetes is more focused on deploying your application. Helm is more like a package manager.
+Kubes and Helm are quite different.  Helm is a package manager tool. In contrast, Kubernetes is focused on deploying your application. While you can use package manager tools like Helm to deploy your application, application-focused deploy tools are better for the job. For example, apt-get and yum are also package manager tools. But few companies use `apt-get install` or `yum install` to deploy their application code. Instead, people usually use application-specific tools to deploy their web app.
 
 {% include vs/article.md %}
 
@@ -168,7 +168,7 @@ Helm supports a wide variety of hooks for the install, delete, upgrade, and roll
 
 Kubes also supports hook as the kubes-level; this is similar to the helm-level. Kubes also provide finer-grain control hooks at the kubectl-level.
 
-Overally, Helm and Kubes hooks work quite differently. We'll take a look at **some** examples:
+Overall, Helm and Kubes hooks work quite differently. We'll take a look at **some** examples:
 
 ### Helm Hook Example
 
@@ -240,4 +240,4 @@ Kubes supports the deployment workflow. It can build the docker image from your
 
 ## Summary
 
-Helm and Kubes are quite different. Helm is a full-fledge package management. Kubes is a more focused on deployment. Both tools support templating logic to help keep your code DRY. Additionally, Kubes supports layering to merge YAML files together for DRYness. Kubes also helps you build your Docker images.
+Helm and Kubes are quite different. Helm is a full-fledge package management tool. In contrast, Kubes is more focused on app deployment. Both tools support templating logic to help keep your code DRY. Additionally, Kubes supports layering to merge YAML files together for DRYness. Kubes also helps you build your Docker images.

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/reference.md

@@ -1,3 +1,3 @@
-Kubes is a Kubernetes deployment tool. It automates the deployment process. Kubes will:
+Kubes is a Kubernetes deployment tool. It focuses on deploying your specific application. It is very good at automating the deployment process. Kubes will:
 
 {% include kubes-steps.md %}

data/docs/_includes/sidebar.html

@@ -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/index.html

@@ -9,8 +9,8 @@ sidebar: false
       <div class="col-sm-8 col-sm-offset-2">
         <div class="header-content">
           <div class="header-content-inner">
-            <h1>Kubes: Kubernetes Deployment Tool</h1>
-            <h2>Kubes is a Kubernetes Deployment Tool. It builds the docker image, creates the Kubernetes YAML, and runs kubectl apply. It automates the deployment process and saves you precious finger-typing energy.</h2>
+            <h1>Kubes: Kubernetes App Deploy Tool</h1>
+            <h2>Kubes is a Kubernetes App Deployment Tool. It focuses on deploying your specific application. It builds the docker image, creates the Kubernetes YAML, and runs kubectl apply. It automates the deployment process and saves you precious finger-typing energy.</h2>
           </div>
         </div>
       </div>

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/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/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

@@ -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/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.5"
+  VERSION = "0.7.9"
 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

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.5
+  version: 0.7.9
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-03 00:00:00.000000000 Z
+date: 2021-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -336,7 +336,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
@@ -731,10 +732,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 +765,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 +796,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.5
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: 'Kubernetes Deployment Tool: build docker image, compile Kubernetes YAML
@@ -806,10 +811,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 +844,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