Automatic merge of gitlab-org/gitlab-ce master

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'
 

changelogs/unreleased/auto-devops-kubectl-1-11-6.yml

+---
+title: Bump kubectl in Auto DevOps to 1.11.6
+merge_request: 24176
+author:
+type: other

changelogs/unreleased/bump-ingress-chart-112.yml

+---
+title: Bump nginx-ingress chart to 1.1.2
+merge_request: 24203
+author:
+type: other

lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml

@@ -49,7 +49,7 @@ variables:
   POSTGRES_ENABLED: "true"
   POSTGRES_DB: $CI_ENVIRONMENT_SLUG
 
-  KUBERNETES_VERSION: 1.10.9
+  KUBERNETES_VERSION: 1.11.6
   HELM_VERSION: 2.11.0
 
   DOCKER_DRIVER: overlay2

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