update and merge doc changes

Author: jshum2479

electron/app/locales/en/webui.json

@@ -658,7 +658,8 @@
 
   "ingress-design-ingress-route-name-field-validation-error": "Route {{routeName}}",
   "ingress-design-ingress-route-field-validation-error": "Route: {{routeName}}, Field: {{fieldName}}",
-  "ingress-design-ingress-route-field-tls-config-error": "The route {{routeName}} has the {{fieldName}} field enabled but the {{specifyTlsSecretFieldName}} field is disabled.",
+  "ingress-design-ingress-route-field-tls-config-error": "The route '{{routeName}}' has the '{{fieldName}}' set to '{{tlsOption}}' but the '{{specifyTlsSecretFieldName}}' field is disabled.",
+  "ingress-design-ingress-route-field-tls-config-passthrough-error": "The route '{{routeName}}' has the '{{fieldName}}' set to '{{tlsOption}}' but the '{{virtualHostFieldName}}' field is not set, you must provide an valid DNS name in '{{virtualHostFieldName}}'",
 
   "ingress-design-ingress-tls-secret-title": "TLS Secret for Ingress Routes",
   "ingress-design-specify-tls-secret-label": "Use Ingress TLS Secret",

webui/src/js/utils/ingress-routes-updater.js

@@ -491,6 +491,11 @@ function(IngressActionsBase, project, wktConsole, k8sHelper, i18n, projectIo, di
             });
           }
         }
+
+        if (ingressDefinition['virtualHost']) {
+          externalLoadBalancerHost = '//' + ingressDefinition['virtualHost'];
+        }
+
         if (useNodePort) {
           if (ingressDefinition['tlsOption'] !== 'plain') {
             results['accessPoint'] = 'https:' + externalLoadBalancerHost + ':' + ingressSSLPort  + ingressDefinition.path;
@@ -625,11 +630,27 @@ function(IngressActionsBase, project, wktConsole, k8sHelper, i18n, projectIo, di
         });
         const errMessage = i18n.t('ingress-design-ingress-route-field-tls-config-error', {
           routeName: data['name'],
+          tlsOption: i18n.t('ingress-design-ingress-route-tlsoption-ssl-terminate-ingress'),
           fieldName: i18n.t('ingress-design-ingress-route-tls-label'),
           specifyTlsSecretFieldName: i18n.t('ingress-design-specify-tls-secret-label')
         });
         validationObject.addField(errFieldMessage, errMessage, routeConfig);
       }
+
+      if (data['tlsOption'] === 'ssl_passthrough' && !data['virtualHost']) {
+        errFieldMessage = i18n.t('ingress-design-ingress-route-field-validation-error', {
+          routeName: data['name'],
+          fieldName: i18n.t('ingress-design-ingress-route-virtualhost-label')
+        });
+        const errMessage = i18n.t('ingress-design-ingress-route-field-tls-config-passthrough-error', {
+          routeName: data['name'],
+          tlsOption: i18n.t('ingress-design-ingress-route-tlsoption-ssl-passthrough'),
+          fieldName: i18n.t('ingress-design-ingress-route-virtualhost-label'),
+          virtualHostFieldName: i18n.t('ingress-design-ingress-route-virtualhost-label')
+        });
+        validationObject.addField(errFieldMessage, errMessage, routeConfig);
+      }
+
     }
   }
 

webui/src/js/views/route-edit-dialog.html

@@ -60,6 +60,7 @@
           </oj-bind-for-each>
         </oj-radioset>
 
+
         <oj-bind-if test="[[askIfConsoleService() === true]]">
           <oj-switch label-hint="[[labelMapper('route-is-console-svc-label')]]"
                      value="{{isConsoleService.observable}}"