kubernetes-deploy 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35d948d40aa56e5e5a6768970fd3337a23567aa5
-  data.tar.gz: 69e976d7ff55b67d735e35def340386abb007168
+  metadata.gz: 845bf8bd854e94df070d5637d37a8678f9a92411
+  data.tar.gz: 32a57ce86b607e98133ec04875d88f4ffa37495c
 SHA512:
-  metadata.gz: 69ff1c41cc62e2489680586a97f6392678c1110ac0cd729d5d90fcb3e0d27012eae5db56dccb7edd88e24dda0d7604ba7bc83a96ecc0b3ffab935c6128da4012
-  data.tar.gz: 0fcf662530afff4ffff89a4f3eba3ef2b92dc61d3ca7f5c6bc4810987017405192350f9137d1a0da79b4bfeb75bf3fa3f4a9ac1462df2699bbd060535c39056c
+  metadata.gz: 8a6b635d9554e3737a5330fe4df509ec6ca5f5b1a0a3abac8016a199b084620d36ac47116e7863c9b8ebbda3e5a6a264b4b24da6262e772ee0250e2d98e48ea4
+  data.tar.gz: c479251f382257c6be386422f13d87ab4252f4adaa91b5d1600aa9df30b0d8687b9bb0612642275d2dc4860fc15871bb3afdad8f59e6311e1e120b3d9da11c7a

data/lib/kubernetes-deploy/kubeclient_builder.rb

@@ -28,6 +28,14 @@ module KubernetesDeploy
       )
     end
 
+    def build_policy_v1beta1_kubeclient(context)
+      _build_kubeclient(
+        api_version: "v1beta1",
+        context: context,
+        endpoint_path: "/apis/policy/"
+      )
+    end
+
     def _build_kubeclient(api_version:, context:, endpoint_path: nil)
       config = GoogleFriendlyConfig.read(ENV.fetch("KUBECONFIG"))
       unless config.contexts.include?(context)

data/lib/kubernetes-deploy/kubernetes_resource.rb

@@ -36,6 +36,7 @@ module KubernetesDeploy
       when 'persistentvolumeclaim' then PersistentVolumeClaim.new(name, namespace, context, file)
       when 'service' then Service.new(name, namespace, context, file)
       when 'podtemplate' then PodTemplate.new(name, namespace, context, file)
+      when 'poddisruptionbudget' then PodDisruptionBudget.new(name, namespace, context, file)
       else self.new(name, namespace, context, file).tap { |r| r.type = type }
       end
     end
@@ -99,6 +100,12 @@ module KubernetesDeploy
       false
     end
 
+    # Expected values: :apply, :replace, :replace_force
+    def deploy_method
+      # TPRs must use update for now: https://github.com/kubernetes/kubernetes/issues/39906
+      tpr? ? :replace : :apply
+    end
+
     def status_data
       {
         group: group_name,

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 module KubernetesDeploy
   class Cloudsql < KubernetesResource
-    TIMEOUT = 5.minutes
+    TIMEOUT = 10.minutes
 
     def initialize(name, namespace, context, file)
       @name = name

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

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+module KubernetesDeploy
+  class PodDisruptionBudget < KubernetesResource
+    TIMEOUT = 10.seconds
+
+    def initialize(name, namespace, context, file)
+      @name = name
+      @namespace = namespace
+      @context = context
+      @file = file
+    end
+
+    def sync
+      _, _err, st = run_kubectl("get", type, @name)
+      @found = st.success?
+      @status = @found ? "Available" : "Unknown"
+      log_status
+    end
+
+    def deploy_succeeded?
+      exists?
+    end
+
+    def deploy_method
+      # Required until https://github.com/kubernetes/kubernetes/issues/45398 changes
+      :replace_force
+    end
+
+    def exists?
+      @found
+    end
+  end
+end

data/lib/kubernetes-deploy/restart_task.rb

@@ -31,6 +31,7 @@ module KubernetesDeploy
       @logger = logger
       @kubeclient = build_v1_kubeclient(context)
       @v1beta1_kubeclient = build_v1beta1_kubeclient(context)
+      @policy_v1beta1_kubeclient = build_policy_v1beta1_kubeclient(context)
     end
 
     def perform(deployments_names = nil)

data/lib/kubernetes-deploy/runner.rb

@@ -17,6 +17,7 @@ require 'kubernetes-deploy/kubernetes_resource'
   service
   pod_template
   bugsnag
+  pod_disruption_budget
 ).each do |subresource|
   require "kubernetes-deploy/kubernetes_resource/#{subresource}"
 end
@@ -295,25 +296,41 @@ MSG
       KubernetesDeploy.logger.info("All required parameters and files are present")
     end
 
-    def update_tprs(resources)
-      resources.each do |r|
+    def deploy_resources(resources, prune: false)
+      KubernetesDeploy.logger.info("Deploying resources:")
+
+      # Apply can be done in one large batch, the rest have to be done individually
+      applyables, individuals = resources.partition { |r| r.deploy_method == :apply }
+
+      individuals.each do |r|
         KubernetesDeploy.logger.info("- #{r.id}")
         r.deploy_started = Time.now.utc
-        _, _, st = run_kubectl("replace", "-f", r.file.path)
+        case r.deploy_method
+        when :replace
+          _, _, st = run_kubectl("replace", "-f", r.file.path)
+        when :replace_force
+          _, _, st = run_kubectl("replace", "--force", "-f", r.file.path)
+        else
+          # Fail Fast! This is a programmer mistake.
+          raise ArgumentError, "Unexpected deploy method! (#{r.deploy_method.inspect})"
+        end
 
         unless st.success?
           # it doesn't exist so we can't replace it
-          run_kubectl("create", "-f", r.file.path)
+          _, err, st = run_kubectl("create", "-f", r.file.path)
+          unless st.success?
+            raise FatalDeploymentError, <<-MSG.strip_heredoc
+              Failed to replace or create resource: #{r.id}
+              #{err}
+            MSG
+          end
         end
       end
-    end
 
-    def deploy_resources(resources, prune: false)
-      KubernetesDeploy.logger.info("Deploying resources:")
+      apply_all(applyables, prune)
+    end
 
-      # TPRs must use update for now: https://github.com/kubernetes/kubernetes/issues/39906
-      tprs, resources = resources.partition(&:tpr?)
-      update_tprs(tprs)
+    def apply_all(resources, prune)
       return unless resources.present?
 
       command = ["apply"]

data/lib/kubernetes-deploy/version.rb

@@ -1,3 +1,3 @@
 module KubernetesDeploy
-  VERSION = "0.6.5"
+  VERSION = "0.6.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kubernetes-deploy
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Kir Shatrov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-10 00:00:00.000000000 Z
+date: 2017-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -188,6 +188,7 @@ files:
 - lib/kubernetes-deploy/kubernetes_resource/ingress.rb
 - lib/kubernetes-deploy/kubernetes_resource/persistent_volume_claim.rb
 - lib/kubernetes-deploy/kubernetes_resource/pod.rb
+- lib/kubernetes-deploy/kubernetes_resource/pod_disruption_budget.rb
 - lib/kubernetes-deploy/kubernetes_resource/pod_template.rb
 - lib/kubernetes-deploy/kubernetes_resource/redis.rb
 - lib/kubernetes-deploy/kubernetes_resource/service.rb