Fix rebase mistakes

Shopify · May 26, 2017 · 9fab208 · 9fab208
1 parent 43dcf5a
commit 9fab208
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/lib/kubernetes-deploy/kubernetes_resource/pod_disruption_budget.rb b/lib/kubernetes-deploy/kubernetes_resource/pod_disruption_budget.rb
@@ -3,15 +3,8 @@ 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)
+      _, _err, st = kubectl.run("get", type, @name)
       @found = st.success?
       @status = @found ? "Available" : "Unknown"
       log_status

diff --git a/lib/kubernetes-deploy/runner.rb b/lib/kubernetes-deploy/runner.rb
@@ -297,9 +297,9 @@ def deploy_resources(resources, prune: false)
         r.deploy_started = Time.now.utc
         case r.deploy_method
         when :replace
-          _, _, st = run_kubectl("replace", "-f", r.file.path)
+          _, _, st = kubectl.run("replace", "-f", r.file.path, log_failure: false)
         when :replace_force
-          _, _, st = run_kubectl("replace", "--force", "-f", r.file.path)
+          _, _, st = kubectl.run("replace", "--force", "-f", r.file.path, log_failure: false)
         else
           # Fail Fast! This is a programmer mistake.
           raise ArgumentError, "Unexpected deploy method! (#{r.deploy_method.inspect})"