Commit 83764276 authored by Ash McKenzie's avatar Ash McKenzie

Merge branch 'update_ingress_chart_version' into 'master'

Update Ingress chart version to 1.29.7

See merge request gitlab-org/gitlab!25949
parents 5b12631c e9badcb3
......@@ -3,7 +3,7 @@
module Clusters
module Applications
class Ingress < ApplicationRecord
VERSION = '1.29.3'
VERSION = '1.29.7'
MODSECURITY_LOG_CONTAINER_NAME = 'modsecurity-log'
self.table_name = 'clusters_applications_ingress'
......
---
title: 'Update Ingress chart version to 1.29.7'
merge_request: 25949
author:
type: added
......@@ -102,7 +102,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.29.3')
expect(subject.version).to eq('1.29.7')
expect(subject).to be_rbac
expect(subject.files).to eq(ingress.files)
end
......@@ -119,7 +119,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.29.3')
expect(subject.version).to eq('1.29.7')
end
end
end
......@@ -135,6 +135,7 @@ describe Clusters::Applications::Ingress do
expect(values).to include('repository')
expect(values).to include('stats')
expect(values).to include('podAnnotations')
expect(values).to include('clusterIP')
end
end
......
......@@ -6,3 +6,8 @@ controller:
podAnnotations:
prometheus.io/scrape: "true"
prometheus.io/port: "10254"
service:
clusterIP: "-"
defaultBackend:
service:
clusterIP: "-"
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