kubes 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d309f1eb882767efd06378aa5bff9fbe8e162db4ebcd19b9ffec2637929d8b0
-  data.tar.gz: a60c4ae73920a38cda6780f435475922f318409e34aed8dec827df0b8483d6c5
+  metadata.gz: cb9cf7b5db064114c31e2af08890c009831a4b68baf556052e672a71cf08f562
+  data.tar.gz: 70bdcad829b4cee02f69b4cf36fbac8e41023445c407f484bc171e2a67d9bd99
 SHA512:
-  metadata.gz: 600df214d8b09d66bbea43b3114dc8dd3b41011025e76e2741ce2a076fa4af1ab8f07b68e54f1aeaaa72d166a1c9c2970c34f22f314b14b99384c00d8818aee4
-  data.tar.gz: 491bf32c8f78ce324aa500d57976345e28696d2fa483b6c8671d92c62191a3c84ffe11048b743251903c4b9b2ff1a0dc7c92b86211b9b909f8fcb5d813c79b7a
+  metadata.gz: '08dfce3916b92c0498915d0e7bf5d75608f111013eca67f5d9802f30250e0412c76afcd08f7ad2dd7d72ca413d13390a6d07b9d2c56b182fd0c04247ae1f9708'
+  data.tar.gz: dd255951bb8421f80d666492cd1e03ac363364abb441c4ded7db33562cd6450f6f2f397230c84c20a24f9b98d72e00cd3463cfde8c2ed1e93875dcd2aaa5ec58

data/CHANGELOG.md

@@ -3,6 +3,11 @@
 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.4.1]
+- kubes init: default namespace now includes Kubes.env
+- fix kubes deploy: compile it gets called once and output folder kept
+- include kubes_google dependency helpers
+
 ## [0.4.0]
 - #26 features: kubes vs kubectl hooks, prune, etc
 - hooks: kubes, kubectl, docker breaking changes.

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

@@ -58,7 +58,7 @@ Results in:
 
 ## exit_on_fail option
 
-By default, if the hook commands fail, then terraspace will exit with the original hook error code.  You can change this behavior with the `exit_on_fail` option.
+By default, if the hook commands fail, then kubes will exit with the original hook error code.  You can change this behavior with the `exit_on_fail` option.
 
 ```ruby
 before("build"

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

@@ -70,7 +70,7 @@ The `on` option is used to match the path the gets applied: .kubes/resources/**w
 
 ## exit on fail
 
-By default, if the hook commands fail, then terraspace will exit with the original hook error code.  You can change this behavior with the `exit_on_fail` option.
+By default, if the hook commands fail, then kubes will exit with the original hook error code.  You can change this behavior with the `exit_on_fail` option.
 
 ```ruby
 before("apply"

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

@@ -46,7 +46,7 @@ metadata:
 apiVersion: v1
 kind: Secret
 data:
-  foo: <%= ENV['SECRET_FOO']
+  foo: <%= ENV['SECRET_FOO'] %>
 ```
 
 ## Ruby Object

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

@@ -11,10 +11,12 @@ We'll create a namespace for the app resources:
 .kubes/resources/shared/namespace.rb
 
 ```ruby
-name "demo"
+name "demo-#{Kubes.env}"
 labels(app: "demo")
 ```
 
+Notice, the `#{Kubes.env}`. Kubes adds the env to the namespace by default. You can change this with the `init --namespace` option.
+
 ## Deployment
 
 The `web/deployment.rb` file is a little more interesting:
@@ -39,7 +41,7 @@ Also let's check the files in the base folder.
 .kubes/resources/base/all.rb
 
 ```ruby
-namespace "default"
+namespace "demo-#{Kubes.env}"
 labels(app: "demo")
 ```
 

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

@@ -14,11 +14,13 @@ We'll create a namespace for the app resources:
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: demo
+  name: demo-<%= Kubes.env %>
   labels:
     app: demo
 ```
 
+Notice, the `<%= Kubes.env %>`. Kubes adds the env to the namespace by default. You can change this with the `init --namespace` option.
+
 ## Deployment
 
 The `web/deployment.yaml` file is a little more interesting:
@@ -57,7 +59,7 @@ Also let's check the files in the base folder.
 
 ```yaml
 metadata:
-  namespace: demo
+  namespace: demo-<%= Kubes.env %>
 ```
 
 .kubes/resources/base/deployment.yaml

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

@@ -10,7 +10,7 @@ The command name corresponds to the `{{ include.command }}` commands: apply, del
 
 Name | Description
 ---|---
-label | A human-friendly label so you can see what hooks is being run during `kubes apply`
+label | A human-friendly label so you can see what hooks is being run.
 execute | The script or command to run. IE: path/to/some/script.sh
 exit_on_fail | Whether or not to continue process if the script returns an failed exit code.
 {% if include.command == "kubectl" %}on | What resource to run the hook on. IE: shared/namespace, web/deployment, web/service. Note: This option is only used by kubectl hooks.{% endif %}

data/kubes.gemspec

@@ -28,6 +28,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency "thor"
   spec.add_dependency "zeitwerk"
 
+  # core helper libs
+  spec.add_dependency "kubes_google"
+
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "cli_markdown"

data/lib/kubes.rb

@@ -14,6 +14,9 @@ require "memoist"
 require "rainbow/ext/string"
 require "yaml"
 
+# core helper libraries
+require "kubes_google"
+
 DslEvaluator.backtrace_reject = ".kubes"
 
 require "kubes/autoloader"

data/lib/kubes/cli/compile.rb

@@ -1,8 +1,16 @@
 class Kubes::CLI
   class Compile < Base
+    # Separate command like prune can call compile. Apply also calls Prune.
+    # Instead of moving Compile out of Prune, will use this class variable.
+    # In case we have other cases where compile is called in another area.
+    # We only want compiled to be called once so hooks only fire once.
+    # Done here so we don't clean and remove the .kubes/output folder.
+    @@compiled = false
     def run
+      return if @@compiled
       Clean.new(@options.merge(mute: true)).run
       Kubes::Compiler.new(@options).run
+      @@compiled = true
     end
   end
 end

data/lib/kubes/cli/init.rb

@@ -6,7 +6,7 @@ class Kubes::CLI
         [:force, type: :boolean, desc: "Bypass overwrite are you sure prompt for existing files"],
         [:type, aliases: ["t"], default: "yaml", desc: "Type: dsl or yaml"],
         [:repo, required: true, desc: "Docker repo name. Example: user/repo. Configures .kubes/config.rb"],
-        [:namespace, aliases: ["n"], desc: "Namespace to use, defaults to the app option"],
+        [:namespace, aliases: ["n"], desc: "Namespace to use, defaults to APP-ENV. IE: demo-dev"],
       ]
     end
 
@@ -19,7 +19,12 @@ class Kubes::CLI
     end
 
     def namespace
-      @options[:namespace] || @options[:app]
+      @options[:namespace] || default_namespace
+    end
+
+    def default_namespace
+      env = @options[:type] == "yaml" ? '<%= Kubes.env %>' : '#{Kubes.env}'
+      "#{app}-#{env}"
     end
 
     def excludes

data/lib/kubes/compiler.rb

@@ -8,13 +8,7 @@ module Kubes
       @options = options
     end
 
-    # Separate command like prune can call compile. Apply also calls Prune.
-    # Instead of moving Compile out of Prune, will use this class variable.
-    # In case we have other cases where compile is called in another area.
-    # We only want compiled to be called once so hooks only fire once.
-    @@compiled = false
     def run
-      return if @@compiled
       Kubes.config # trigger config load. So can set ENV['VAR'] in config/envs/dev.rb etc
       run_hooks("kubes.rb", name: "compile") do
         results = resources.map do |path|
@@ -28,7 +22,6 @@ module Kubes
       end
 
       puts "Compiled  .kubes/resources files to .kubes/output" if show_compiled_message?
-      @@compiled = true
     end
 
     def resources

data/lib/kubes/version.rb

@@ -1,3 +1,3 @@
 module Kubes
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/spec/fixtures/decorators/deployment/both/valueFrom.yaml

@@ -0,0 +1,33 @@
+---
+metadata:
+  namespace: default
+  labels:
+    app: demo
+    role: web
+  name: demo-web
+spec:
+  selector:
+    matchLabels:
+      app: demo
+      role: web
+  template:
+    metadata:
+      labels:
+        app: demo
+        role: web
+    spec:
+      containers:
+      - name: demo-web
+        image: gcr.io/project/demo-web:kubes-2020-06-23T00-07-54
+        env:
+        - name: MYSQL_ROOT_PASSWORD
+          valueFrom:
+            configMapKeyRef:
+              name: demo-config-map
+              key: password
+            secretKeyRef:
+              name: demo-secret
+              key: password
+  replicas: 1
+apiVersion: apps/v1
+kind: Deployment

data/spec/fixtures/decorators/deployment/both/volumes.yaml

@@ -0,0 +1,40 @@
+---
+metadata:
+  namespace: default
+  labels:
+    app: demo
+    role: web
+  name: demo-web
+spec:
+  selector:
+    matchLabels:
+      app: demo
+      role: web
+  template:
+    metadata:
+      labels:
+        app: demo
+        role: web
+    spec:
+      containers:
+      - name: demo-web
+        image: gcr.io/project/demo-web:kubes-2020-06-23T00-07-54
+        volumeMounts:
+        - mountPath: /config-map
+          name: config-map-volume
+      volumes:
+      - configMap:
+          name: demo-config-map
+          items:
+          - key: k1
+            path: config-map.conf
+        name: config-map-volume
+      - secret:
+          secretName: demo-secret
+          items:
+          - key: k1
+            path: secrets.conf
+        name: secrets-volume
+  replicas: 1
+apiVersion: apps/v1
+kind: Pod

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

@@ -5,6 +5,7 @@ describe Kubes::Compiler::Decorator::Post do
     YAML.load_file("spec/fixtures/decorators/deployment/#{name}.yaml")
   end
   before(:each) do
+    allow(Kubes::Compiler::Decorator::Hashable::Storage).to receive(:fetch).and_return("fakehash")
     allow(Kubes::Compiler::Decorator::Hashable::Storage).to receive(:fetch).with("Secret", "demo-secret").and_return("fakehash")
     allow(Kubes::Compiler::Decorator::Hashable::Storage).to receive(:fetch).with("ConfigMap", "demo-config-map").and_return("fakehash-config")
     allow(Kubes::Compiler::Decorator::Hashable::Storage).to receive(:fetch).with("ConfigMap", "demo-config-map-2").and_return("fakehash-config2")
@@ -107,5 +108,31 @@ describe Kubes::Compiler::Decorator::Post do
         expect(name).to eq("demo-config-map-2-fakehash-config2")
       end
     end
+
+    describe "valueFrom" do
+      let(:data) { fixture("both/valueFrom") }
+      it "run" do
+        decorator.run
+        data = decorator.data
+        valueFrom = data['spec']['template']['spec']['containers'][0]['env'][0]['valueFrom']
+        name = valueFrom['configMapKeyRef']['name']
+        expect(name).to eq("demo-config-map-fakehash-config")
+        name = valueFrom['secretKeyRef']['name']
+        expect(name).to eq("demo-secret-fakehash")
+      end
+    end
+
+    describe "volumes" do
+      let(:data) { fixture("both/volumes") }
+      it "run" do
+        decorator.run
+        data = decorator.data
+        volumes = data['spec']['template']['spec']['volumes']
+        name = volumes[0]['configMap']['name']
+        expect(name).to eq("demo-config-map-fakehash-config")
+        name = volumes[1]['secret']['secretName']
+        expect(name).to eq("demo-secret-fakehash")
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kubes
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-11 00:00:00.000000000 Z
+date: 2020-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: kubes_google
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -588,6 +602,8 @@ files:
 - spec/fixtures/artifacts/demo-web/service.yaml
 - spec/fixtures/blocks/deployments.rb
 - spec/fixtures/decorators/deployment/both/envFrom.yaml
+- spec/fixtures/decorators/deployment/both/valueFrom.yaml
+- 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.yaml
@@ -661,6 +677,8 @@ test_files:
 - spec/fixtures/artifacts/demo-web/service.yaml
 - spec/fixtures/blocks/deployments.rb
 - spec/fixtures/decorators/deployment/both/envFrom.yaml
+- spec/fixtures/decorators/deployment/both/valueFrom.yaml
+- 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.yaml