kubes 0.8.6 → 0.8.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f84754c7f4ac3bb6b4cf9265e9a1996790e16f1a0d559c84a2b12bfd389a08c8
-  data.tar.gz: 952b720a88afa528925d0fe4f910b211d7891d930903ae36e8e7e35b69eec003
+  metadata.gz: 1089172c4489c77f34abd1cc5df408e11467950f40ae67ee062377f078c131d1
+  data.tar.gz: 1c29e074651e78963aa1fbc83314e49b6da006c7902056c2ef108dd91302b8a7
 SHA512:
-  metadata.gz: c706ad8181772d2c7dbcee9de65d96548068de2840641786c58bc7fdfa1bbe6b1173dc8ec787ad42ef60d02bcce5f6ebc3f56d60549087c72d6f17a9a8cdbb34
-  data.tar.gz: 4282f36a11382932f19f355c1e9c9f286c191f9486f37de9328719f8ae8b3636f2266751f65c896fd31018396ddadc00803b6b064d83836c9023c751539575a3
+  metadata.gz: ac9080b9f30461b48d4d4fbf5e6a9ca6be2a53385a0cde1b649e6da26c265ddb7adb7f3c66714ad179ebac3f3ae3ebd9ea112bc5a0f5e65beab7d51d30f9574d
+  data.tar.gz: c6424d462ba9c7b834fcf1944fd75275ae6fa8b6abf7ea7b29fa9575fa6f5ae0853529ca10b32e1eeff11ac094e2ee920008c326936e2c1bd5e153cb8dc3f915

data/.github/FUNDING.yml

@@ -0,0 +1 @@
+github: boltops-tools

data/CHANGELOG.md

@@ -3,6 +3,18 @@
 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.8.9] - 2022-08-11
+- [#64](https://github.com/boltops-tools/kubes/pull/64) extra variable layering
+- add extra layering docs
+
+## [0.8.8] - 2022-08-11
+- add Kubes.extra method
+- update managed_certificate and ingress apiVersion
+
+## [0.8.7] - 2022-06-21
+- [#63](https://github.com/boltops-tools/kubes/pull/63) remove kubes meta from yaml
+- adjust app layer. keep old layer also for now though
+
 ## [0.8.6] - 2022-02-16
 - [#62](https://github.com/boltops-tools/kubes/pull/62) config map files: add Kubes.app txt layer
 

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

@@ -6,6 +6,13 @@ categories: hooks
 
 {% include config/hooks/generator.md type="docker" %}
 
+## Docker Hooks
+
+Hook | Description
+---|---
+build | When kubes builds Docker image.
+push | When kubes pushes the Docker image.
+
 Here are some examples of running custom hooks before and after the docker commands.
 
 ## Build Hooks

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

@@ -17,7 +17,7 @@ apply | When kubes runs all the `kubectl apply` commands.
 delete | When kubes runs all the `kubectl delete` commands.
 prune | When kubes prunes. IE: To clean old secrets.
 
-## Lifecycle At Kubes Level
+## Kubes Lifecyle Level
 
 These lifecycle points occur at a higher-level than the `kubectl` commands. Here's an example to help explain:
 

data/docs/_docs/helpers/builtin/config-map-files.md

@@ -53,7 +53,7 @@ data:
 
 ## Layering Details
 
-Layering for Config Map Files and also supports app-scoped layers.
+Config Map Files also supports App-Scoped Layering.
 
 Name | Example
 --- | ---

data/docs/_docs/intro/how-kubes-works.md

@@ -16,7 +16,7 @@ Now, use `kubectl` directly and apply them in the proper order:
     kubectl apply -f .kubes/output/web/service.yaml
     kubectl apply -f .kubes/output/web/deployment.yaml
 
-The deploy command simpifily does all 3 steps: build, compile, and apply.
+The deploy command simply does all 3 steps: build, compile, and apply.
 
     kubes deploy
 

data/docs/_docs/layering/extra.md

@@ -0,0 +1,16 @@
+---
+title: Extra Layering
+---
+
+Setting KUBES_EXTRA will process extra layers.
+
+## Variables
+
+Example
+
+    KUBES_EXTRA=2 kubes deploy
+
+Will process:
+
+    .kubes/variables/dev.rb
+    .kubes/variables/dev-2.rb

data/docs/_docs/layering.md

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

data/docs/_docs/learn/dsl/new-project.md

@@ -9,7 +9,7 @@ If you already a project with an existing Dockerfile, you can use that. If you d
 
 {% include learn/repos.md %}
 
-Let's generate a starter project:
+Let's initialize a starter kubes project. This is similar to a `git init`.
 
     $ kubes init --app demo --repo $REPO --type dsl
           create  .kubes/config.rb

data/docs/_docs/learn/yaml/new-project.md

@@ -9,7 +9,7 @@ If you already a project with an existing Dockerfile, you can use that. If you d
 
 {% include learn/repos.md %}
 
-Let's generate a starter project:
+Let's initialize a starter kubes project. This is similar to a `git init`.
 
     $ kubes init --app demo --repo $REPO
           create  Dockerfile

data/docs/_includes/intro/features.md

@@ -1,11 +1,11 @@
-* Automation: [Builds the Docker image]({% link _docs/config/docker.md %}) and updates the compiled YAML files
-* Syntactic Sugar: Use an [ERB/YAML]({% link _docs/yaml.md %}) or a [DSL]({% link _docs/dsl.md %}) to write your Kubernetes YAML files. You can use a mix of DSL and YAML definitions in the `.kubes/resources` folder.
-* Layering: Use the same Kubernetes YAML to build multiple environments like dev and prod with [layering]({% link _docs/layering.md %}).
-* Secrets: Use helpers like [aws_secret]({% link _docs/helpers/aws/secrets.md %}), [aws_ssm]({% link _docs/helpers/aws/ssm.md %}), and [google_secret]({% link _docs/helpers/google/secrets.md %}) to build Kubernetes secrets.yaml from secret providers designed for it.
-* Generators: Kubes ships with a few generators to help you get building with Kubernetes quickly. See: [Generator Docs]({% link _docs/generators.md %}).
-* CLI Customizations: You can customize the [cli args]({% link _docs/config/args/kubectl.md %}).
-* Hooks: You can also run [hooks]({% link _docs/config/hooks.md %}) before and after [kubes]({% link _docs/config/hooks/kubes.md %}) and [kubectl]({% link _docs/config/hooks/kubectl.md %}) commands.
-* Automated Suffix Hashes: Automatically appends a suffix hash to ConfigMap and Secret resources. More details in [ConfigMap]({% link _docs/dsl/resources/config_map.md %}) and [Secret]({% link _docs/dsl/resources/secret.md %}) docs.
-* Kustomize Support: If you're a kustomization user, you can use it with Kubes. More details in [Kustomize Support Docs]({% link _docs/misc/kustomize.md %}).
-* Auto Context Switching: Map dev to a specific kubectl context and prod to another kubectl context and Kubes can switch them automatically so you won't have to remember. More details in [Auto Context Docs]({% link _docs/misc/auto-context.md %}).
-* Ordering: Kubes run kubectl apply to create resources in the [correct order]({% link _docs/intro/ordering.md %}). For deleting, it kubes will run `kubectl delete` in the correct reverse order. The order is also [customizable]({% link _docs/intro/ordering/custom.md %}).
+* **Automation**: [Builds the Docker image]({% link _docs/config/docker.md %}) and updates the compiled YAML files
+* **Syntactic Sugar**: Use an [ERB/YAML]({% link _docs/yaml.md %}) or a [DSL]({% link _docs/dsl.md %}) to write your Kubernetes YAML files. You can use a mix of DSL and YAML definitions in the `.kubes/resources` folder.
+* **Layering**: Use the same Kubernetes YAML to build multiple environments like dev and prod with [layering]({% link _docs/layering.md %}).
+* **Secrets**: Use helpers like [aws_secret]({% link _docs/helpers/aws/secrets.md %}), [aws_ssm]({% link _docs/helpers/aws/ssm.md %}), and [google_secret]({% link _docs/helpers/google/secrets.md %}) to build Kubernetes secrets.yaml from secret providers designed for it.
+* **Generators**: Kubes ships with a few generators to help you get building with Kubernetes quickly. See: [Generator Docs]({% link _docs/generators.md %}).
+* **CLI Customizations**: You can customize the [cli args]({% link _docs/config/args/kubectl.md %}).
+* **Hooks**: You can also run [hooks]({% link _docs/config/hooks.md %}) before and after [kubes]({% link _docs/config/hooks/kubes.md %}) and [kubectl]({% link _docs/config/hooks/kubectl.md %}) commands.
+* **Automated Suffix Hashes**: Automatically appends a suffix hash to ConfigMap and Secret resources. More details in [ConfigMap]({% link _docs/dsl/resources/config_map.md %}) and [Secret]({% link _docs/dsl/resources/secret.md %}) docs.
+* **Kustomize Support**: If you're a kustomization user, you can use it with Kubes. More details in [Kustomize Support Docs]({% link _docs/misc/kustomize.md %}).
+* **Auto Context Switching**: Map dev to a specific kubectl context and prod to another kubectl context and Kubes can switch them automatically so you won't have to remember. More details in [Auto Context Docs]({% link _docs/misc/auto-context.md %}).
+* **Ordering**: Kubes run kubectl apply to create resources in the [correct order]({% link _docs/intro/ordering.md %}). For deleting, it kubes will run `kubectl delete` in the correct reverse order. The order is also [customizable]({% link _docs/intro/ordering/custom.md %}).

data/docs/_includes/learn/review.md

@@ -2,6 +2,8 @@
 
 The `config.rb` is where you can configure Kubes settings.
 
+.kubes/config.rb
+
 ```ruby
 Kubes.configure do |config|
   config.repo = "112233445566.dkr.ecr.us-west-2.amazonaws.com/demo" # may be gcr.io/project-123/demo
@@ -13,7 +15,7 @@ end
 
 This is where the `--repo` from `kubes init` got saved.  The other options are covered in the [Env Config Docs]({% link _docs/config/env.md %}).
 
-## Dockerfie
+## Dockerfile
 
 The `Dockerfile` is a simple starter example that just runs nginx
 

data/docs/_includes/sidebar.html

@@ -128,6 +128,7 @@
           <li><a href="{% link _docs/layering/mix.md %}">Mix</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>
+          <li><a href="{% link _docs/layering/extra.md %}">Extra Layering</a></li>
         </ul>
       </li>
       <li><a href="{% link _docs/dsl.md %}">DSL</a>

data/docs/_sass/theme.scss

@@ -411,6 +411,7 @@ ul.toc {
 .learn {
   img {
     max-width: 600px;
+    max-width: 100%;
   }
   .note {
     font-size: 0.9em;

data/lib/kubes/compiler/shared/runtime_helpers.rb

@@ -59,14 +59,18 @@ module Kubes::Compiler::Shared
       layers = [
         "base.rb",
         "#{Kubes.env}.rb",
+        "#{Kubes.env}-#{Kubes.extra}.rb",
         "base/all.rb",
         "base/all/#{Kubes.env}.rb",
+        "base/all/#{Kubes.env}-#{Kubes.extra}.rb",
         "base/#{kind}.rb",
         "base/#{kind}/base.rb",
         "base/#{kind}/#{Kubes.env}.rb",
+        "base/#{kind}/#{Kubes.env}-#{Kubes.extra}.rb",
         "#{role}/#{kind}.rb",
         "#{role}/#{kind}/base.rb",
         "#{role}/#{kind}/#{Kubes.env}.rb",
+        "#{role}/#{kind}/#{Kubes.env}-#{Kubes.extra}.rb",
       ]
       if Kubes.app
         app_layers = ["#{Kubes.app}.rb"]

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

@@ -22,6 +22,7 @@ class Kubes::Compiler::Strategy
 
     def content
       data = filter_skip(@data)
+      data.each { |item| item.delete('kubes') }
       return if data.empty?
       result = data.size == 1 ? data.first : data
       yaml_dump(result)

data/lib/kubes/config.rb

@@ -96,8 +96,12 @@ module Kubes
       evaluate_file(".kubes/config.rb")
       evaluate_file(".kubes/config/env/#{Kubes.env}.rb")
       if Kubes.app
+        # TODO: deprecate
         evaluate_file(".kubes/config/env/#{Kubes.app}.rb")
         evaluate_file(".kubes/config/env/#{Kubes.app}/#{Kubes.env}.rb")
+        # newer
+        evaluate_file(".kubes/config/app/#{Kubes.app}.rb")
+        evaluate_file(".kubes/config/app/#{Kubes.app}/#{Kubes.env}.rb")
       end
       Kubes::Plugin.plugins.each do |klass|
         # klass: IE: KubesAws, KubesGoogle

data/lib/kubes/core.rb

@@ -3,11 +3,15 @@ module Kubes
     extend Memoist
 
     def app
-      ENV['KUBES_APP']
+      ENV['KUBES_APP'] unless ENV['KUBES_APP'].blank?
     end
 
     def env
-      ENV['KUBES_ENV'] || "dev"
+      ENV['KUBES_ENV'].blank? ? "dev" : ENV['KUBES_ENV']
+    end
+
+    def extra
+      ENV['KUBES_EXTRA'] unless ENV['KUBES_EXTRA'].blank?
     end
 
     def root
@@ -36,7 +40,7 @@ module Kubes
     def check_project!
       return if File.exist?("#{Kubes.root}/.kubes/config.rb")
       logger.error "ERROR: It doesnt look like this is a kubes project. Are you sure you are in a kubes project?".color(:red)
-      ENV['TS_TEST'] ? raise : exit(1)
+      ENV['KUBES_TEST'] ? raise : exit(1)
     end
 
     # wrapper to ensure we use the same deeper_merge options everywhere

data/lib/kubes/version.rb

@@ -1,3 +1,3 @@
 module Kubes
-  VERSION = "0.8.6"
+  VERSION = "0.8.9"
 end

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

@@ -1,12 +1,10 @@
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: <%= role %>
 spec:
-  rules:
-  - http:
-      paths:
-      - path: "/*"
-        backend:
-          serviceName: <%= role %>
-          servicePort: 80
+  defaultBackend:
+    service:
+      name: web
+      port:
+        number: 80

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

@@ -1,7 +1,9 @@
-apiVersion: networking.gke.io/v1beta2
+# Docs: https://cloud.google.com/kubernetes-engine/docs/how-to/managed-certs#setting_up_a_google-managed_certificate
+# https://kubes.guru/docs/dsl/resources/managed_certificate/
+apiVersion: networking.gke.io/v1
 kind: ManagedCertificate
 metadata:
-  name: cert1
+  name: managed-cert
 spec:
   domains:
-  - cert1.example.com
+  - subdomain1.example.com

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kubes
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.8.9
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-16 00:00:00.000000000 Z
+date: 2022-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -258,6 +258,7 @@ extra_rdoc_files: []
 files:
 - ".dockerignore"
 - ".gcloudignore"
+- ".github/FUNDING.yml"
 - ".github/ISSUE_TEMPLATE.md"
 - ".github/ISSUE_TEMPLATE/bug_report.md"
 - ".github/ISSUE_TEMPLATE/documentation.md"
@@ -367,6 +368,7 @@ files:
 - docs/_docs/intro/structure.md
 - docs/_docs/layering.md
 - docs/_docs/layering/dsl.md
+- docs/_docs/layering/extra.md
 - docs/_docs/layering/merge-dsl.md
 - docs/_docs/layering/merge-options.md
 - docs/_docs/layering/mix.md
@@ -851,7 +853,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.12
 signing_key: 
 specification_version: 4
 summary: 'Kubernetes Deployment Tool: build docker image, compile Kubernetes YAML