kubernetes-deploy 0.6.6 → 0.7.0

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

@@ -3,23 +3,15 @@ module KubernetesDeploy
   class Bugsnag < KubernetesResource
     TIMEOUT = 1.minute
 
-    def initialize(name, namespace, context, file)
-      @name = name
-      @namespace = namespace
-      @context = context
-      @file = file
-      @secret_found = false
-    end
-
     def sync
-      _, _err, st = run_kubectl("get", type, @name)
+      @secret_found = false
+      _, _err, st = kubectl.run("get", type, @name)
       @found = st.success?
       if @found
-        secrets, _err, _st = run_kubectl("get", "secrets", "--output=name")
+        secrets, _err, _st = kubectl.run("get", "secrets", "--output=name")
         @secret_found = secrets.split.any? { |s| s.end_with?("-bugsnag") }
       end
       @status = @secret_found ? "Available" : "Unknown"
-      log_status
     end
 
     def deploy_succeeded?

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

@@ -3,27 +3,20 @@ module KubernetesDeploy
   class Cloudsql < KubernetesResource
     TIMEOUT = 10.minutes
 
-    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 = if cloudsql_proxy_deployment_exists? && mysql_service_exists?
+      @deployment_exists = cloudsql_proxy_deployment_exists?
+      @service_exists = mysql_service_exists?
+      @status = if @deployment_exists && @service_exists
         "Provisioned"
       else
         "Unknown"
       end
-
-      log_status
     end
 
     def deploy_succeeded?
-      cloudsql_proxy_deployment_exists? && mysql_service_exists?
+      @service_exists && @deployment_exists
     end
 
     def deploy_failed?
@@ -41,7 +34,7 @@ module KubernetesDeploy
     private
 
     def cloudsql_proxy_deployment_exists?
-      deployment, _err, st = run_kubectl("get", "deployments", "cloudsql-proxy", "-o=json")
+      deployment, _err, st = kubectl.run("get", "deployments", "cloudsql-proxy", "-o=json")
 
       if st.success?
         parsed = JSON.parse(deployment)
@@ -56,7 +49,7 @@ module KubernetesDeploy
     end
 
     def mysql_service_exists?
-      service, _err, st = run_kubectl("get", "services", "mysql", "-o=json")
+      service, _err, st = kubectl.run("get", "services", "mysql", "-o=json")
 
       if st.success?
         parsed = JSON.parse(service)

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

@@ -3,18 +3,10 @@ module KubernetesDeploy
   class ConfigMap < KubernetesResource
     TIMEOUT = 30.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)
       @status = st.success? ? "Available" : "Unknown"
       @found = st.success?
-      log_status
     end
 
     def deploy_succeeded?
@@ -25,6 +17,10 @@ module KubernetesDeploy
       false
     end
 
+    def timeout_message
+      UNUSUAL_FAILURE_MESSAGE
+    end
+
     def exists?
       @found
     end

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

@@ -3,39 +3,52 @@ module KubernetesDeploy
   class Deployment < KubernetesResource
     TIMEOUT = 5.minutes
 
-    def initialize(name, namespace, context, file)
-      @name = name
-      @namespace = namespace
-      @context = context
-      @file = file
-    end
-
     def sync
-      json_data, _err, st = run_kubectl("get", type, @name, "--output=json")
+      json_data, _err, st = kubectl.run("get", type, @name, "--output=json")
       @found = st.success?
       @rollout_data = {}
       @status = nil
+      @representative_pod = nil
       @pods = []
 
       if @found
         @rollout_data = JSON.parse(json_data)["status"]
           .slice("updatedReplicas", "replicas", "availableReplicas", "unavailableReplicas")
-        @status, _err, _ = run_kubectl("rollout", "status", type, @name, "--watch=false") if @deploy_started
+        @status = @rollout_data.map { |replica_state, num| "#{num} #{replica_state}" }.join(", ")
 
-        pod_list, _err, st = run_kubectl("get", "pods", "-a", "-l", "name=#{name}", "--output=json")
+        pod_list, _err, st = kubectl.run("get", "pods", "-a", "-l", "name=#{name}", "--output=json")
         if st.success?
           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, context, nil, parent: "#{@name.capitalize} deployment")
+            pod = Pod.new(
+              name: pod_name,
+              namespace: namespace,
+              context: context,
+              file: nil,
+              parent: "#{@name.capitalize} deployment",
+              logger: @logger
+            )
             pod.deploy_started = @deploy_started
             pod.interpret_json_data(pod_json)
+
+            if !@representative_pod && pod_probably_new?(pod_json)
+              @representative_pod = pod
+            end
             @pods << pod
           end
         end
       end
+    end
 
-      log_status
+    def fetch_logs
+      @representative_pod ? @representative_pod.fetch_logs : {}
+    end
+
+    def fetch_events
+      own_events = super
+      return own_events unless @representative_pod
+      own_events.merge(@representative_pod.fetch_events)
     end
 
     def deploy_succeeded?
@@ -59,8 +72,12 @@ module KubernetesDeploy
       @found
     end
 
-    def status_data
-      super.merge(replicas: @rollout_data, num_pods: @pods.length)
+    private
+
+    def pod_probably_new?(pod_json)
+      return false unless @deploy_started
+      # Shitty, brittle workaround to identify a pod from the new ReplicaSet before implementing ReplicaSet awareness
+      Time.parse(pod_json["metadata"]["creationTimestamp"]) >= (@deploy_started - 30.seconds)
     end
   end
 end

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

@@ -3,18 +3,10 @@ module KubernetesDeploy
   class Ingress < KubernetesResource
     TIMEOUT = 30.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)
       @status = st.success? ? "Created" : "Unknown"
       @found = st.success?
-      log_status
     end
 
     def deploy_succeeded?
@@ -28,9 +20,5 @@ module KubernetesDeploy
     def exists?
       @found
     end
-
-    def group_name
-      "Ingresses"
-    end
   end
 end

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

@@ -3,17 +3,10 @@ module KubernetesDeploy
   class PersistentVolumeClaim < KubernetesResource
     TIMEOUT = 5.minutes
 
-    def initialize(name, namespace, context, file)
-      @name = name
-      @namespace = namespace
-      @context = context
-      @file = file
-    end
-
     def sync
-      @status, _err, st = run_kubectl("get", type, @name, "--output=jsonpath={.status.phase}")
+      out, _err, st = kubectl.run("get", type, @name, "--output=jsonpath={.status.phase}")
       @found = st.success?
-      log_status
+      @status = out if @found
     end
 
     def deploy_succeeded?

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

@@ -2,19 +2,19 @@
 module KubernetesDeploy
   class Pod < KubernetesResource
     TIMEOUT = 10.minutes
-    SUSPICIOUS_CONTAINER_STATES = %w(ImagePullBackOff RunContainerError).freeze
+    SUSPICIOUS_CONTAINER_STATES = %w(ImagePullBackOff RunContainerError ErrImagePull).freeze
 
-    def initialize(name, namespace, context, file, parent: nil)
+    def initialize(name:, namespace:, context:, file:, parent: nil, logger:)
       @name = name
       @namespace = namespace
       @context = context
       @file = file
       @parent = parent
-      @bare = !@parent
+      @logger = logger
     end
 
     def sync
-      out, _err, st = run_kubectl("get", type, @name, "-a", "--output=json")
+      out, _err, st = kubectl.run("get", type, @name, "-a", "--output=json")
       if @found = st.success?
         pod_data = JSON.parse(out)
         interpret_json_data(pod_data)
@@ -23,8 +23,7 @@ module KubernetesDeploy
         @ready = false
         @containers = []
       end
-      log_status
-      display_logs if @bare && deploy_finished?
+      display_logs if unmanaged? && deploy_succeeded?
     end
 
     def interpret_json_data(pod_data)
@@ -36,7 +35,7 @@ module KubernetesDeploy
           waiting_state = status["state"]["waiting"] if status["state"]
           reason = waiting_state["reason"] if waiting_state
           next unless SUSPICIOUS_CONTAINER_STATES.include?(reason)
-          KubernetesDeploy.logger.warn("#{id} has container in state #{reason} (#{waiting_state['message']})")
+          @logger.warn("#{id} has container in state #{reason} (#{waiting_state['message']})")
         end
       end
 
@@ -52,7 +51,7 @@ module KubernetesDeploy
     end
 
     def deploy_succeeded?
-      if @bare
+      if unmanaged?
         @phase == "Succeeded"
       else
         @phase == "Running" && @ready
@@ -64,30 +63,57 @@ module KubernetesDeploy
     end
 
     def exists?
-      @bare ? @found : true
+      unmanaged? ? @found : true
     end
 
-    def group_name
-      @bare ? "Bare pods" : @parent
-    end
-
-    private
-
-    def display_logs
-      return {} unless exists? && @containers.present? && !@already_displayed
+    # Returns a hash in the following format:
+    # {
+    #   "pod/web-1/app-container" => "giant blob of logs\nas a single string"
+    #   "pod/web-1/nginx-container" => "another giant blob of logs\nas a single string"
+    # }
+    def fetch_logs
+      return {} unless exists? && @containers.present?
 
-      @containers.each do |container_name|
-        out, _err, st = run_kubectl(
+      @containers.each_with_object({}) do |container_name, container_logs|
+        out, _err, _st = kubectl.run(
           "logs",
           @name,
           "--timestamps=true",
           "--since-time=#{@deploy_started.to_datetime.rfc3339}"
         )
-        next unless st.success? && out.present?
+        container_logs["#{id}/#{container_name}"] = out
+      end
+    end
+
+    private
 
-        KubernetesDeploy.logger.info "Logs from #{id} container #{container_name}:\x1b[0m \n#{out}\n"
-        @already_displayed = true
+    def unmanaged?
+      @parent.blank?
+    end
+
+    def display_logs
+      return if @already_displayed
+      container_logs = fetch_logs
+
+      if container_logs.empty?
+        @logger.warn("No logs found for pod #{id}")
+        return
       end
+
+      container_logs.each do |container_identifier, logs|
+        if logs.blank?
+          @logger.warn("No logs found for #{container_identifier}")
+        else
+          @logger.blank_line
+          @logger.info("Logs from #{container_identifier}:")
+          logs.split("\n").each do |line|
+            @logger.info("[#{container_identifier}]\t#{line}")
+          end
+          @logger.blank_line
+        end
+      end
+
+      @already_displayed = true
     end
   end
 end

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

@@ -3,18 +3,10 @@ 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
     end
 
     def deploy_succeeded?
@@ -26,6 +18,10 @@ module KubernetesDeploy
       :replace_force
     end
 
+    def timeout_message
+      UNUSUAL_FAILURE_MESSAGE
+    end
+
     def exists?
       @found
     end

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

@@ -1,18 +1,10 @@
 # frozen_string_literal: true
 module KubernetesDeploy
   class PodTemplate < KubernetesResource
-    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)
       @status = st.success? ? "Available" : "Unknown"
       @found = st.success?
-      log_status
     end
 
     def deploy_succeeded?
@@ -23,6 +15,10 @@ module KubernetesDeploy
       false
     end
 
+    def timeout_message
+      UNUSUAL_FAILURE_MESSAGE
+    end
+
     def exists?
       @found
     end

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

@@ -4,27 +4,21 @@ module KubernetesDeploy
     TIMEOUT = 5.minutes
     UUID_ANNOTATION = "redis.stable.shopify.io/owner_uid"
 
-    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 = if redis_deployment_exists? && redis_service_exists?
+      @deployment_exists = redis_deployment_exists?
+      @service_exists = redis_service_exists?
+
+      @status = if @deployment_exists && @service_exists
         "Provisioned"
       else
         "Unknown"
       end
-
-      log_status
     end
 
     def deploy_succeeded?
-      redis_deployment_exists? && redis_service_exists?
+      @deployment_exists && @service_exists
     end
 
     def deploy_failed?
@@ -42,7 +36,7 @@ module KubernetesDeploy
     private
 
     def redis_deployment_exists?
-      deployment, _err, st = run_kubectl("get", "deployments", "redis-#{redis_resource_uuid}", "-o=json")
+      deployment, _err, st = kubectl.run("get", "deployments", "redis-#{redis_resource_uuid}", "-o=json")
 
       if st.success?
         parsed = JSON.parse(deployment)
@@ -57,7 +51,7 @@ module KubernetesDeploy
     end
 
     def redis_service_exists?
-      service, _err, st = run_kubectl("get", "services", "redis-#{redis_resource_uuid}", "-o=json")
+      service, _err, st = kubectl.run("get", "services", "redis-#{redis_resource_uuid}", "-o=json")
 
       if st.success?
         parsed = JSON.parse(service)
@@ -73,7 +67,7 @@ module KubernetesDeploy
     def redis_resource_uuid
       return @redis_resource_uuid if defined?(@redis_resource_uuid) && @redis_resource_uuid
 
-      redis, _err, st = run_kubectl("get", "redises", @name, "-o=json")
+      redis, _err, st = kubectl.run("get", "redises", @name, "-o=json")
       if st.success?
         parsed = JSON.parse(redis)