Merge branch 'bump-ingress-chart-112' into 'master'

Bump nginx-ingress chart to 1.1.2

See merge request gitlab-org/gitlab-ce!24203

3 files changed, 9 insertions, 4 deletions

diff --git a/app/models/clusters/applications/ingress.rb b/app/models/clusters/applications/ingress.rb
index 7799f069742..7c15aaa4825 100644
--- a/app/models/clusters/applications/ingress.rb
+++ b/app/models/clusters/applications/ingress.rb
@@ -3,7 +3,7 @@
 module Clusters
   module Applications
     class Ingress < ActiveRecord::Base
-      VERSION = '0.23.0'.freeze
+      VERSION = '1.1.2'.freeze
 
       self.table_name = 'clusters_applications_ingress'
 
diff --git a/changelogs/unreleased/bump-ingress-chart-112.yml b/changelogs/unreleased/bump-ingress-chart-112.yml
new file mode 100644
index 00000000000..8a46fedb4b0
--- /dev/null
+++ b/changelogs/unreleased/bump-ingress-chart-112.yml
@@ -0,0 +1,5 @@
+---
+title: Bump nginx-ingress chart to 1.1.2
+merge_request: 24203
+author:
+type: other
diff --git a/spec/models/clusters/applications/ingress_spec.rb b/spec/models/clusters/applications/ingress_spec.rb
index de313a8ca36..52c347229c6 100644
--- a/spec/models/clusters/applications/ingress_spec.rb
+++ b/spec/models/clusters/applications/ingress_spec.rb
@@ -35,7 +35,7 @@ describe Clusters::Applications::Ingress do
       let(:application) { create(:clusters_applications_ingress, :scheduled, version: '0.22.0') }
 
       it 'updates the application version' do
-        expect(application.reload.version).to eq('0.23.0')
+        expect(application.reload.version).to eq('1.1.2')
       end
     end
   end
@@ -90,7 +90,7 @@ describe Clusters::Applications::Ingress do
     it 'should be initialized with ingress arguments' do
       expect(subject.name).to eq('ingress')
       expect(subject.chart).to eq('stable/nginx-ingress')
-      expect(subject.version).to eq('0.23.0')
+      expect(subject.version).to eq('1.1.2')
       expect(subject).to be_rbac
       expect(subject.files).to eq(ingress.files)
     end
@@ -107,7 +107,7 @@ describe Clusters::Applications::Ingress do
       let(:ingress) { create(:clusters_applications_ingress, :errored, version: 'nginx') }
 
       it 'should be initialized with the locked version' do
-        expect(subject.version).to eq('0.23.0')
+        expect(subject.version).to eq('1.1.2')
       end
     end
   end