diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-25 18:09:25 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-25 18:09:25 +0300 |
| commit | ec558ad8ed732ff6f8a89aa3651eb92c27c50deb (patch) | |
| tree | e6d0eb5946758007594e8bf6feb5fb9759f48d6c /app/models/clusters | |
| parent | 7b1fa4c1a1b784c2f78405dca82e56a009f1e773 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/clusters')
| -rw-r--r-- | app/models/clusters/applications/cilium.rb | 21 | ||||
| -rw-r--r-- | app/models/clusters/cluster.rb | 4 |
2 files changed, 1 insertions, 24 deletions
diff --git a/app/models/clusters/applications/cilium.rb b/app/models/clusters/applications/cilium.rb deleted file mode 100644 index 7936b0b18de..00000000000 --- a/app/models/clusters/applications/cilium.rb +++ /dev/null @@ -1,21 +0,0 @@ -# frozen_string_literal: true - -module Clusters - module Applications - class Cilium < ApplicationRecord - self.table_name = 'clusters_applications_cilium' - - include ::Clusters::Concerns::ApplicationCore - include ::Clusters::Concerns::ApplicationStatus - - # Cilium can only be installed and uninstalled through the - # cluster-applications project by triggering CI pipeline for a - # management project. UI operations are not available for such - # applications. More information: - # https://docs.gitlab.com/ee/user/clusters/management_project.html - def allowed_to_uninstall? - false - end - end - end -end diff --git a/app/models/clusters/cluster.rb b/app/models/clusters/cluster.rb index af6cafc4a62..84e9b6a8df7 100644 --- a/app/models/clusters/cluster.rb +++ b/app/models/clusters/cluster.rb @@ -19,8 +19,7 @@ module Clusters Clusters::Applications::Prometheus.application_name => Clusters::Applications::Prometheus, Clusters::Applications::Runner.application_name => Clusters::Applications::Runner, Clusters::Applications::Jupyter.application_name => Clusters::Applications::Jupyter, - Clusters::Applications::Knative.application_name => Clusters::Applications::Knative, - Clusters::Applications::Cilium.application_name => Clusters::Applications::Cilium + Clusters::Applications::Knative.application_name => Clusters::Applications::Knative }.freeze DEFAULT_ENVIRONMENT = '*' KUBE_INGRESS_BASE_DOMAIN = 'KUBE_INGRESS_BASE_DOMAIN' @@ -64,7 +63,6 @@ module Clusters has_one_cluster_application :runner has_one_cluster_application :jupyter has_one_cluster_application :knative - has_one_cluster_application :cilium has_many :kubernetes_namespaces has_many :metrics_dashboard_annotations, class_name: 'Metrics::Dashboard::Annotation', inverse_of: :cluster |