kubes 0.4.7 → 0.5.0

data/docs/_includes/commands.html

@@ -108,7 +108,7 @@ spec:
     spec:
       containers:
       - name: demo-web
-        image: <%= built_image %>
+        image: <%= docker_image %>
 {% endhighlight %}
               </div>
             </div>
@@ -121,7 +121,7 @@ namespace "default"
 labels(role: "web")
 
 replicas 2
-image built_image # IE: user/demo-web:kubes-2020-06-13T19-55-16-43afc6e
+image docker_image # IE: user/demo-web:kubes-2020-06-13T19-55-16-43afc6e
 {% endhighlight %}
               </div>
             </div>

data/docs/_includes/sidebar.html

@@ -42,6 +42,7 @@
             </ul>
           </li>
           <li><a href="{% link _docs/intro/install.md %}">Install</a></li>
+          <li><a href="{% link _docs/intro/docker-image.md %}">Docker Image</a></li>
         </ul>
       </li>
       <li><a href="{% link _docs/resources.md %}">Resources</a>
@@ -76,6 +77,7 @@
           <li><a href="{% link _docs/config/reference.md %}">Reference</a></li>
         </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/layering.md %}">Layering</a>
         <ul>

data/docs/_reference/kubes-delete.md

@@ -9,7 +9,7 @@ reference: true
 
 ## Description
 
-Delete Kubernetes resources within the app folder
+Delete Kubernetes resources in defined .kubes/resources
 
 
 ## Options

data/docs/_reference/kubes-exec.md

@@ -36,13 +36,29 @@ If you have have multiple containers in your pod. You can specify the specfic co
 
     kubes exec --name web
 
+## Default Exec Command
+
+The default exec command is `sh`.  Example:
+
+    $ kubes exec
+    => kubectl exec -n demo-dev -ti web-568645f665-62j8f -- sh
+    /app #
+
+You can override the default with `KUBES_DEFAULT_EXEC`.  Example:
+
+    $ export KUBES_DEFAULT_EXEC=bash
+    $ kubes exec
+    => kubectl exec -n demo-dev -ti web-568645f665-62j8f -- bash
+    /app #
+
 
 ## Options
 
 ```
     [--compile], [--no-compile]  # whether or not to compile the .kube/resources
                                  # Default: true
-n, [--name=NAME]                 # deployment name to use. IE: demo-web
+p, [--pod=POD]                   # pod to use. IE: web
+d, [--deployment=DEPLOYMENT]     # deployment name to use. IE: demo-web
 c, [--container=CONTAINER]       # Container name. If omitted, the first container in the pod will be chosen
     [--verbose], [--no-verbose]  
     [--noop], [--no-noop]        

data/docs/_reference/kubes-init.md

@@ -16,11 +16,11 @@ Init project
 
 ```
 a, --app=APP                     # Docker repo name. Example: web. Generates .kubes/APP/resources folder
-    [--force]                    # Bypass overwrite are you sure prompt for existing files
+y, [--force]                     # Bypass overwrite are you sure prompt for existing files
 t, [--type=TYPE]                 # Type: dsl or yaml
                                  # Default: yaml
     --repo=REPO                  # Docker repo name. Example: user/repo. Configures .kubes/config.rb
-n, [--namespace=NAMESPACE]       # Namespace to use, defaults to the app option
+n, [--namespace=NAMESPACE]       # Namespace to use, defaults to APP-ENV. IE: demo-dev
     [--verbose], [--no-verbose]  
     [--noop], [--no-noop]        
 ```

data/docs/_reference/kubes-logs.md

@@ -17,7 +17,8 @@ logs from all deployment pods
 ```
     [--compile], [--no-compile]  # whether or not to compile the .kube/resources
                                  # Default: true
-n, [--name=NAME]                 # deployment name to use. IE: demo-web
+p, [--pod=POD]                   # pod to use. IE: web
+d, [--deployment=DEPLOYMENT]     # deployment name to use. IE: demo-web
 c, [--container=CONTAINER]       # Container name. If omitted, the first container in the pod will be chosen
 f, [--follow], [--no-follow]     # Follow logs
                                  # Default: true

data/docs/_reference/kubes-new.md

@@ -0,0 +1,58 @@
+---
+title: kubes new
+reference: true
+---
+
+## Usage
+
+    kubes new
+
+## Description
+
+Generates new resource.
+
+## Examples
+
+    $ kubes new ingress
+          create  .kubes/resources/web/ingress.yaml
+    $ kubes new service_account
+          create  .kubes/resources/shared/service_account.yaml
+    $
+
+## Supported Resources
+
+Here's a list of some of the supported resources.
+
+    backend_config
+    config_map
+    daemon_set
+    deployment
+    ingress
+    job
+    managed_certificate
+    namespace
+    network_policy
+    pod
+    role_binding
+    role
+    secret
+    service_account
+    service
+
+Refer to the source code to all the resources that the generator supports:
+https://github.com/boltops-tools/kubes/blob/master/lib/templates/new/yaml
+
+
+## Options
+
+```
+a, [--app=APP]                   # App name
+                                 # Default: demo
+y, [--force]                     # Bypass overwrite are you sure prompt for existing files
+r, [--role=ROLE]                 # Role. IE: web, clock, worker, migrate, etc. Defaults to convention: web or shared when not set
+t, [--type=TYPE]                 # Type: dsl or yaml
+                                 # Default: yaml
+    [--verbose], [--no-verbose]  
+    [--noop], [--no-noop]        
+```
+

data/docs/_reference/kubes-prune.md

@@ -0,0 +1,22 @@
+---
+title: kubes prune
+reference: true
+---
+
+## Usage
+
+    kubes prune
+
+## Description
+
+Prune old resources like secret and config maps
+
+
+## Options
+
+```
+y, [--yes], [--no-yes]           # Skip are you sure prompt
+    [--verbose], [--no-verbose]  
+    [--noop], [--no-noop]        
+```
+

data/docs/reference.md

@@ -16,4 +16,6 @@ title: CLI Reference
 * [kubes get]({% link _reference/kubes-get.md %})
 * [kubes init]({% link _reference/kubes-init.md %})
 * [kubes logs]({% link _reference/kubes-logs.md %})
+* [kubes new]({% link _reference/kubes-new.md %})
+* [kubes prune]({% link _reference/kubes-prune.md %})
 * [kubes version]({% link _reference/kubes-version.md %})

data/lib/kubes.rb

@@ -25,5 +25,6 @@ Kubes::Autoloader.setup
 
 module Kubes
   class Error < StandardError; end
+  class MissingDockerImage < Error; end
   extend Core
 end

data/lib/kubes/cli.rb

@@ -26,6 +26,14 @@ module Kubes
     long_desc Help.text(:docker)
     subcommand "docker", Docker
 
+    desc "docker SUBCOMMAND", "Docker subcommands"
+    long_desc Help.text(:docker)
+    subcommand "docker", Docker
+
+    long_desc Help.text("new")
+    New.options.each { |args| option(*args) }
+    register(New, "new", "new", "Generates new resource.")
+
     desc "apply [ROLE] [RESOURCE]", "Apply the Kubernetes YAML files without building docker image"
     long_desc Help.text(:apply)
     image_option.call
@@ -48,7 +56,7 @@ module Kubes
       Compile.new(options).run
     end
 
-    desc "delete [ROLE] [RESOURCE]", "Delete Kubernetes resources within the app folder"
+    desc "delete [ROLE] [RESOURCE]", "Delete Kubernetes resources in defined .kubes/resources"
     long_desc Help.text(:delete)
     image_option.call
     yes_option.call

data/lib/kubes/cli/build.rb

@@ -1,8 +1,14 @@
 class Kubes::CLI
   class Build < Base
     def run
+      return unless build?
       Kubes::Docker.new(@options, "build").run
       Kubes::Docker.new(@options, "push").run
     end
+
+    def build?
+      return false if @options[:build] == false || @options[:image] || Kubes.config.image
+      @options[:resource].nil? || @options[:resource] == "deployment"
+    end
   end
 end

data/lib/kubes/cli/compile.rb

@@ -8,9 +8,16 @@ class Kubes::CLI
     @@compiled = false
     def run
       return if @@compiled
+      build_docker_image
       Clean.new(@options.merge(mute: true)).run
       Kubes::Compiler.new(@options).run
       @@compiled = true
     end
+
+    # auto build docker image and push image if kubes docker build not yet called
+    def build_docker_image
+      return if File.exist?("#{Kubes.root}/.kubes/state/docker_image.txt")
+      Build.new(@options).run
+    end
   end
 end

data/lib/kubes/cli/deploy.rb

@@ -1,13 +1,8 @@
 class Kubes::CLI
   class Deploy < Base
     def run
-      Build.new(@options).run if build?
+      Build.new(@options).run
       Apply.new(@options).run # also calls Compile
     end
-
-    def build?
-      return false if @options[:build] == false || @options[:image]
-      @options[:resource].nil? || @options[:resource] == "deployment"
-    end
   end
 end

data/lib/kubes/cli/exec.rb

@@ -20,10 +20,14 @@ class Kubes::CLI
       end
 
       container = " -c #{@options[:container]}" unless @options[:container].nil?
-      cmd = @options[:cmd].empty? ? "bash" : @options[:cmd].join(' ')
+      cmd = @options[:cmd].empty? ? default_exec : @options[:cmd].join(' ')
       sh("kubectl exec #{ns} -ti #{pod}#{container} -- #{cmd}")
     end
 
+    def default_exec
+      ENV['KUBES_DEFAULT_EXEC'] || "sh"
+    end
+
     def find_pod
       pod_name || deployment_pod
     end

data/lib/kubes/cli/help/exec.md

@@ -22,3 +22,18 @@ If you have have multiple deployments in your `.kubes/resources` then the comman
 If you have have multiple containers in your pod. You can specify the specfic container with the `--container` or `-c` option.  Examples:
 
     kubes exec --name web
+
+## Default Exec Command
+
+The default exec command is `sh`.  Example:
+
+    $ kubes exec
+    => kubectl exec -n demo-dev -ti web-568645f665-62j8f -- sh
+    /app #
+
+You can override the default with `KUBES_DEFAULT_EXEC`.  Example:
+
+    $ export KUBES_DEFAULT_EXEC=bash
+    $ kubes exec
+    => kubectl exec -n demo-dev -ti web-568645f665-62j8f -- bash
+    /app #

data/lib/kubes/cli/help/new.md

@@ -0,0 +1,30 @@
+## Examples
+
+    $ kubes new ingress
+          create  .kubes/resources/web/ingress.yaml
+    $ kubes new service_account
+          create  .kubes/resources/shared/service_account.yaml
+    $
+
+## Supported Resources
+
+Here's a list of some of the supported resources.
+
+    backend_config
+    config_map
+    daemon_set
+    deployment
+    ingress
+    job
+    managed_certificate
+    namespace
+    network_policy
+    pod
+    role_binding
+    role
+    secret
+    service_account
+    service
+
+Refer to the source code to all the resources that the generator supports:
+https://github.com/boltops-tools/kubes/blob/master/lib/templates/new/yaml

data/lib/kubes/cli/init.rb

@@ -3,7 +3,7 @@ class Kubes::CLI
     def self.options
       [
         [:app, aliases: ["a"], required: true, desc: "Docker repo name. Example: web. Generates .kubes/APP/resources folder"],
-        [:force, type: :boolean, desc: "Bypass overwrite are you sure prompt for existing files"],
+        [:force, aliases: ["y"], 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 APP-ENV. IE: demo-dev"],

data/lib/kubes/cli/new.rb

@@ -0,0 +1,97 @@
+class Kubes::CLI
+  class New < Sequence
+    argument :kind
+
+    def self.options
+      [
+        [:app, aliases: ["a"], default: "demo", desc: "App name"],
+        [:force, aliases: ["y"], type: :boolean, desc: "Bypass overwrite are you sure prompt for existing files"],
+        [:role, aliases: ["r"], desc: "Role. IE: web, clock, worker, migrate, etc. Defaults to convention: web or shared when not set"],
+        [:type, aliases: ["t"], default: "yaml", desc: "Type: dsl or yaml"],
+      ]
+    end
+    options.each { |args| class_option(*args) }
+
+  private
+    def app
+      options[:app]
+    end
+
+    def role
+      role = options[:role]
+      return role if role
+      shared = %w[
+        config_map
+        namespace
+        network_policy
+        persistent_volume
+        persistent_volume_claim
+        secret
+        service_account
+      ]
+      if shared.include?(full_kind)
+        "shared"
+      elsif full_kind == "job"
+        "migrate"
+      else
+        "web"
+      end
+    end
+
+    def full_kind
+      # shorthands
+      map = {
+        cj:     "cron_job",
+        cm:     "config_map",
+        crd:    "custom_resource_definition",
+        crds:   "custom_resource_definition",
+        cs:     "component_statuses",
+        csr:    "certificate_signing_request",
+        deploy: "deployment",
+        ds:     "daemonset",
+        ep:     "endpoints",
+        ev:     "event",
+        hpa:    "horizontal_pod_autoscaler",
+        ing:    "ingress",
+        limits: "limit_range",
+        netpol: "network_policy",
+        no:     "node",
+        ns:     "namespace",
+        pc:     "priority_class",
+        pdb:    "pod_disruption_budget",
+        po:     "pod",
+        psp:    "pods_ecurity_policy",
+        pv:     "persistent_volume",
+        pvc:    "persistent_volume_claim",
+        quota:  "resource_quota",
+        rc:     "replication_controller",
+        rs:     "replica_set",
+        sa:     "service_account",
+        sc:     "storage_classes",
+        sgp:    "security_group_policy",
+        sts:    "stateful_set",
+        svc:    "service",
+      }.stringify_keys!
+      map[kind] || kind
+    end
+
+    def file
+      ext = options[:type] == "yaml" ? "yaml" : "rb"
+      "#{full_kind}.#{ext}"
+    end
+
+  public
+    def set_template_source
+      path = File.expand_path("../../templates/new/#{options[:type]}/#{file}", __dir__)
+      unless File.exist?(path)
+        logger.info "ERROR: Generator for #{file} not supported".color(:red)
+        exit 1
+      end
+      set_source("new/#{options[:type]}")
+    end
+
+    def create_resource
+      template file, ".kubes/resources/#{role}/#{file}"
+    end
+  end
+end