kubes 0.8.4 → 0.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f78e6b8aa9788c03dbc38391b936a5792353249c5d9e743d7ebf87fc52c74488
-  data.tar.gz: a77d273302faaf434f751f36305cfafc9e7e5e7491db010f1468088d4806f8b7
+  metadata.gz: a2acdb3453d1240b7be08aa022731c41ffa227a9a0ca5e5fdf28774f2a9be6c6
+  data.tar.gz: 418fcd60375f6379c14e32432c8b202562ae87477dd93480987ef02a43e1d7a8
 SHA512:
-  metadata.gz: 1241bd270d3212d96a04b5e1edbd1085efee439105fff63896ec2b06dc84520e02ffbe7fd0830db246979c201c279c63adfcd41332e809cfbc3997b205a0459b
-  data.tar.gz: 6382b7380c842621e54f388e7d66fcf981e407a3952928996148be0037d0321e14779ea79a016991c0b5d0b0c5c02dccfe9de3ef77a62295a62fe549fa2a335c
+  metadata.gz: 471c5ef845fc8b904cfb3299ec42a08e68a5fb801639af39e683d379e9de20f5b0c89394d73bae34dc6cc06d0292ec5fd4216f7660c76bea2ba785048c5e86bb
+  data.tar.gz: a41933ec8b9f216fffd3022856e36cdf9e0555bdb460562e61525a2829e34546f50cfb01fc8ebe058bf4e6aeba49b22d5b256881c21ae92b6e94891a16e0496b

data/CHANGELOG.md

@@ -3,6 +3,16 @@
 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.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
+
+## [0.8.5] - 2022-02-16
+- [#61](https://github.com/boltops-tools/kubes/pull/61) add erb support for config_map_files and generic_secret_data helpers
+
 ## [0.8.4] - 2022-02-16
 - bump kubes_aws and kubes_google dependencies
 

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/aws/secret_data.md

@@ -4,7 +4,7 @@ nav_text: Secrets Data
 categories: helpers-aws
 ---
 
-The `aws_secret_data` helper fetches secret data that is one single file from AWS Secrets.
+The `aws_secret_data` helper fetches secret data that is designed to be in one single file from AWS Secrets.
 
 ## Example
 

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

@@ -53,11 +53,12 @@ data:
 
 ## Layering Details
 
-Layering for Config Map Files and also supports app-scoped layers.
+Config Map Files also supports App-Scoped Layering.
 
 Name | Example
 --- | ---
 configmap root | .kubes/resources/shared/config_map/{base,dev}.txt
-configmap app-scoped | .kubes/resources/shared/config_map/app1/{base,dev}.txt
+configmap app file | .kubes/resources/shared/config_map/app1.txt
+configmap app folder | .kubes/resources/shared/config_map/app1/{base,dev}.txt
 
 So if `KUBES_APP=app1`, then the app-scoped layer is also used. This handles the [Central Deployer Pattern]({% link _docs/patterns/central-deployer.md %}).

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

@@ -4,7 +4,7 @@ nav_text: Secrets Data
 categories: helpers-google
 ---
 
-The `google_secret_data` helper fetches secret data that is one single file from Google Secrets.
+The `google_secret_data` helper fetches secret data that is designed to be in one single file from Google Secrets.
 
 ## 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/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/_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/helpers/config_map_helper.rb

@@ -10,6 +10,7 @@ module Kubes::Compiler::Shared::Helpers
       ]
       if Kubes.app
         layers += [
+          [shared_config_map, "#{Kubes.app}.txt"],
           [shared_config_map, Kubes.app, "base.txt"],
           [shared_config_map, Kubes.app, "#{Kubes.env}.txt"],
         ]
@@ -18,9 +19,10 @@ module Kubes::Compiler::Shared::Helpers
       data = {}
       layers.each do |path|
         next unless File.exist?(path)
-        lines = IO.readlines(path)
+        text = RenderMePretty.result(path, context: self)
+        lines = text.split("\n")
         lines.each do |line|
-          key, value = line.split('=').map(&:strip)
+          key, value = parse_env_like_line(line)
           data[key] = value
         end
       end

data/lib/kubes/compiler/shared/helpers/secret_helper.rb

@@ -6,17 +6,25 @@ module Kubes::Compiler::Shared::Helpers
       indent = options[:indent] || 2
       base64 = options[:base64].nil? ? true : options[:base64]
 
-      full_data = send(plugin_secret_method, name, base64: false)
+      text = send(plugin_secret_method, name, base64: false)
+      path = create_generic_secret_data_temp_file(text)
+      text = RenderMePretty.result(path, context: self)
       spacing = " " * indent
-      lines = full_data.split("\n")
+      lines = text.split("\n")
       new_lines = lines.map do |line|
-        key, value = line.split('=')
+        key, value = parse_env_like_line(line)
         value = encode64(value) if base64
         "#{spacing}#{key}: #{value}"
       end
       new_lines.join("\n")
     end
 
+    def parse_env_like_line(line)
+      key, *rest = line.split('=')
+      value = rest.join('=')
+      [key, value]
+    end
+
     def encode64(v)
       Base64.strict_encode64(v.to_s).strip
     end
@@ -25,5 +33,13 @@ module Kubes::Compiler::Shared::Helpers
     def decode64(v)
       Base64.strict_decode64(v)
     end
+
+  private
+    def create_generic_secret_data_temp_file(text)
+      path = "/tmp/kubes/text.erb"
+      FileUtils.mkdir_p(File.dirname(path))
+      IO.write(path, text)
+      path
+    end
   end
 end

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

@@ -1,3 +1,3 @@
 module Kubes
-  VERSION = "0.8.4"
+  VERSION = "0.8.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kubes
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.7
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-16 00:00:00.000000000 Z
+date: 2022-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -851,7 +851,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