Merge pull request #1889 from loganhz/catalog

Catalog

app/models/cluster.js

@@ -4,7 +4,7 @@ import { inject as service } from '@ember/service';
 import Resource from 'ember-api-store/models/resource';
 import { hasMany } from 'ember-api-store/utils/denormalize';
 import ResourceUsage from 'shared/mixins/resource-usage';
-import { alias } from '@ember/object/computed';
+import { equal, alias } from '@ember/object/computed';
 import { resolve } from 'rsvp';
 
 export default Resource.extend(ResourceUsage, {
@@ -20,6 +20,7 @@ export default Resource.extend(ResourceUsage, {
   machines: alias('nodes'),
   clusterRoleTemplateBindings: hasMany('id', 'clusterRoleTemplateBinding', 'clusterId'),
   roleTemplateBindings: alias('clusterRoleTemplateBindings'),
+  isGKE: equal('driver', 'googleKubernetesEngine'),
 
   actions: {
     edit() {

lib/shared/addon/components/input-answers/component.js

@@ -6,6 +6,8 @@ import { isSafari } from 'ui/utils/platform';
 import { evaluate } from 'shared/utils/evaluate';
 import layout from './template';
 
+const HIDDEN = 'Hidden';
+
 export default Component.extend({
   layout,
   originQuestions: alias('selectedTemplate.questions'),
@@ -119,6 +121,10 @@ export default Component.extend({
 
     filterdQuestions.forEach((item) => {
       if ( item.group ) {
+        if ( item.group === HIDDEN ) {
+          return;
+        }
+
         if ( !sections[item.group] ) {
           sections[item.group] = [];
         }

lib/shared/addon/components/new-catalog/component.js

@@ -21,6 +21,8 @@ export default Component.extend(NewOrEdit, {
   settings:                 service(),
   globalStore:              service(),
 
+  isGKE:                    alias('scope.currentCluster.isGKE'),
+
   namespaceErrors:          null,
   allTemplates:             null,
   templateResource:         null,

lib/shared/addon/components/new-catalog/template.hbs

@@ -186,6 +186,15 @@
     </section>
   {{/if}}
 
+  {{#if isGKE}}
+    <div class="banner bg-warning">
+      <div class="banner-icon"><span class="icon icon-alert"></span></div>
+      <div class="banner-message">
+        <p>{{t 'ingressPage.gkeIngressWarning'}}</p>
+      </div>
+    </div>
+  {{/if}}
+
   {{#if errors.length}}
     <section>
       <div class="row">

lib/shared/addon/components/new-edit-ingress/component.js

@@ -9,6 +9,7 @@ import layout from './template';
 export default Component.extend(NewOrEdit, {
   layout,
   intl: service(),
+  scope: service(),
 
   ingress: null,
   editing: null,
@@ -16,6 +17,8 @@ export default Component.extend(NewOrEdit, {
   namespacedCertificates: null,
   certificates: null,
 
+  isGKE: alias('scope.currentCluster.isGKE'),
+
   primaryResource: alias('ingress'),
 
   actions: {

lib/shared/addon/components/new-edit-ingress/template.hbs

@@ -52,5 +52,14 @@
   }}
 {{/accordion-list}}
 
+{{#if isGKE}}
+  <div class="banner bg-warning">
+    <div class="banner-icon"><span class="icon icon-alert"></span></div>
+    <div class="banner-message">
+      <p>{{t 'ingressPage.gkeIngressWarning'}}</p>
+    </div>
+  </div>
+{{/if}}
+
 {{top-errors errors=errors}}
 {{save-cancel editing=true save="save" cancel="cancel"}}

translations/en-us.yaml

@@ -704,6 +704,7 @@ clustersPage:
 
 ingressPage:
   header: 'Ingress: {name}'
+  gkeIngressWarning: 'It may take a few minutes for Kubernetes Engine to allocate an external IP address and prepare the load balancer. In the meanwhile, you may get errors like HTTP 404 and HTTP 500 until the load balancer is ready to serve the traffic.'
   table:
     targets:
       label: Targets