From ae709b3da9903f24d071b3cba369a1e24f18f428 Mon Sep 17 00:00:00 2001
From: Westly Wright <westly.wright@gmail.com>
Date: Mon, 15 Oct 2018 12:26:11 -0700
Subject: [PATCH] ingress model missing canHaveLabels property

rancher/rancher#15096
rancher/rancher#16112
---
 app/components/form-labels-annotations/template.hbs   |  2 +-
 app/models/ingress.js                                 | 11 ++++++-----
 .../components/form-ssl-termination/template.hbs      | 10 ++++++----
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/app/components/form-labels-annotations/template.hbs b/app/components/form-labels-annotations/template.hbs
index 5145653b8..d5bc11a3f 100644
--- a/app/components/form-labels-annotations/template.hbs
+++ b/app/components/form-labels-annotations/template.hbs
@@ -66,7 +66,7 @@
       {{/if}}
     {{/if}}
     {{#unless editing}}
-      <div class="pt-20"></div>
+      <hr class="mt-20 mb-20"/>
     {{/unless}}
     <div class="col {{if editing 'span-6' 'span-12'}}">
       {{#if editing}}
diff --git a/app/models/ingress.js b/app/models/ingress.js
index 3e051d844..bc4fe72d5 100644
--- a/app/models/ingress.js
+++ b/app/models/ingress.js
@@ -4,14 +4,15 @@ import { reference } from 'ember-api-store/utils/denormalize';
 import { inject as service } from '@ember/service';
 
 export default Resource.extend({
-  clusterStore: service(),
-  router:       service(),
+  clusterStore:  service(),
+  router:        service(),
 
-  type: 'ingress',
+  type:          'ingress',
 
-  canClone: true,
+  canClone:      true,
+  canHaveLabels: true,
 
-  namespace: reference('namespaceId', 'namespace', 'clusterStore'),
+  namespace:     reference('namespaceId', 'namespace', 'clusterStore'),
 
   targets: computed('rules.@each.paths', function() {
     const out = [];
diff --git a/lib/shared/addon/components/form-ssl-termination/template.hbs b/lib/shared/addon/components/form-ssl-termination/template.hbs
index 5dc1f94f6..f4792c059 100644
--- a/lib/shared/addon/components/form-ssl-termination/template.hbs
+++ b/lib/shared/addon/components/form-ssl-termination/template.hbs
@@ -24,10 +24,12 @@
   {{else}}
     <div class="text-center">
       <div class="text-muted mb-20">{{t 'formSslTermination.noCertificatesConfiged'}}</div>
-      <button class="btn bg-link icon-btn inline-block " {{action "addCert"}}>
-        <span class="darken"><i class="icon icon-plus text-small"></i></span>
-        <span>{{t 'formSslTermination.addCertLabel'}}</span>
-      </button>
+      {{#if editing}}
+        <button class="btn bg-link icon-btn inline-block " {{action "addCert"}}>
+          <span class="darken"><i class="icon icon-plus text-small"></i></span>
+          <span>{{t 'formSslTermination.addCertLabel'}}</span>
+        </button>
+      {{/if}}
     </div>
   {{/each}}
   {{#if (and editing allCertificates.length)}}