Merge branch 'remove-dedupe-instances-feature-flag' into 'master'

Rollout Deploy Board Duplicate Instances Fix to Self-Managed

See merge request gitlab-org/gitlab!46374

config/feature_flags/development/deploy_boards_dedupe_instances.yml

----
-name: deploy_boards_dedupe_instances
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40768
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/258214
-type: development
-group: group::progressive delivery
-default_enabled: false

doc/user/project/deploy_boards.md

@@ -41,9 +41,9 @@ knowledge. In particular, you should be familiar with:
 - [Kubernetes namespaces](https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/)
 - [Kubernetes canary deployments](https://kubernetes.io/docs/concepts/cluster-administration/manage-deployment/#canary-deployments)
 
-NOTE: **Note:**
-Apps that consist of multiple deployments are shown as duplicates on the deploy board.
-Follow [this issue](https://gitlab.com/gitlab-org/gitlab/-/issues/8463) for details.
+In GitLab 13.5 and earlier, apps that consist of multiple deployments are shown as
+duplicates on the deploy board. This is [fixed](https://gitlab.com/gitlab-org/gitlab/-/issues/8463)
+in GitLab 13.6.
 
 ## Use cases
 

ee/changelogs/unreleased/fix-deploy-board-multi-deployment-pods.yml

+---
+title: Fix duplicate instances in deploy boards when multiple deployments have the same track
+merge_request: 46374
+author:
+type: fixed

ee/lib/gitlab/kubernetes/rollout_status.rb

@@ -54,13 +54,7 @@ module Gitlab
       def initialize(deployments, pods: [], ingresses: [], status: :found)
         @status       = status
         @deployments  = deployments
-
-        @instances = if ::Feature.enabled?(:deploy_boards_dedupe_instances)
-                       RolloutInstances.new(deployments, pods).pod_instances
-                     else
-                       deployments.flat_map(&:instances)
-                     end
-
+        @instances = RolloutInstances.new(deployments, pods).pod_instances
         @canary_ingress = ingresses.find(&:canary?)
 
         @completion =

ee/spec/lib/gitlab/kubernetes/rollout_status_spec.rb

@@ -30,7 +30,6 @@ RSpec.describe Gitlab::Kubernetes::RolloutStatus do
 
   subject(:rollout_status) { described_class.from_deployments(*specs, pods_attrs: pods, ingresses: ingresses) }
 
-  shared_examples 'rollout status' do
   describe '#deployments' do
     it 'stores the deployments' do
       expect(rollout_status.deployments).to be_kind_of(Array)
@@ -148,6 +147,17 @@ RSpec.describe Gitlab::Kubernetes::RolloutStatus do
 
         expect(rollout_status.completion).to eq(0)
       end
+
+      it 'sets the completion percentage when a quarter of the pods are complete' do
+        deployments = [
+          kube_deployment(name: 'one', track: 'stable', replicas: 6),
+          kube_deployment(name: 'two', track: 'stable', replicas: 2)
+        ]
+        pods = create_pods(name: 'one', track: 'stable', count: 2)
+        rollout_status = described_class.from_deployments(*deployments, pods_attrs: pods)
+
+        expect(rollout_status.completion).to eq(25)
+      end
     end
 
     context 'with two deployments, one with track set to "stable" and one with no track label' do
@@ -171,6 +181,17 @@ RSpec.describe Gitlab::Kubernetes::RolloutStatus do
 
         expect(rollout_status.completion).to eq(0)
       end
+
+      it 'sets the completion percentage when a third of the pods are complete' do
+        deployments = [
+          kube_deployment(name: 'one', track: 'stable', replicas: 2),
+          kube_deployment(name: 'two', track: nil, replicas: 7)
+        ]
+        pods = create_pods(name: 'one', track: 'stable', count: 2) + create_pods(name: 'two', track: nil, count: 1)
+        rollout_status = described_class.from_deployments(*deployments, pods_attrs: pods)
+
+        expect(rollout_status.completion).to eq(33)
+      end
     end
   end
 
@@ -243,47 +264,6 @@ RSpec.describe Gitlab::Kubernetes::RolloutStatus do
       end
     end
   end
-  end
-
-  context 'deploy_boards_dedupe_instances is disabled' do
-    before do
-      stub_feature_flags(deploy_boards_dedupe_instances: false)
-    end
-
-    it_behaves_like 'rollout status'
-  end
-
-  context 'deploy_boards_dedupe_instances is enabled' do
-    before do
-      stub_feature_flags(deploy_boards_dedupe_instances: true)
-    end
-
-    it_behaves_like 'rollout status'
-
-    describe '#completion' do
-      it 'sets the completion percentage when a quarter of the pods are complete' do
-        deployments = [
-          kube_deployment(name: 'one', track: 'stable', replicas: 6),
-          kube_deployment(name: 'two', track: 'stable', replicas: 2)
-        ]
-        pods = create_pods(name: 'one', track: 'stable', count: 2)
-        rollout_status = described_class.from_deployments(*deployments, pods_attrs: pods)
-
-        expect(rollout_status.completion).to eq(25)
-      end
-
-      it 'sets the completion percentage when a third of the pods are complete' do
-        deployments = [
-          kube_deployment(name: 'one', track: 'stable', replicas: 2),
-          kube_deployment(name: 'two', track: nil, replicas: 7)
-        ]
-        pods = create_pods(name: 'one', track: 'stable', count: 2) + create_pods(name: 'two', track: nil, count: 1)
-        rollout_status = described_class.from_deployments(*deployments, pods_attrs: pods)
-
-        expect(rollout_status.completion).to eq(33)
-      end
-    end
-  end
 
   def create_pods(name:, count:, track: nil, status: 'Running' )
     Array.new(count, kube_pod(name: name, status: status, track: track))