Merge branch 'canaries-first' into 'master'

Show canaries first

Closes #2216

See merge request !1685

lib/gitlab/kubernetes/deployment.rb

@@ -21,6 +21,10 @@ module Gitlab
         track == 'stable'
       end
 
+      def order
+        stable? ? 1 : 0
+      end
+
       def outdated?
         observed_generation < generation
       end

lib/gitlab/kubernetes/rollout_status.rb

@@ -20,6 +20,7 @@ module Gitlab
         return new([], valid: false) if specs.empty?
 
         deployments = specs.map { |spec| ::Gitlab::Kubernetes::Deployment.new(spec) }
+        deployments.sort_by!(&:order)
         new(deployments)
       end
 

spec/lib/gitlab/kubernetes/rollout_status_spec.rb

@@ -53,12 +53,12 @@ describe Gitlab::Kubernetes::RolloutStatus do
 
       it 'stores the union of deployment instances' do
         expected = [
-          { status: 'finished', tooltip: 'one (pod 0) Finished', track: 'stable', stable: true },
-          { status: 'finished', tooltip: 'one (pod 1) Finished', track: 'stable', stable: true },
-          { status: 'finished', tooltip: 'one (pod 2) Finished', track: 'stable', stable: true },
           { status: 'finished', tooltip: 'two (pod 0) Finished', track: 'canary', stable: false },
           { status: 'finished', tooltip: 'two (pod 1) Finished', track: 'canary', stable: false },
           { status: 'finished', tooltip: 'two (pod 2) Finished', track: 'canary', stable: false },
+          { status: 'finished', tooltip: 'one (pod 0) Finished', track: 'stable', stable: true },
+          { status: 'finished', tooltip: 'one (pod 1) Finished', track: 'stable', stable: true },
+          { status: 'finished', tooltip: 'one (pod 2) Finished', track: 'stable', stable: true },
         ]
 
         expect(rollout_status.instances).to eq(expected)