kubes 0.6.4 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce0d27f928a17e1013e97242990213cd4b375aee110dc14d3effc9aa8df2d490
-  data.tar.gz: 983312b9f64da2641ec8286dc76b9e7582dac9a575f77222ab4e9f9a145d26dd
+  metadata.gz: c708370f432e482b105a766bd174dd52f89c790256ea91063a8045af1d970f39
+  data.tar.gz: 3b4aef7f7450776cf35b9db54ff7d326a6444e948ab7cf81fac1a7659fca9649
 SHA512:
-  metadata.gz: 36dc2af17c87d9c58eca05f8f63848f57d95cccdfcd51894ddb467c7424c7eefade4aed9133c871f400f05997143d1f537aeb38c1d8288815ab05558f25ae31c
-  data.tar.gz: 3ed8687d0f1af629a7645a002536e7a187057ea2da504e52fb3227da933b4a0c98db8ad0f1170a2a720248cbe517f7206ad8941299467695772d5fca289c1160
+  metadata.gz: f157bfaa51b24e2f23327ab02075abdeb331564c28cdcbe0710eeefb8ba2cd7910ea2719e28e1cdedb3b5b2873be902734c27254089ba5e1bc4083e13d33a10f
+  data.tar.gz: 48594a55badaba62e2ef7cfe436bc32640a5723221278f7d42c307144a00c300ca9a9c07d1501bc9a10204ff629929272171d8a4fc1cfe878b91bc951f46ba96

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.0] - 2020-11-16
+- [#41](https://github.com/boltops-tools/kubes/pull/41) multiple resources yaml support
+
+## [0.6.8] - 2020-11-14
+- [#40](https://github.com/boltops-tools/kubes/pull/40) fix version check
+
+## [0.6.7] - 2020-11-12
+- dependencies version bump: kubes_google
+
+## [0.6.6] - 2020-11-12
+- dependencies version bump: kubes_aws and kubes_google
+
+## [0.6.5] - 2020-11-12
+- [#39](https://github.com/boltops-tools/kubes/pull/39) google secrets fetcher option
+
 ## [0.6.4] - 2020-11-11
 - [#38](https://github.com/boltops-tools/kubes/pull/38) fix auto auth for docker login to registry, docs for secret base64, update dependencies
 

data/docs/_docs/dsl/multiple-resources.md

@@ -1,5 +1,5 @@
 ---
-title: Multiple Resources
+title: DSL Multiple Resources
 ---
 
 Kubes encourages a structure with files that matches the resource kind. Example:
@@ -35,7 +35,7 @@ deployment-2.rb | Deployment
 service-1.rb | Service
 service-2.rb | Service
 
-Using multiple files is the general recommended approach.
+Using multiple files is the general recommended approach when using the DSL.
 
 ## Multiple Resources: Block Form
 
@@ -86,8 +86,9 @@ You can declare deployment, service, and other resource kinds multiple times.
 
 Layering works for both simple and block form. Just create a folder with the corresponding name.
 
-* The layering definitions with the simple form only merge with other simple form layers.
-* The layering definitions for block forms only merge with other block form layers.
+* The layering definitions for the prelayers are in singular form.
+* The layering definitions for the post layers are in a folder with plural form.
+* Resources in the main "middle" layer are the only ones that are allowed multiple resource definitions.
 
 Simple form layering:
 
@@ -105,8 +106,8 @@ Block form layering:
 
     .kubes/resources/
     ├── base
-    │   ├── alls.rb
-    │   └── deployments.rb
+    │   ├── all.rb
+    │   └── deployment.rb
     └── web
         ├── deployments
         │   ├── dev.rb

data/docs/_docs/helpers/aws/secrets.md

@@ -55,7 +55,7 @@ By default, the values are automatically base64 encoded. You can change the defa
 
 ```ruby
 KubesAws.configure do |config|
-  config.base64_secrets = false
+  config.secrets.base64 = false
 end
 ```
 

data/docs/_docs/helpers/google.md

@@ -4,7 +4,7 @@ title: Google Helpers
 
 List of Google helpers:
 
-{% assign docs = site.docs | where: "categories","helpers-aws" %}
+{% assign docs = site.docs | where: "categories","helpers-google" %}
 {% for doc in docs -%}
   * [{{ doc.nav_text }}]({{ doc.url }})
 {% endfor %}
@@ -14,4 +14,22 @@ List of Google helpers:
 * By default, `KubeGoogle.logger = Kubes.logger`. This means, you can set `logger.level = "debug"` in `.kubes/config.rb` to see more details.
 * The `gcloud` cli is used to create IAM roles. So `gcloud` is required.
 * Note: Would like to use the google sdk, but it wasn't obvious how to do so. PRs are welcomed.
-* The Google helpers are provided by the [boltops-tools/kubes_google](https://github.com/boltops-tools/kubes_google) library.
+* The Google helpers are provided by the [boltops-tools/kubes_google](https://github.com/boltops-tools/kubes_google) library.
+
+## Authentication
+
+Most of the Google helpers use the SDK to call the Google Cloud API. As such, it needs to be authenticated.  You can do this by setting the `GOOGLE_APPLICATION_CREDENTIALS` environment variable point to the path with a service account credentials file. IE:
+
+.bash_profile
+
+    export GOOGLE_APPLICATION_CREDENTIALS=~/.gcp/service-account.json
+
+If you would like to use a user IAM credentials instead of a service account. You can also run use [application-default login](https://cloud.google.com/sdk/gcloud/reference/auth/application-default/login). Example:
+
+    gcloud auth application-default login
+
+This generates an Application Default Credentials at `.config/gcloud/application_default_credentials.json`. Note, make sure that `GOOGLE_APPLICATION_CREDENTIALS` is not set or else the `application_default_credentials.json` will not be used.  Also, the google sdk prints a warning to use a service account instead. You can suppress that warning with this:
+
+.bash_profile
+
+    export GOOGLE_AUTH_SUPPRESS_CREDENTIALS_WARNINGS=1

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

@@ -10,7 +10,7 @@ GKE Private Clusters whitelist and only allow authorized IPs to communicate with
 
 ## Setup
 
-To enable the GKE IP whitelisting feature, it's a single line:
+To enable the GKE IP whitelisting feature, it's a few simple configurations:
 
 .kubes/config/env/dev.rb
 
@@ -19,14 +19,18 @@ KubesGoogle.configure do |config|
   config.gke.cluster_name = "dev-cluster"
   config.gke.google_region = ENV['GOOGLE_REGION']
   config.gke.google_project = ENV['GOOGLE_PROJECT']
-  config.gke.enable_get_credentials = true # enable hook to call: gcloud container clusters get-credentials
+  config.gke.enable_hooks   = KubesGoogle.cloudbuild?
+  config.gke.enable_get_credentials = KubesGoogle.cloudbuild? # enable hook to call: gcloud container clusters get-credentials
 end
 ```
 
-Note: The use of `KubesGoogle.configure` instead of `Kubes.configure` here.
-
 This enables `kubes apply` before and after hooks to add and remove the current machine IP.
 
+Notes:
+
+* Notice the use of `KubesGoogle.configure` instead of `Kubes.configure` here.
+* The `KubesGoogle.cloudbuild?` checks if kubes is running on a CloudBuild machine.  So hooks don't run locally on your machine.
+
 ## Options
 
 Here are the `config.gke` settings:
@@ -58,7 +62,7 @@ steps:
   - 'GOOGLE_PROJECT=$PROJECT_ID' # .kubes/config.rb: config.repo
   - 'KUBES_ENV=$_KUBES_ENV'
   - 'KUBES_EXTRA=$_KUBES_EXTRA'
-  - 'KUBES_REPO_AUTH=0'
+  - 'KUBES_REPO_AUTO_AUTH=0'
 
 substitutions:
   _KUBES_ENV: dev
@@ -67,7 +71,7 @@ options:
     substitution_option: 'ALLOW_LOOSE'
 ```
 
-Make sure to replace the substitutions with your own values. IE: _GCP_REGION, _GKE_CLUSTER, _KUBES_ENV, etc.
+Make sure to replace the substitutions with your own values. IE: _KUBES_ENV, etc.
 
 ## Google CloudBuild IAM Permissions
 

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

@@ -63,7 +63,7 @@ By default, the values are automatically base64 encoded. You can change the defa
 
 ```ruby
 KubesGoogle.configure do |config|
-  config.base64_secrets = true
+  config.secrets.base64 = false
 end
 ```
 
@@ -77,3 +77,19 @@ google_secret("demo-#{Kubes.env}-PASS", base64: false)
 ```
 
 {% include helpers/base64.md %}
+
+## Fetcher Strategy
+
+Some systems configured with a VPN seem to have issues with the Google secrets SDK. You may see an error:
+
+    Handshake failed with fatal error SSL_ERROR_SSL: error:100000f7:SSL routines:OPENSSL_internal:WRONG_VERSION_NUMBER.
+
+As a workaround to this error, you can use the `gcloud` instead of the default `sdk` fetcher strategy. To configure it:
+
+.kubes/config.rb
+
+```ruby
+KubesGoogle.configure do |config|
+  config.secrets.fetcher = "gcloud"
+end
+```

data/docs/_docs/plugins/aws.md

@@ -8,10 +8,14 @@ The AWS Kubes Plugin adds support helpers like `aws_secret`. You can configure i
 
 ```ruby
 KubesAws.configure do |config|
-  config.base64_secrets = false
+  config.secrets.base64 = false
 end
 ```
 
+## Options Reference Table
+
+Here's a table with the options:
+
 Name | Description | Default
 ---|---|---
-base64_secrets | Whether or not to automatically base64 encoded values returned by the `aws_secret` helper. | true
+secrets.base64 | Whether or not to automatically base64 encoded values returned by the `aws_secret` helper. | true

data/docs/_docs/plugins/google.md

@@ -8,11 +8,15 @@ The Google Kubes Plugin adds support helpers like `google_secret`. You can confi
 
 ```ruby
 KubesGoogle.configure do |config|
-  config.base64_secrets = true
+  config.secrets.base64 = true
 end
 ```
 
+## Options Reference Table
+
+Here's a table with the options:
+
 Name | Description | Default
 ---|---|---
-base64_secrets | Whether or not to automatically base64 encoded values returned by the `google_secret` helper. | true
+secrets.base64 | Whether or not to automatically base64 encoded values returned by the `google_secret` helper. | true
 {% include plugins/gke-config.md %}

data/docs/_docs/vs/custom.md

@@ -4,7 +4,7 @@ nav_text: Custom Solutions
 categories: vs
 ---
 
-Kubernetes provide a great platform to run and manage Docker containers. The `kubectl` command how you usually interact with a Kubernetes cluster.  It does its job well and is quite a powerful tool.
+Kubernetes provides a great platform to run and manage Docker containers. The `kubectl` command is usually how you interact with a Kubernetes cluster.  It does its job well and is quite a powerful tool.
 
 {% include vs/article.md %}
 
@@ -51,7 +51,7 @@ We've duplicated `service.yaml` and `deployment.yaml`, though. Instead, it'll be
 
 ## PreBuilt Docker Image
 
-Additionally, the Docker image is expected to be prebuilt. Because you must first build the Docker image, folks will usually write bash script that perform these additional steps and then glue things together.
+Additionally, the Docker image is expected to be prebuilt. Because you must first build the Docker image, folks will usually write bash script that performs these additional steps and then glue things together.
 
 ## Kubernetes Resources Galore
 
@@ -82,7 +82,7 @@ The same code is used to create different environments. Kubes achieves this with
 
 ## Hooks
 
-Kubes support a variety of hooks run scripts at any part of the `kubectl` commands. This allows you customize and add app-specific logic needed. Example:
+Kubes support a variety of hooks run scripts at any part of the `kubectl` commands. This allows you to customize and add app-specific logic needed. Example:
 
 .kubes/config/hooks/kubectl.rb
 

data/docs/_docs/yaml/multiple-files.md

@@ -0,0 +1,23 @@
+---
+title: YAML Multiple Resources with Multiple Files
+---
+
+You can also create multiple resources of same kind by appending a dash followed by anything. Example:
+
+    .kubes
+    └── resources
+        └── web
+            ├── deployment-1.yaml
+            ├── deployment-2.yaml
+            ├── service-1.yaml
+            └── service-2.yaml
+
+Only words before the dash are used to infer the resource kind.
+
+Filename | Resource Kind
+--- | ---
+deployment-1.yaml | Deployment
+deployment-2.yaml | Deployment
+service-1.yaml | Service
+service-2.yaml | Service
+

data/docs/_docs/yaml/multiple-resources.md

@@ -0,0 +1,90 @@
+---
+title: YAML Multiple Resources
+---
+
+Kubes encourages a structure with files that matches the resource kind. Example:
+
+    .kubes
+    └── resources
+        └── web
+            ├── deployment.yaml
+            └── service.yaml
+
+This structure is nicely organized and covers 80% of use cases. An astute user may point out that this struture assumes one resource of each kind.
+
+Next, we'll cover how to create multiple resource of the same kinds.
+
+## Multiple Resources in Same YAML
+
+You can simply define multiple resources in th same YAML file. Conventionally, you should name the resource files with plural names. An example helps explain:
+
+    .kubes
+    └── resources
+        └── deployments.yaml
+
+.kubes/resources/web/deployments.yaml
+
+```yaml
+- apiVersion: apps/v1
+  kind: Deployment
+  metadata:
+    name: web-1
+    labels:
+      role: web
+  spec:
+    selector:
+      matchLabels:
+        role: web
+    template:
+      metadata:
+        labels:
+          role: web
+      spec:
+        containers:
+        - name: web
+          image: <%= docker_image %>
+- apiVersion: apps/v1
+  kind: Deployment
+  metadata:
+    name: web-2
+    labels:
+      role: web
+  spec:
+    selector:
+      matchLabels:
+        role: web
+    template:
+      metadata:
+        labels:
+          role: web
+      spec:
+        containers:
+        - name: web
+          image: <%= docker_image %>
+```
+
+Notice that the YAML contains an Array of definitions now.
+
+## Layering
+
+Layering works just fine with multiple resource definitions. The layering is processed on each item of the Array.
+
+Notes:
+
+* The layering definitions for the pre layers must be in singular form.
+* The layering definitions for the post layers must be in a folder with plural form, but define a singlar resource override.
+* Resources in the main "middle" layer is the only one that allows for multiple resource definitions.
+
+Multiple resources layering structure.
+
+    .kubes/resources/
+    ├── base
+    │   ├── all.rb
+    │   └── deployment.rb  # SINGULAR
+    └── web
+        ├── deployments    # PLURAL
+        │   ├── dev.rb
+        │   └── prod.rb
+        └── deployments.rb # PLURAL
+
+The main difference is the pluralized filenames.

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

@@ -18,3 +18,4 @@ exit_on_fail | Whether or not to continue process if the script returns an faile
 ## Ruby Hooks
 
 Instead of using a script for the hook `execute` option, you can also use a Ruby object. This provides some more control over the current process. See: [Ruby Hooks]({% link _docs/config/hooks/ruby.md %})
+

data/docs/_includes/layering/layers.md

@@ -21,11 +21,14 @@ Here's an example structure, so we can understand how layering works.
 
 To explain the layering, here's the general processing order that Kubes takes.
 
-1. The `.kubes/resources/base` folder is treated as a base layer.  It gets processed as pre-layers by Kubes.
-2. Then Kubes will process your `.kubes/resources/ROLE` definitions.
-3. Lastly, Kubes processes any post-layers in the `.kubes/resources/ROLE/KIND` folders.
+1. **Pre Layers**: The `.kubes/resources/base` folder is treated as a base layer.  It gets processed as pre-layers by Kubes.
+2. **Main Layer**: Then Kubes will process your `.kubes/resources/ROLE` definitions.
+3. **Post Layers**: Lastly, Kubes processes any post-layers in the `.kubes/resources/ROLE/KIND` folders.
 
-Note, both YAML and DSL forms support layering. They can be mixed together.
+Notes
+
+* Both YAML and DSL forms support layering. They can be mixed together.
+* In the Main Layer you can define single or multiple resource definitions.
 
 ## Full Layering
 

data/docs/_includes/sidebar.html

@@ -86,7 +86,12 @@
         </ul>
       </li>
       <li><a href="{% link _docs/generators.md %}">Generators</a></li>
-      <li><a href="{% link _docs/yaml.md %}">YAML</a></li>
+      <li><a href="{% link _docs/yaml.md %}">YAML</a>
+        <ul>
+          <li><a href="{% link _docs/yaml/multiple-resources.md %}">Multiple Resources</a></li>
+          <li><a href="{% link _docs/yaml/multiple-files.md %}">Multiple Files</a></li>
+        </ul>
+      </li>
       <li><a href="{% link _docs/layering.md %}">Layering</a>
         <ul>
           <li><a href="{% link _docs/layering/yaml.md %}">YAML</a></li>

data/docs/_includes/variables/generator.md

@@ -9,4 +9,15 @@ To help you get started quickly, you can generate starter variable code.
 
 ```ruby
 @example = "dev-value"
-```
+```
+
+To create the prod variables, set `KUBES_ENV=prod`.
+
+    $ KUBES_ENV=prod kubes new variable
+          create  .kubes/variables/prod.rb
+
+.kubes/variables/prod.rb
+
+```ruby
+@example = "prod-value"
+```

data/kubes.gemspec

@@ -29,8 +29,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "zeitwerk"
 
   # core helper libs
-  spec.add_dependency "kubes_aws", "~> 0.3.0"
-  spec.add_dependency "kubes_google", "~> 0.3.2"
+  spec.add_dependency "kubes_aws", "~> 0.3.1"
+  spec.add_dependency "kubes_google", "~> 0.3.5"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "byebug"

data/lib/kubes/command.rb

@@ -57,7 +57,7 @@ module Kubes
       end
 
       def check_project!(command_name)
-        return if %w[-h help init new].include?(command_name)
+        return if %w[-h -v completion completion_script help init new version].include?(command_name)
         Kubes.check_project!
       end
 

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

@@ -18,7 +18,7 @@ module Kubes::Compiler::Dsl::Core
 
     def run
       evaluate_file(@path) # main resource definition
-      result if respond_to?(:result) # block form doesnt have result
+      result
     end
   end
 end

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

@@ -5,7 +5,11 @@ module Kubes::Compiler::Dsl::Core
       @results = {} # Hash key is the name of resource, using it so we can keep a map to handle layering
       @block_form = true # pluralizes the layer names
       super # handles layering and evaluating the main DSL file
-      self
+      result # Array
+    end
+
+    def result
+      @results.values # Array
     end
 
     def syntax_instance(meth, name)

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

@@ -0,0 +1,34 @@
+module Kubes::Compiler::Dsl::Syntax
+  class Endpoint < Resource
+    fields :subsets
+
+    # kubectl explain endpoints.subsets
+    fields :addresses,         # <[]Object>
+           :notReadyAddresses, # <[]Object>
+           :ports              # <[]Object>
+
+    def default_kind
+      return @kind_from_block if @kind_from_block
+      "Endpoints" # always plural
+    end
+
+    def default_apiVersion
+      "v1"
+    end
+
+    def default_top
+      top = super
+      top.merge(
+        subsets: subsets
+      )
+    end
+
+    def default_subsets
+      [{
+        addresses: addresses,
+        notReadyAddresses: notReadyAddresses,
+        ports: ports,
+      }]
+    end
+  end
+end

data/lib/kubes/compiler/layering.rb

@@ -5,14 +5,10 @@ class Kubes::Compiler
 
       ext = File.extname(@path)
       kind = File.basename(@path).sub(ext,'') # IE: deployment
-      all = "all"
-      if @block_form
-        kind = kind.pluralize
-        all = all.pluralize
-      end
+      kind = kind.pluralize if @block_form
       layers = [
-        "#{all}",
-        "#{all}/#{Kubes.env}",
+        "all",
+        "all/#{Kubes.env}",
         "#{kind}",
         "#{kind}/#{Kubes.env}",
       ]

data/lib/kubes/compiler/strategy.rb

@@ -6,23 +6,9 @@ class Kubes::Compiler
     end
 
     def compile
-      klass = strategy_class
-      return false unless klass
-
-      strategy = klass.new(@options.merge(path: @path)) # Dsl or Erb
-      result = strategy.run
+      result = Dispatcher.new(@options.merge(path: @path)).dispatch
       result.decorate!(:pre) # compile pre phase decoration
       result
     end
-
-    def strategy_class
-      ext = File.extname(@path).sub('.','').to_sym
-      map = {
-        rb: Dsl,
-        yaml: Erb,
-        yml: Erb,
-      }
-      map[ext]
-    end
   end
 end

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

@@ -9,62 +9,6 @@ class Kubes::Compiler::Strategy
       @options = options
       @path = options[:path]
       @save_file = save_file(@path)
-      @data = @options[:data] || {}
-    end
-
-    def run
-      render_files(pre_layers)
-      render(@path) # main resource definition
-      render_files(post_layers)
-
-      Result.new(@save_file, @data)
-    end
-
-    def render_files(paths)
-      paths.each do |path|
-        next unless File.exist?(path) # layers may not exist
-        render(path)
-      end
-    end
-
-    # render and merge
-    def render(path)
-      result = render_strategy(path)
-      if result.is_a?(Kubes::Compiler::Dsl::Core::Blocks)
-        result = result.results
-      end
-      @data.deeper_merge!(result)
-    end
-
-    # Delegate to Dsl or Erb strategy again and pass @data down to allow rendering of a mix of yaml and rb files.
-    def render_strategy(path)
-      if path.include?('.rb')
-        dsl_class.new(@options.merge(path: path, data: @data)).run
-      else
-        Erb.new(@options.merge(data: @data)).render_result(path)
-      end
-    end
-
-    # Must be defined here in case coming from Kubes::Compiler::Strategy::Erb#render_strategy
-    def dsl_class
-      if block_form?
-        Kubes::Compiler::Dsl::Core::Blocks
-      else
-        syntax_class
-      end
-    end
-
-    def syntax_class
-      klass_name = normalize_kind(@save_file) # IE: @save_file: web/service.yaml
-      "Kubes::Compiler::Dsl::Syntax::#{klass_name}".constantize
-    rescue NameError
-      logger.debug "Using default resource for: #{klass_name}"
-      Kubes::Compiler::Dsl::Syntax::Resource # default
-    end
-
-    def block_form?
-      type = extract_type(@save_file)
-      type.pluralize == type
     end
   end
 end

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

@@ -0,0 +1,59 @@
+class Kubes::Compiler::Strategy
+  class Dispatcher < Base
+    def dispatch
+      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)
+      end
+      Result.new(@save_file, data)
+    end
+
+    # Render via to Erb or one of the DSL syntax classes or Core/Blocks class
+    def render(path)
+      if path.include?('.rb')
+        klass = dsl_class(path) # IE: Kubes::Compiler::Dsl::Syntax::Deployment or Kubes::Compiler::Dsl::Core::Blocks
+        klass.new(@options.merge(path: path, data: @data)).run
+      else
+        Erb.new(@options.merge(data: @data)).render_result(path)
+      end
+    end
+
+    # Must be defined here in case coming from Kubes::Compiler::Strategy::Erb#render
+    def dsl_class(path)
+      if block_form?(path)
+        Kubes::Compiler::Dsl::Core::Blocks
+      else
+        syntax_class
+      end
+    end
+
+    def syntax_class
+      klass_name = normalize_kind(@save_file) # IE: @save_file: web/service.yaml
+      "Kubes::Compiler::Dsl::Syntax::#{klass_name}".constantize
+    rescue NameError
+      logger.debug "Using default resource for: #{klass_name}"
+      Kubes::Compiler::Dsl::Syntax::Resource # default
+    end
+
+    def block_form?(path)
+      type = extract_type(path)
+      type.pluralize == type
+    end
+
+    def pre_layer
+      merge_layers(pre_layers)
+    end
+
+    def post_layer
+      merge_layers(post_layers)
+    end
+
+    def merge_layers(layers)
+      layers.inject({}) do |hash, layer|
+        render(layer)
+      end
+    end
+  end
+end

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

@@ -20,13 +20,12 @@ class Kubes::Compiler::Strategy
     end
 
     def render_result(path)
-      if File.exist?(path)
-        yaml = RenderMePretty.result(path, context: self)
-        result = yaml_load(path, yaml)
-        result.is_a?(Hash) ? result : {} # in case of blank yaml doc a Boolean false is returned
-      else
-        {}
-      end
+      return unless File.exist?(path)
+
+      yaml = RenderMePretty.result(path, context: self)
+      result = yaml_load(path, yaml)
+      # in case of blank yaml doc a Boolean false is returned. else Hash or Array is returned
+      %w[Array Hash].include?(result.class.to_s) ? result : {}
     end
 
     def yaml_load(path, yaml)

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

@@ -14,11 +14,15 @@ class Kubes::Compiler::Strategy
     # decorate(:pre) or decorate(:post)
     def decorate!(phase)
       klass = "Kubes::Compiler::Decorator::#{phase.to_s.camelize}".constantize
-      @data = klass.new(@data).result
+      results = [@data].flatten
+      results.map! do |r|
+        klass.new(r).result
+      end
     end
 
     def content
-      yaml_dump(@data)
+      result = @data.size == 1 ? @data.first : @data
+      yaml_dump(result)
     end
   end
 end

data/lib/kubes/compiler/util/normalize.rb

@@ -1,12 +1,12 @@
 module Kubes::Compiler::Util
   module Normalize
     def normalize_kind(path)
-      info = path.sub(%r{.*/.kubes/resources/}, '')
-      extract_type(info).underscore.camelize # Deployment, Service, Ingress, ManagedCertificate, etc
+      extract_type(path).underscore.camelize # Deployment, Service, Ingress, ManagedCertificate, etc
     end
 
     # info: web/service.yaml
     def extract_type(info)
+      info = info.sub(%r{.*/.kubes/resources/}, '')
       _, kind = info.split('/')
       kind.sub('.yaml','').sub('.yml','').sub('.rb','').sub(/-.*/,'')
     end

data/lib/kubes/compiler/util/yaml_dump.rb

@@ -4,12 +4,15 @@ require "yaml"
 module Kubes::Compiler::Util
   module YamlDump
     def yaml_dump(data)
-      if data.key?("kind")  # single resource in YAML
+      case data
+      when Array
+        items = data.map do |i|
+          standardize_yaml(i)
+        end
+        items.map(&:to_yaml).join("")
+      else # single resource in YAML
         data = standardize_yaml(data)
         data.to_yaml
-      else
-        items = data.map { |k,v| standardize_yaml(v) }
-        items.map(&:to_yaml).join("")
       end
     end
 

data/lib/kubes/version.rb

@@ -1,3 +1,3 @@
 module Kubes
-  VERSION = "0.6.4"
+  VERSION = "0.7.0"
 end

data/lib/templates/new/resource/dsl/endpoint.rb

@@ -0,0 +1,3 @@
+name "<%= app %>"
+addresses(["1.1.1.1"])
+ports(["80"])

data/lib/templates/new/resource/yaml/endpoint.yaml

@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: Endpoints
+metadata:
+  name: <%= app %>
+subsets:
+  - addresses:
+      - ip: 192.0.2.42
+    ports:
+      - port: 9376

data/spec/kubes/compiler/strategy/{dsl_spec.rb → dispatcher_spec.rb}

@@ -1,12 +1,13 @@
-describe Kubes::Compiler::Strategy::Dsl do
-  let(:dsl) { described_class.new(options) }
-  let(:options) { {path: fixture(resource) } }
+describe Kubes::Compiler::Strategy::Dispatcher do
+  let(:dispatcher) { described_class.new(options) }
+  let(:options) { {path: path } }
+  let(:path) { fixture(resource) }
 
   context "standard" do
     let(:resource) { "project/.kubes/resources/web/deployment" }
     it "run" do
-      result = dsl.run
-      expect(dsl.dsl_class).to eq(Kubes::Compiler::Dsl::Syntax::Deployment)
+      result = dispatcher.dispatch
+      expect(dispatcher.dsl_class(path)).to eq(Kubes::Compiler::Dsl::Syntax::Deployment)
       data = YAML.load(result.content)
       expect(data['kind']).to eq "Deployment"
     end
@@ -15,8 +16,8 @@ describe Kubes::Compiler::Strategy::Dsl do
   context "blocks" do
     let(:resource) { "blocks/deployments" }
     it "run" do
-      result = dsl.run
-      expect(dsl.dsl_class).to eq(Kubes::Compiler::Dsl::Core::Blocks)
+      result = dispatcher.dispatch
+      expect(dispatcher.dsl_class(path)).to eq(Kubes::Compiler::Dsl::Core::Blocks)
       resource = result.content.split('---').last
       data = YAML.load(resource)
       expect(data['kind']).to eq "Deployment"
@@ -27,8 +28,8 @@ describe Kubes::Compiler::Strategy::Dsl do
   context "multiple files" do
     let(:resource) { "multiple-files/.kubes/resources/web/deployment-1" }
     it "run" do
-      result = dsl.run
-      expect(dsl.dsl_class).to eq(Kubes::Compiler::Dsl::Syntax::Deployment)
+      result = dispatcher.dispatch
+      expect(dispatcher.dsl_class(path)).to eq(Kubes::Compiler::Dsl::Syntax::Deployment)
       data = YAML.load(result.content)
       expect(data['kind']).to eq "Deployment"
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kubes
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.7.0
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-11 00:00:00.000000000 Z
+date: 2020-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -142,28 +142,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: kubes_google
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.5
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -377,6 +377,8 @@ files:
 - docs/_docs/vs/helm.md
 - docs/_docs/vs/kustomize.md
 - docs/_docs/yaml.md
+- docs/_docs/yaml/multiple-files.md
+- docs/_docs/yaml/multiple-resources.md
 - docs/_includes/commands.html
 - docs/_includes/config/hooks/options.md
 - docs/_includes/content.html
@@ -593,6 +595,7 @@ files:
 - lib/kubes/compiler/dsl/syntax/config_map.rb
 - lib/kubes/compiler/dsl/syntax/daemon_set.rb
 - lib/kubes/compiler/dsl/syntax/deployment.rb
+- lib/kubes/compiler/dsl/syntax/endpoint.rb
 - lib/kubes/compiler/dsl/syntax/ingress.rb
 - lib/kubes/compiler/dsl/syntax/job.rb
 - lib/kubes/compiler/dsl/syntax/managed_certificate.rb
@@ -613,7 +616,7 @@ files:
 - lib/kubes/compiler/shared/plugin_helpers.rb
 - lib/kubes/compiler/strategy.rb
 - lib/kubes/compiler/strategy/base.rb
-- lib/kubes/compiler/strategy/dsl.rb
+- lib/kubes/compiler/strategy/dispatcher.rb
 - lib/kubes/compiler/strategy/erb.rb
 - lib/kubes/compiler/strategy/erb/yaml_error.rb
 - lib/kubes/compiler/strategy/pass.rb
@@ -674,6 +677,7 @@ files:
 - lib/templates/new/resource/dsl/config_map.rb
 - lib/templates/new/resource/dsl/daemon_set.rb
 - lib/templates/new/resource/dsl/deployment.rb
+- lib/templates/new/resource/dsl/endpoint.rb
 - lib/templates/new/resource/dsl/ingress.rb
 - lib/templates/new/resource/dsl/job.rb
 - lib/templates/new/resource/dsl/managed_certificate.rb
@@ -689,6 +693,7 @@ files:
 - lib/templates/new/resource/yaml/config_map.yaml
 - lib/templates/new/resource/yaml/daemon_set.yaml
 - lib/templates/new/resource/yaml/deployment.yaml
+- lib/templates/new/resource/yaml/endpoint.yaml
 - lib/templates/new/resource/yaml/ingress.yaml
 - lib/templates/new/resource/yaml/job.yaml
 - lib/templates/new/resource/yaml/managed_certificate.yaml
@@ -748,7 +753,7 @@ files:
 - spec/kubes/cli/prune_spec.rb
 - spec/kubes/compiler/decorator/post/deployment_spec.rb
 - spec/kubes/compiler/decorator/post/pod_spec.rb
-- spec/kubes/compiler/strategy/dsl_spec.rb
+- spec/kubes/compiler/strategy/dispatcher_spec.rb
 - spec/kubes/compiler_spec.rb
 - spec/kubes/dsl/daemon_set.rb
 - spec/kubes/dsl/deployment_spec.rb
@@ -823,7 +828,7 @@ test_files:
 - spec/kubes/cli/prune_spec.rb
 - spec/kubes/compiler/decorator/post/deployment_spec.rb
 - spec/kubes/compiler/decorator/post/pod_spec.rb
-- spec/kubes/compiler/strategy/dsl_spec.rb
+- spec/kubes/compiler/strategy/dispatcher_spec.rb
 - spec/kubes/compiler_spec.rb
 - spec/kubes/dsl/daemon_set.rb
 - spec/kubes/dsl/deployment_spec.rb

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

@@ -1,4 +0,0 @@
-class Kubes::Compiler::Strategy
-  class Dsl < Base
-  end
-end