diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-06 21:07:59 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-06 21:07:59 +0000 |
| commit | 1c25ac983cd1e4335faa1ec4922c314d6321e224 (patch) | |
| tree | 68d88ab5d9ed5c3397e52fe85fc38ab237335a91 /app/models/clusters | |
| parent | 83731155d997ae24c7e0cd5ffa6f0dba41bec6dc (diff) | |
| download | gitlab-ce-1c25ac983cd1e4335faa1ec4922c314d6321e224.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/clusters')
| -rw-r--r-- | app/models/clusters/applications/ingress.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/models/clusters/applications/ingress.rb b/app/models/clusters/applications/ingress.rb index 233920f4fe2..0158d909468 100644 --- a/app/models/clusters/applications/ingress.rb +++ b/app/models/clusters/applications/ingress.rb @@ -4,6 +4,7 @@ module Clusters module Applications class Ingress < ApplicationRecord VERSION = '1.29.7' + INGRESS_CONTAINER_NAME = 'nginx-ingress-controller' MODSECURITY_LOG_CONTAINER_NAME = 'modsecurity-log' self.table_name = 'clusters_applications_ingress' @@ -69,7 +70,7 @@ module Clusters end def ingress_service - cluster.kubeclient.get_service('ingress-nginx-ingress-controller', Gitlab::Kubernetes::Helm::NAMESPACE) + cluster.kubeclient.get_service("ingress-#{INGRESS_CONTAINER_NAME}", Gitlab::Kubernetes::Helm::NAMESPACE) end private @@ -123,7 +124,7 @@ module Clusters { "name" => "modsecurity-template-volume", "configMap" => { - "name" => "ingress-nginx-ingress-controller", + "name" => "ingress-#{INGRESS_CONTAINER_NAME}", "items" => [ { "key" => "modsecurity.conf", |