Commit d6146737 authored by Michael Kozono's avatar Michael Kozono

Merge branch 'jcunha-update-ingress-version' into 'master'

Updates Ingress version to 1.40.2

See merge request gitlab-org/gitlab!35924
parents 1592c72f 042b4ac6
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
module Clusters module Clusters
module Applications module Applications
class Ingress < ApplicationRecord class Ingress < ApplicationRecord
VERSION = '1.29.7' VERSION = '1.40.2'
INGRESS_CONTAINER_NAME = 'nginx-ingress-controller' INGRESS_CONTAINER_NAME = 'nginx-ingress-controller'
MODSECURITY_LOG_CONTAINER_NAME = 'modsecurity-log' MODSECURITY_LOG_CONTAINER_NAME = 'modsecurity-log'
MODSECURITY_MODE_LOGGING = "DetectionOnly" MODSECURITY_MODE_LOGGING = "DetectionOnly"
......
---
title: Updates GitLab managed app Ingress version to 1.40.2
merge_request: 35924
author:
type: changed
...@@ -136,7 +136,7 @@ RSpec.describe Clusters::Applications::Ingress do ...@@ -136,7 +136,7 @@ RSpec.describe Clusters::Applications::Ingress do
it 'is initialized with ingress arguments' do it 'is initialized with ingress arguments' do
expect(subject.name).to eq('ingress') expect(subject.name).to eq('ingress')
expect(subject.chart).to eq('stable/nginx-ingress') expect(subject.chart).to eq('stable/nginx-ingress')
expect(subject.version).to eq('1.29.7') expect(subject.version).to eq('1.40.2')
expect(subject).to be_rbac expect(subject).to be_rbac
expect(subject.files).to eq(ingress.files) expect(subject.files).to eq(ingress.files)
end end
...@@ -153,7 +153,7 @@ RSpec.describe Clusters::Applications::Ingress do ...@@ -153,7 +153,7 @@ RSpec.describe Clusters::Applications::Ingress do
let(:ingress) { create(:clusters_applications_ingress, :errored, version: 'nginx') } let(:ingress) { create(:clusters_applications_ingress, :errored, version: 'nginx') }
it 'is initialized with the locked version' do it 'is initialized with the locked version' do
expect(subject.version).to eq('1.29.7') expect(subject.version).to eq('1.40.2')
end end
end end
end end
......
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