Merge branch '212320-move-canary-ingress-to-core' into 'master'

RUN AS-IF-FOSS Move Canary Ingress to core

See merge request gitlab-org/gitlab!48836

app/graphql/types/mutation_type.rb

@@ -31,6 +31,7 @@ module Types
     mount_mutation Mutations::Commits::Create, calls_gitaly: true
     mount_mutation Mutations::CustomEmoji::Create, feature_flag: :custom_emoji
     mount_mutation Mutations::Discussions::ToggleResolve
+    mount_mutation Mutations::Environments::CanaryIngress::Update
     mount_mutation Mutations::Issues::Create
     mount_mutation Mutations::Issues::SetAssignees
     mount_mutation Mutations::Issues::SetConfidential

ee/app/services/environments/canary_ingress/update_service.rb → app/services/environments/canary_ingress/update_service.rb

@@ -41,10 +41,6 @@ module Environments
           return error(_('You do not have permission to update the environment.'))
         end
 
-        unless environment.project.feature_available?(:deploy_board)
-          return error(_('The license for Deploy Board is required to use this feature.'))
-        end
-
         unless params[:weight].is_a?(Integer) && (0..100).cover?(params[:weight])
           return error(_('Canary weight must be specified and valid range (0..100).'))
         end

app/workers/all_queues.yml

@@ -1537,6 +1537,14 @@
   :weight: 2
   :idempotent:
   :tags: []
+- :name: environments_canary_ingress_update
+  :feature_category: :continuous_delivery
+  :has_external_dependencies: true
+  :urgency: :low
+  :resource_boundary: :unknown
+  :weight: 1
+  :idempotent: true
+  :tags: []
 - :name: error_tracking_issue_link
   :feature_category: :error_tracking
   :has_external_dependencies: true

changelogs/unreleased/212320-move-canary-ingress-to-core.yml

+---
+title: Move CanaryIngress to core
+merge_request: 48836
+author:
+type: changed

doc/user/project/canary_deployments.md

@@ -68,9 +68,10 @@ can easily notice them.
 
 ![Canary deployments on Deploy Board](img/deploy_boards_canary_deployments.png)
 
-### Advanced traffic control with Canary Ingress **(PREMIUM)**
+### Advanced traffic control with Canary Ingress
 
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/215501) in [GitLab Premium](https://about.gitlab.com/pricing/) 13.6.
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/215501) in [GitLab Premium](https://about.gitlab.com/pricing/) 13.6.
+> - [Moved](https://gitlab.com/gitlab-org/gitlab/-/issues/212320) to Core in GitLab 13.7.
 
 Canary deployments can be more strategic with [Canary Ingress](https://kubernetes.github.io/ingress-nginx/user-guide/nginx-configuration/annotations/#canary),
 which is an advanced traffic routing service that controls incoming HTTP

ee/app/graphql/ee/types/mutation_type.rb

@@ -14,7 +14,6 @@ module EE
         mount_mutation ::Mutations::Issues::SetWeight
         mount_mutation ::Mutations::Issues::SetEpic
         mount_mutation ::Mutations::Issues::PromoteToEpic
-        mount_mutation ::Mutations::Environments::CanaryIngress::Update
         mount_mutation ::Mutations::EpicTree::Reorder
         mount_mutation ::Mutations::Epics::Update
         mount_mutation ::Mutations::Epics::Create

ee/app/workers/all_queues.yml

@@ -701,14 +701,6 @@
   :weight: 1
   :idempotent:
   :tags: []
-- :name: environments_canary_ingress_update
-  :feature_category: :continuous_delivery
-  :has_external_dependencies: true
-  :urgency: :low
-  :resource_boundary: :unknown
-  :weight: 1
-  :idempotent: true
-  :tags: []
 - :name: group_saml_group_sync
   :feature_category: :authentication_and_authorization
   :has_external_dependencies:

ee/spec/requests/api/graphql/mutations/environments/canary_ingress/update_spec.rb

@@ -27,33 +27,21 @@ RSpec.describe 'Update Environment Canary Ingress', :clean_gitlab_redis_cache do
   end
 
   before do
-    stub_licensed_features(deploy_board: true, protected_environments: true)
+    stub_licensed_features(protected_environments: true)
     stub_kubeclient_ingresses(environment.deployment_namespace, response: kube_ingresses_response(with_canary: true))
   end
 
-  context 'when kubernetes accepted the patch request' do
+  context 'when environment is protected and allowed to be deployed by only operator' do
     before do
       stub_kubeclient_ingresses(environment.deployment_namespace, method: :patch, resource_path: "/production-auto-deploy")
+      create(:protected_environment, :maintainers_can_deploy, name: environment.name, project: project)
     end
 
-    it 'updates successfully' do
+    it 'fails to update' do
       post_graphql_mutation(mutation, current_user: actor)
 
-      expect(graphql_mutation_response(:environments_canary_ingress_update)['errors'])
-        .to be_empty
-    end
-
-    context 'when environment is protected and allowed to be deployed by only operator' do
-      before do
-        create(:protected_environment, :maintainers_can_deploy, name: environment.name, project: project)
-      end
-
-      it 'fails to update' do
-        post_graphql_mutation(mutation, current_user: actor)
-
-        expect(graphql_errors.first)
-          .to include('message' => "The resource that you are attempting to access does not exist or you don't have permission to perform this action")
-      end
+      expect(graphql_errors.first)
+        .to include('message' => "The resource that you are attempting to access does not exist or you don't have permission to perform this action")
     end
   end
 end

locale/gitlab.pot

@@ -27291,9 +27291,6 @@ msgstr ""
 msgid "The issue was successfully promoted to an epic. Redirecting to epic..."
 msgstr ""
 
-msgid "The license for Deploy Board is required to use this feature."
-msgstr ""
-
 msgid "The license key is invalid. Make sure it is exactly as you received it from GitLab Inc."
 msgstr ""
 

spec/requests/api/graphql/mutations/environments/canary_ingress/update_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'Update Environment Canary Ingress', :clean_gitlab_redis_cache do
+  include GraphqlHelpers
+  include KubernetesHelpers
+
+  let_it_be(:project) { create(:project, :repository) }
+  let_it_be(:cluster) { create(:cluster, :project, projects: [project]) }
+  let_it_be(:service) { create(:cluster_platform_kubernetes, :configured, cluster: cluster) }
+  let_it_be(:environment) { create(:environment, project: project) }
+  let_it_be(:deployment) { create(:deployment, :success, environment: environment, project: project) }
+  let_it_be(:maintainer) { create(:user) }
+  let_it_be(:developer) { create(:user) }
+  let(:environment_id) { environment.to_global_id.to_s }
+  let(:weight) { 25 }
+  let(:actor) { developer }
+
+  let(:mutation) do
+    graphql_mutation(:environments_canary_ingress_update, id: environment_id, weight: weight)
+  end
+
+  before_all do
+    project.add_maintainer(maintainer)
+    project.add_developer(developer)
+  end
+
+  before do
+    stub_kubeclient_ingresses(environment.deployment_namespace, response: kube_ingresses_response(with_canary: true))
+  end
+
+  context 'when kubernetes accepted the patch request' do
+    before do
+      stub_kubeclient_ingresses(environment.deployment_namespace, method: :patch, resource_path: "/production-auto-deploy")
+    end
+
+    it 'updates successfully' do
+      post_graphql_mutation(mutation, current_user: actor)
+
+      expect(graphql_mutation_response(:environments_canary_ingress_update)['errors'])
+        .to be_empty
+    end
+  end
+end

ee/spec/services/environments/canary_ingress/update_service_spec.rb → spec/services/environments/canary_ingress/update_service_spec.rb

@@ -17,10 +17,6 @@ RSpec.describe Environments::CanaryIngress::UpdateService, :clean_gitlab_redis_c
     project.add_reporter(reporter)
   end
 
-  before do
-    stub_licensed_features(deploy_board: true)
-  end
-
   shared_examples_for 'failed request' do
     it 'returns an error' do
       expect(subject[:status]).to eq(:error)
@@ -53,16 +49,6 @@ RSpec.describe Environments::CanaryIngress::UpdateService, :clean_gitlab_redis_c
       end
     end
 
-    context 'when project does not have an sufficient license' do
-      before do
-        stub_licensed_features(deploy_board: false)
-      end
-
-      it_behaves_like 'failed request' do
-        let(:message) { 'The license for Deploy Board is required to use this feature.' }
-      end
-    end
-
     context 'when weight parameter is invalid' do
       let(:params) { { weight: 'unknown' } }