diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-09-06 10:57:52 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-09-06 10:57:52 +0000 |
| commit | 7d3f04b20cfd6b88f02e42987804be1b3999e84d (patch) | |
| tree | 9dfff496c3fa5ab2cb5f6a35753b87cb00619804 /app | |
| parent | 7cae5773681819a46f8899e983fbd0c7309001f7 (diff) | |
| parent | 01f440e74be51e02c79aff9ac5b6d11a74dcd080 (diff) | |
| download | gitlab-ce-7d3f04b20cfd6b88f02e42987804be1b3999e84d.tar.gz | |
Merge branch 'instance-group-level-knative' into 'master'
Enable Knative installation on group and instance level clusters
Closes #62667 and #62666
See merge request gitlab-org/gitlab-ce!32128
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/clusters/components/applications.vue | 1 | ||||
| -rw-r--r-- | app/models/clusters/cluster.rb | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/app/assets/javascripts/clusters/components/applications.vue b/app/assets/javascripts/clusters/components/applications.vue index b6da572b201..27959898fb7 100644 --- a/app/assets/javascripts/clusters/components/applications.vue +++ b/app/assets/javascripts/clusters/components/applications.vue @@ -458,7 +458,6 @@ export default { </div> </application-row> <application-row - v-if="isProjectCluster" id="knative" :logo-url="knativeLogo" :title="applications.knative.title" diff --git a/app/models/clusters/cluster.rb b/app/models/clusters/cluster.rb index ef1af1fc8bc..a976093ac0c 100644 --- a/app/models/clusters/cluster.rb +++ b/app/models/clusters/cluster.rb @@ -10,7 +10,6 @@ module Clusters self.table_name = 'clusters' PROJECT_ONLY_APPLICATIONS = { - Applications::Knative.application_name => Applications::Knative }.freeze APPLICATIONS = { Applications::Helm.application_name => Applications::Helm, @@ -18,7 +17,8 @@ module Clusters Applications::CertManager.application_name => Applications::CertManager, Applications::Prometheus.application_name => Applications::Prometheus, Applications::Runner.application_name => Applications::Runner, - Applications::Jupyter.application_name => Applications::Jupyter + Applications::Jupyter.application_name => Applications::Jupyter, + Applications::Knative.application_name => Applications::Knative }.merge(PROJECT_ONLY_APPLICATIONS).freeze DEFAULT_ENVIRONMENT = '*' KUBE_INGRESS_BASE_DOMAIN = 'KUBE_INGRESS_BASE_DOMAIN' |