Merge branch 'bump-ingress-chart-112' into 'master'
Bump nginx-ingress chart to 1.1.2 See merge request gitlab-org/gitlab-ce!24203
This commit is contained in:
commit
fb8e9509c8
3 changed files with 9 additions and 4 deletions
|
@ -3,7 +3,7 @@
|
||||||
module Clusters
|
module Clusters
|
||||||
module Applications
|
module Applications
|
||||||
class Ingress < ActiveRecord::Base
|
class Ingress < ActiveRecord::Base
|
||||||
VERSION = '0.23.0'.freeze
|
VERSION = '1.1.2'.freeze
|
||||||
|
|
||||||
self.table_name = 'clusters_applications_ingress'
|
self.table_name = 'clusters_applications_ingress'
|
||||||
|
|
||||||
|
|
5
changelogs/unreleased/bump-ingress-chart-112.yml
Normal file
5
changelogs/unreleased/bump-ingress-chart-112.yml
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
title: Bump nginx-ingress chart to 1.1.2
|
||||||
|
merge_request: 24203
|
||||||
|
author:
|
||||||
|
type: other
|
|
@ -35,7 +35,7 @@ describe Clusters::Applications::Ingress do
|
||||||
let(:application) { create(:clusters_applications_ingress, :scheduled, version: '0.22.0') }
|
let(:application) { create(:clusters_applications_ingress, :scheduled, version: '0.22.0') }
|
||||||
|
|
||||||
it 'updates the application version' do
|
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
|
end
|
||||||
end
|
end
|
||||||
|
@ -90,7 +90,7 @@ describe Clusters::Applications::Ingress do
|
||||||
it 'should be initialized with ingress arguments' do
|
it 'should be 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('0.23.0')
|
expect(subject.version).to eq('1.1.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
|
||||||
|
@ -107,7 +107,7 @@ describe Clusters::Applications::Ingress do
|
||||||
let(:ingress) { create(:clusters_applications_ingress, :errored, version: 'nginx') }
|
let(:ingress) { create(:clusters_applications_ingress, :errored, version: 'nginx') }
|
||||||
|
|
||||||
it 'should be initialized with the locked version' do
|
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
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue