Commit 4ab7ae86 authored by Fatih Acet's avatar Fatih Acet

Merge branch 'remove_enable_cluster_application_crossplane_flag' into 'master'

Remove enable_cluster_application_crossplane FF

See merge request gitlab-org/gitlab!22141
parents ffbcc401 beb483ee
...@@ -129,9 +129,6 @@ export default { ...@@ -129,9 +129,6 @@ export default {
crossplaneInstalled() { crossplaneInstalled() {
return this.applications.crossplane.status === APPLICATION_STATUS.INSTALLED; return this.applications.crossplane.status === APPLICATION_STATUS.INSTALLED;
}, },
enableClusterApplicationCrossplane() {
return gon.features && gon.features.enableClusterApplicationCrossplane;
},
enableClusterApplicationElasticStack() { enableClusterApplicationElasticStack() {
return gon.features && gon.features.enableClusterApplicationElasticStack; return gon.features && gon.features.enableClusterApplicationElasticStack;
}, },
...@@ -519,7 +516,6 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity ...@@ -519,7 +516,6 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity
</div> </div>
</application-row> </application-row>
<application-row <application-row
v-if="enableClusterApplicationCrossplane"
id="crossplane" id="crossplane"
:logo-url="crossplaneLogo" :logo-url="crossplaneLogo"
:title="applications.crossplane.title" :title="applications.crossplane.title"
......
...@@ -14,7 +14,6 @@ class Clusters::ClustersController < Clusters::BaseController ...@@ -14,7 +14,6 @@ class Clusters::ClustersController < Clusters::BaseController
before_action :update_applications_status, only: [:cluster_status] before_action :update_applications_status, only: [:cluster_status]
before_action only: [:show] do before_action only: [:show] do
push_frontend_feature_flag(:enable_cluster_application_elastic_stack) push_frontend_feature_flag(:enable_cluster_application_elastic_stack)
push_frontend_feature_flag(:enable_cluster_application_crossplane)
end end
helper_method :token_in_session helper_method :token_in_session
......
...@@ -68,7 +68,7 @@ module Clusters ...@@ -68,7 +68,7 @@ module Clusters
end end
def invalid_application? def invalid_application?
unknown_application? || (application_name == Applications::ElasticStack.application_name && !Feature.enabled?(:enable_cluster_application_elastic_stack)) || (application_name == Applications::Crossplane.application_name && !Feature.enabled?(:enable_cluster_application_crossplane)) unknown_application? || (application_name == Applications::ElasticStack.application_name && !Feature.enabled?(:enable_cluster_application_elastic_stack))
end end
def unknown_application? def unknown_application?
......
---
title: Enable ability to install Crossplane app by default
merge_request: 22141
author:
type: changed
...@@ -420,18 +420,6 @@ install Crossplane using the ...@@ -420,18 +420,6 @@ install Crossplane using the
[`values.yaml`](https://github.com/crossplaneio/crossplane/blob/master/cluster/charts/crossplane/values.yaml.tmpl) [`values.yaml`](https://github.com/crossplaneio/crossplane/blob/master/cluster/charts/crossplane/values.yaml.tmpl)
file. file.
#### Enabling installation
This is a preliminary release of Crossplane as a GitLab-managed application. By default,
the ability to install it is disabled.
To allow installation of Crossplane as a GitLab-managed application, ask a GitLab
administrator to run following command within a Rails console:
```ruby
Feature.enable(:enable_cluster_application_crossplane)
```
### Elastic Stack ### Elastic Stack
> Introduced in GitLab 12.7 for project- and group-level clusters. > Introduced in GitLab 12.7 for project- and group-level clusters.
......
...@@ -17,7 +17,6 @@ describe('Applications', () => { ...@@ -17,7 +17,6 @@ describe('Applications', () => {
gon.features = gon.features || {}; gon.features = gon.features || {};
gon.features.enableClusterApplicationElasticStack = true; gon.features.enableClusterApplicationElasticStack = true;
gon.features.enableClusterApplicationCrossplane = true;
}); });
afterEach(() => { afterEach(() => {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment