kubernetes-deploy 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6813a027a20fd297012d9fbe53f9bf79ee711f4
-  data.tar.gz: 68678d68902d9360939bf247844d7baa59bbe750
+  metadata.gz: c5451809e19cbb8f15e709ff0eab4787bcdc1c36
+  data.tar.gz: 2eaf109d80b3e11175ebd29cab21dd7419551583
 SHA512:
-  metadata.gz: 43316a28fb61923fd1ea2fb2e623cc60d6793d98f71dd8f6380a3758eb5701a789efdd264a2c858a74e062fe698eb9a79f46415ed095757d0163652d3aa99887
-  data.tar.gz: 41e6622be8c17256ff4a8e663fdaa340b4d87c9e727378a53caf29444b8e3e579c81302d7b7656f74ed6986c6051979df99fde329906377c1e28ec0684e7173a
+  metadata.gz: 3a7a97fe1b2c991f58ca8da5d77028d6de450517ed02f82f9fd8f5688f36095f85263eb667cb6444542c69d845bb7f20bb651e54da81851bab37f5d0ab1aed69
+  data.tar.gz: 8490ed13cba69329bb9f13acb9a6b3ddfffbba553cdc84c886d075060a49804ac11e3d8173db8d60c0bdf0e39ab2d96a2b066e723e960405369a9227fa2b9152

data/lib/kubernetes-deploy/kubernetes_resource.rb

@@ -5,27 +5,27 @@ require 'shellwords'
 module KubernetesDeploy
   class KubernetesResource
 
-    attr_reader :name, :namespace, :file
+    attr_reader :name, :namespace, :file, :context
     attr_writer :type, :deploy_started
 
     TIMEOUT = 5.minutes
 
-    def self.for_type(type, name, namespace, file)
+    def self.for_type(type, name, namespace, context, file)
       case type
-      when 'cloudsql' then Cloudsql.new(name, namespace, file)
-      when 'configmap' then ConfigMap.new(name, namespace, file)
-      when 'deployment' then Deployment.new(name, namespace, file)
-      when 'pod' then Pod.new(name, namespace, file)
-      when 'ingress' then Ingress.new(name, namespace, file)
-      when 'persistentvolumeclaim' then PersistentVolumeClaim.new(name, namespace, file)
-      when 'service' then Service.new(name, namespace, file)
-      else self.new(name, namespace, file).tap { |r| r.type = type }
+      when 'cloudsql' then Cloudsql.new(name, namespace, context, file)
+      when 'configmap' then ConfigMap.new(name, namespace, context, file)
+      when 'deployment' then Deployment.new(name, namespace, context, file)
+      when 'pod' then Pod.new(name, namespace, context, file)
+      when 'ingress' then Ingress.new(name, namespace, context, file)
+      when 'persistentvolumeclaim' then PersistentVolumeClaim.new(name, namespace, context, file)
+      when 'service' then Service.new(name, namespace, context, file)
+      else self.new(name, namespace, context, file).tap { |r| r.type = type }
       end
     end
 
-    def initialize(name, namespace, file)
+    def initialize(name, namespace, context, file)
       # subclasses must also set these
-      @name, @namespace, @file = name, namespace, file
+      @name, @namespace, @context, @file = name, namespace, context, file
     end
 
     def id
@@ -92,7 +92,9 @@ module KubernetesDeploy
 
     def run_kubectl(*args)
       raise FatalDeploymentError, "Namespace missing for namespaced command" if namespace.blank?
-      args = args.unshift("kubectl").push("--namespace=#{namespace}")
+      raise FatalDeploymentError, "Explicit context is required to run this command" if context.blank?
+      args = args.unshift("kubectl").push("--namespace=#{namespace}").push("--context=#{context}")
+
       KubernetesDeploy.logger.debug Shellwords.join(args)
       out, err, st = Open3.capture3(*args)
       KubernetesDeploy.logger.debug(out.shellescape)

data/lib/kubernetes-deploy/kubernetes_resource/cloudsql.rb

@@ -2,8 +2,8 @@ module KubernetesDeploy
   class Cloudsql < KubernetesResource
     TIMEOUT = 5.minutes
 
-    def initialize(name, namespace, file)
-      @name, @namespace, @file = name, namespace, file
+    def initialize(name, namespace, context, file)
+      @name, @namespace, @context, @file = name, namespace, context, file
     end
 
     def sync

data/lib/kubernetes-deploy/kubernetes_resource/config_map.rb

@@ -2,8 +2,8 @@ module KubernetesDeploy
   class ConfigMap < KubernetesResource
     TIMEOUT = 30.seconds
 
-    def initialize(name, namespace, file)
-      @name, @namespace, @file = name, namespace, file
+    def initialize(name, namespace, context, file)
+      @name, @namespace, @context, @file = name, namespace, context, file
     end
 
     def sync

data/lib/kubernetes-deploy/kubernetes_resource/deployment.rb

@@ -2,8 +2,8 @@ module KubernetesDeploy
   class Deployment < KubernetesResource
     TIMEOUT = 15.minutes
 
-    def initialize(name, namespace, file)
-      @name, @namespace, @file = name, namespace, file
+    def initialize(name, namespace, context, file)
+      @name, @namespace, @context, @file = name, namespace, context, file
     end
 
     def sync
@@ -22,7 +22,7 @@ module KubernetesDeploy
           pods_json = JSON.parse(pod_list)["items"]
           pods_json.each do |pod_json|
             pod_name = pod_json["metadata"]["name"]
-            pod = Pod.new(pod_name, namespace, nil, parent: "#{@name.capitalize} deployment")
+            pod = Pod.new(pod_name, namespace, context, nil, parent: "#{@name.capitalize} deployment")
             pod.deploy_started = @deploy_started
             pod.interpret_json_data(pod_json)
             pod.log_status

data/lib/kubernetes-deploy/kubernetes_resource/ingress.rb

@@ -2,8 +2,8 @@ module KubernetesDeploy
   class Ingress < KubernetesResource
     TIMEOUT = 30.seconds
 
-    def initialize(name, namespace, file)
-      @name, @namespace, @file = name, namespace, file
+    def initialize(name, namespace, context, file)
+      @name, @namespace, @context, @file = name, namespace, context, file
     end
 
     def sync

data/lib/kubernetes-deploy/kubernetes_resource/persistent_volume_claim.rb

@@ -2,8 +2,8 @@ module KubernetesDeploy
   class PersistentVolumeClaim < KubernetesResource
     TIMEOUT = 5.minutes
 
-    def initialize(name, namespace, file)
-      @name, @namespace, @file = name, namespace, file
+    def initialize(name, namespace, context, file)
+      @name, @namespace, @context, @file = name, namespace, context, file
     end
 
     def sync

data/lib/kubernetes-deploy/kubernetes_resource/pod.rb

@@ -3,8 +3,8 @@ module KubernetesDeploy
     TIMEOUT = 15.minutes
     SUSPICIOUS_CONTAINER_STATES = %w(ImagePullBackOff RunContainerError).freeze
 
-    def initialize(name, namespace, file, parent: nil)
-      @name, @namespace, @file, @parent = name, namespace, file, parent
+    def initialize(name, namespace, context, file, parent: nil)
+      @name, @namespace, @context, @file, @parent = name, namespace, context, file, parent
       @bare = !@parent
     end
 
@@ -40,7 +40,7 @@ module KubernetesDeploy
       elsif @phase == "Terminating"
         @status = @phase
       else
-        ready_condition = pod_data["status"]["conditions"].find { |condition| condition["type"] == "Ready" }
+        ready_condition = pod_data["status"].fetch("conditions", []).find { |condition| condition["type"] == "Ready" }
         @ready = ready_condition.present? && (ready_condition["status"] == "True")
         @status = "#{@phase} (Ready: #{@ready})"
       end

data/lib/kubernetes-deploy/kubernetes_resource/service.rb

@@ -2,8 +2,8 @@ module KubernetesDeploy
   class Service < KubernetesResource
     TIMEOUT = 15.minutes
 
-    def initialize(name, namespace, file)
-      @name, @namespace, @file = name, namespace, file
+    def initialize(name, namespace, context, file)
+      @name, @namespace, @context, @file = name, namespace, context, file
     end
 
     def sync

data/lib/kubernetes-deploy/runner.rb

@@ -26,6 +26,10 @@ module KubernetesDeploy
       PersistentVolumeClaim
       Pod
     )
+    PROTECTED_NAMESPACES = %w(
+      default
+      kube-system
+    )
 
     # Things removed from default prune whitelist:
     # core/v1/Namespace -- not namespaced
@@ -76,9 +80,9 @@ MSG
       phase_heading("Validating configuration")
       validate_configuration
 
-      phase_heading("Configuring kubectl")
-      set_kubectl_context
-      validate_namespace
+      phase_heading("Identifying deployment target")
+      confirm_context_exists
+      confirm_namespace_exists
 
       phase_heading("Parsing deploy content")
       resources = discover_resources
@@ -127,7 +131,7 @@ MSG
         split_templates(filename) do |tempfile|
           resource_id = discover_resource_via_dry_run(tempfile)
           type, name = resource_id.split("/", 2) # e.g. "pod/web-198612918-dzvfb"
-          resources << KubernetesResource.for_type(type, name, @namespace, tempfile)
+          resources << KubernetesResource.for_type(type, name, @namespace, @context, tempfile)
           KubernetesDeploy.logger.info "Discovered template for #{resource_id}"
         end
       end
@@ -217,6 +221,8 @@ MSG
 
       if @namespace.blank?
         errors << "Namespace must be specified"
+      elsif PROTECTED_NAMESPACES.include?(@namespace)
+        errors << "Refusing to deploy to protected namespace #{@namespace}"
       end
 
       if @context.blank?
@@ -263,7 +269,7 @@ MSG
       run_kubectl(*command)
     end
 
-    def set_kubectl_context
+    def confirm_context_exists
       out, err, st = run_kubectl("config", "get-contexts", "-o", "name", namespaced: false, with_context: false)
       available_contexts = out.split("\n")
       if !st.success?
@@ -271,21 +277,24 @@ MSG
       elsif !available_contexts.include?(@context)
         raise FatalDeploymentError, "Context #{@context} is not available. Valid contexts: #{available_contexts}"
       end
+      KubernetesDeploy.logger.info("Context #{@context} found")
     end
 
-    def validate_namespace
+    def confirm_namespace_exists
       _, _, st = run_kubectl("get", "namespace", @namespace, namespaced: false)
-      raise FatalDeploymentError, "Failed to validate namespace #{@namespace}" unless st.success?
-      KubernetesDeploy.logger.info("Namespace #{@namespace} validated")
+      raise FatalDeploymentError, "Namespace #{@namespace} not found" unless st.success?
+      KubernetesDeploy.logger.info("Namespace #{@namespace} found")
     end
 
     def run_kubectl(*args, namespaced: true, with_context: true)
       args = args.unshift("kubectl")
       if namespaced
+        raise FatalDeploymentError, "Namespace missing for namespaced command" if @namespace.blank?
         args.push("--namespace=#{@namespace}")
       end
 
       if with_context
+        raise FatalDeploymentError, "Explicit context is required to run this command" if @context.blank?
         args.push("--context=#{@context}")
       end
       KubernetesDeploy.logger.debug Shellwords.join(args)

data/lib/kubernetes-deploy/version.rb

@@ -1,3 +1,3 @@
 module KubernetesDeploy
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kubernetes-deploy
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Kir Shatrov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-03 00:00:00.000000000 Z
+date: 2017-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -116,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Kubernetes deploy scripts