Automatic merge of gitlab-org/gitlab-ce master

app/assets/javascripts/clusters/clusters_bundle.js

@@ -288,10 +288,11 @@ export default class Clusters {
   }
 
   toggleIngressDomainHelpText(ingressPreviousState, ingressNewState) {
-    const helpTextHidden = ingressNewState.status !== APPLICATION_STATUS.INSTALLED;
-    const domainSnippetText = `${ingressNewState.externalIp}${INGRESS_DOMAIN_SUFFIX}`;
+    const { externalIp, status } = ingressNewState;
+    const helpTextHidden = status !== APPLICATION_STATUS.INSTALLED || !externalIp;
+    const domainSnippetText = `${externalIp}${INGRESS_DOMAIN_SUFFIX}`;
 
-    if (ingressPreviousState.status !== ingressNewState.status) {
+    if (ingressPreviousState.status !== status) {
       this.ingressDomainHelpText.classList.toggle('hide', helpTextHidden);
       this.ingressDomainSnippet.textContent = domainSnippetText;
     }

changelogs/unreleased/60068-avoid-null-domain-help-text.yml

+---
+title: Do not display Ingress IP help text when there isn’t an Ingress IP assigned
+merge_request: 27057
+author:
+type: fixed

changelogs/unreleased/bump_kubernetes_1_11_9.yml

----
-title: Bump Helm and kubectl used in Kubernetes integration to 2.13.1 and 1.11.9 respectively
-merge_request: 26991
-author:
-type: other

lib/gitlab/kubernetes/helm.rb

@@ -3,8 +3,8 @@
 module Gitlab
   module Kubernetes
     module Helm
-      HELM_VERSION = '2.13.1'.freeze
-      KUBECTL_VERSION = '1.11.9'.freeze
+      HELM_VERSION = '2.12.3'.freeze
+      KUBECTL_VERSION = '1.11.7'.freeze
       NAMESPACE = 'gitlab-managed-apps'.freeze
       SERVICE_ACCOUNT = 'tiller'.freeze
       CLUSTER_ROLE_BINDING = 'tiller-admin'.freeze

spec/javascripts/clusters/clusters_bundle_spec.js

@@ -300,9 +300,13 @@ describe('Clusters', () => {
 
   describe('toggleIngressDomainHelpText', () => {
     const { INSTALLED, INSTALLABLE, NOT_INSTALLABLE } = APPLICATION_STATUS;
+    let ingressPreviousState;
+    let ingressNewState;
 
-    const ingressPreviousState = { status: INSTALLABLE };
-    const ingressNewState = { status: INSTALLED, externalIp: '127.0.0.1' };
+    beforeEach(() => {
+      ingressPreviousState = { status: INSTALLABLE };
+      ingressNewState = { status: INSTALLED, externalIp: '127.0.0.1' };
+    });
 
     describe(`when ingress application new status is ${INSTALLED}`, () => {
       beforeEach(() => {
@@ -333,7 +337,7 @@ describe('Clusters', () => {
     });
 
     describe('when ingress application new status and old status are the same', () => {
-      it('does not modify custom domain help text', () => {
+      it('does not display custom domain help text', () => {
         ingressPreviousState.status = INSTALLED;
         ingressNewState.status = ingressPreviousState.status;
 
@@ -342,5 +346,15 @@ describe('Clusters', () => {
         expect(cluster.ingressDomainHelpText.classList.contains('hide')).toEqual(true);
       });
     });
+
+    describe(`when ingress new status is ${INSTALLED} and there isn’t an ip assigned`, () => {
+      it('does not display custom domain help text', () => {
+        ingressNewState.externalIp = null;
+
+        cluster.toggleIngressDomainHelpText(ingressPreviousState, ingressNewState);
+
+        expect(cluster.ingressDomainHelpText.classList.contains('hide')).toEqual(true);
+      });
+    });
   });
 });

spec/lib/gitlab/kubernetes/helm/pod_spec.rb

@@ -30,7 +30,7 @@ describe Gitlab::Kubernetes::Helm::Pod do
       it 'generates the appropriate specifications for the container' do
         container = subject.generate.spec.containers.first
         expect(container.name).to eq('helm')
-        expect(container.image).to eq('registry.gitlab.com/gitlab-org/cluster-integration/helm-install-image/releases/2.13.1-kube-1.11.9')
+        expect(container.image).to eq('registry.gitlab.com/gitlab-org/cluster-integration/helm-install-image/releases/2.12.3-kube-1.11.7')
         expect(container.env.count).to eq(3)
         expect(container.env.map(&:name)).to match_array([:HELM_VERSION, :TILLER_NAMESPACE, :COMMAND_SCRIPT])
         expect(container.command).to match_array(["/bin/sh"])