Commit f522f8c8 authored by Thong Kuah's avatar Thong Kuah

Merge branch '28492-upgrade-ingress-to-latest' into 'master'

Unpin ingress-controller image version, bump ingress chart to 1.22.1

Closes #28492

See merge request gitlab-org/gitlab!18047
parents 3b1d12a0 6859fb48
......@@ -3,7 +3,7 @@
module Clusters
module Applications
class Ingress < ApplicationRecord
VERSION = '1.1.2'
VERSION = '1.22.1'
self.table_name = 'clusters_applications_ingress'
......
---
title: Unpin ingress image version, upgrade chart to 1.22.1
merge_request: 18047
author:
type: added
......@@ -96,7 +96,7 @@ describe Clusters::Applications::Ingress do
it 'is initialized with ingress arguments' do
expect(subject.name).to eq('ingress')
expect(subject.chart).to eq('stable/nginx-ingress')
expect(subject.version).to eq('1.1.2')
expect(subject.version).to eq('1.22.1')
expect(subject).to be_rbac
expect(subject.files).to eq(ingress.files)
end
......@@ -113,7 +113,7 @@ describe Clusters::Applications::Ingress do
let(:ingress) { create(:clusters_applications_ingress, :errored, version: 'nginx') }
it 'is initialized with the locked version' do
expect(subject.version).to eq('1.1.2')
expect(subject.version).to eq('1.22.1')
end
end
end
......
controller:
image:
tag: "0.10.2"
repository: "quay.io/kubernetes-ingress-controller/nginx-ingress-controller"
stats:
enabled: true
......
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