Add latest changes from gitlab-org/gitlab@master

1 files changed, 0 insertions, 88 deletions

diff --git a/spec/requests/api/internal/pages_spec.rb b/spec/requests/api/internal/pages_spec.rb
index 67f5b7f8ccb..1361498747d 100644
--- a/spec/requests/api/internal/pages_spec.rb
+++ b/spec/requests/api/internal/pages_spec.rb
@@ -76,94 +76,6 @@ RSpec.describe API::Internal::Pages, feature_category: :pages do
         end
       end
 
-      context 'serverless domain' do
-        let(:namespace) { create(:namespace, name: 'gitlab-org') }
-        let(:project) { create(:project, namespace: namespace, name: 'gitlab-ce') }
-        let(:environment) { create(:environment, project: project) }
-        let(:pages_domain) { create(:pages_domain, domain: 'serverless.gitlab.io') }
-        let(:knative_without_ingress) { create(:clusters_applications_knative) }
-        let(:knative_with_ingress) { create(:clusters_applications_knative, external_ip: '10.0.0.1') }
-
-        context 'without a knative ingress gateway IP' do
-          let!(:serverless_domain_cluster) do
-            create(
-              :serverless_domain_cluster,
-              uuid: 'abcdef12345678',
-              pages_domain: pages_domain,
-              knative: knative_without_ingress
-            )
-          end
-
-          let(:serverless_domain) do
-            create(
-              :serverless_domain,
-              serverless_domain_cluster: serverless_domain_cluster,
-              environment: environment
-            )
-          end
-
-          it 'responds with 204 no content' do
-            query_host(serverless_domain.uri.host)
-
-            expect(response).to have_gitlab_http_status(:no_content)
-            expect(response.body).to be_empty
-          end
-        end
-
-        context 'with a knative ingress gateway IP' do
-          let!(:serverless_domain_cluster) do
-            create(
-              :serverless_domain_cluster,
-              uuid: 'abcdef12345678',
-              pages_domain: pages_domain,
-              knative: knative_with_ingress
-            )
-          end
-
-          let(:serverless_domain) do
-            create(
-              :serverless_domain,
-              serverless_domain_cluster: serverless_domain_cluster,
-              environment: environment
-            )
-          end
-
-          it 'responds with 204 because of feature deprecation' do
-            query_host(serverless_domain.uri.host)
-
-            expect(response).to have_gitlab_http_status(:no_content)
-            expect(response.body).to be_empty
-
-            ##
-            # Serverless serving and reverse proxy to Kubernetes / Knative has
-            #   been deprecated and disabled, as per
-            #   https://gitlab.com/gitlab-org/gitlab-pages/-/issues/467
-            #
-            # expect(response).to match_response_schema('internal/serverless/virtual_domain')
-            # expect(json_response['certificate']).to eq(pages_domain.certificate)
-            # expect(json_response['key']).to eq(pages_domain.key)
-            #
-            # expect(json_response['lookup_paths']).to eq(
-            #   [
-            #     {
-            #       'source' => {
-            #         'type' => 'serverless',
-            #         'service' => "test-function.#{project.name}-#{project.id}-#{environment.slug}.#{serverless_domain_cluster.knative.hostname}",
-            #         'cluster' => {
-            #           'hostname' => serverless_domain_cluster.knative.hostname,
-            #           'address' => serverless_domain_cluster.knative.external_ip,
-            #           'port' => 443,
-            #           'cert' => serverless_domain_cluster.certificate,
-            #           'key' => serverless_domain_cluster.key
-            #         }
-            #       }
-            #     }
-            #   ]
-            # )
-          end
-        end
-      end
-
       context 'custom domain' do
         let(:namespace) { create(:namespace, name: 'gitlab-org') }
         let(:project) { create(:project, namespace: namespace, name: 'gitlab-ce') }