update and add version label to ingress object

Author: jshum2479

electron/app/js/ipcRendererPreload.js

@@ -229,6 +229,7 @@ contextBridge.exposeInMainWorld(
       isMac: () => osUtils.isMac(),
       isLinux: () => osUtils.isLinux(),
       getApplicationName: () => wktApp.getApplicationName(),
+      getVersion: () => wktApp.getApplicationVersion(),
       getArgv: (name) => osUtils.getArgv(name)
     },
     'i18n': {

electron/app/locales/en/webui.json

@@ -609,7 +609,7 @@
   "ingress-design-voyager-provider-label": "Kubernetes Cluster Provider for Voyager",
   "ingress-design-voyager-provider-help": "The Kubernetes cluster provider type to use for Voyager.",
   "ingress-design-nginx-allow-passthrough-label": "Allow SSL pass through to backend service",
-  "ingress-design-nginx-allow-passthrough-help": "Enable this allows creating ssl ingress pass through to the backend service.",
+  "ingress-design-nginx-allow-passthrough-help": "Enable this allows creating SSL pass through ingress transport to the target service.",
   "ingress-design-specify-docker-registry-secret-label": "Use Docker Hub Secret",
   "ingress-design-specify-docker-registry-secret-help": "Whether to use a Docker Hub credential secret to pull the ingress controller image.  This is helpful if you encounter a Docker Hub pull limit exceeded error.",
   "ingress-design-ingress-docker-reg-secret-name": "Docker Registry Secret Name",
@@ -632,11 +632,12 @@
   "ingress-design-ingress-route-targetport-label": "Target Port",
   "ingress-design-ingress-route-path-label": "Path Expression",
   "ingress-design-ingress-route-tls-label": "Transport Options",
+  "ingress-design-ingress-route-tls-help": "Select the transport option for this ingress route",
   "ingress-design-ingress-route-tlsoption-plain": "Plain HTTP",
-  "ingress-design-ingress-route-tlsoption-ssl-passthrough": "HTTPS pass through to the target service",
-  "ingress-design-ingress-route-tlsoption-ssl-terminate-ingress": "HTTPS terminate at ingress and plain HTTP traffic from ingress to target service",
+  "ingress-design-ingress-route-tlsoption-ssl-passthrough": "SSL pass through ingress directly to the target service",
+  "ingress-design-ingress-route-tlsoption-ssl-terminate-ingress": "SSL terminate at ingress and then plain HTTP traffic from ingress to target service",
   "ingress-design-ingress-route-is-console-svc-label": "Is target service WebLogic Console?",
-  "ingress-design-ingress-route-is-console-svc-help": "For SSL terminating at ingress and accessing WebLogic Console, turn on this option",
+  "ingress-design-ingress-route-is-console-svc-help": "For SSL terminating at ingress and accessing WebLogic Console Service, turn on this option",
   "ingress-design-ingress-route-name-label": "Name",
   "ingress-design-ingress-route-dialog-title": "Edit Ingress Route",
   "ingress-design-ingress-route-annotation-label": "Annotation",

webui/src/js/utils/ingress-resource-generator.js

@@ -41,13 +41,14 @@ define(['models/wkt-project', 'js-yaml'],
 
       createVoyagerRoutesAsYaml(item) {
         const namespace = item['targetServiceNameSpace'] || 'default';
-
+        const version = window.api.process.getVersion();
         const result = {
           apiVersion: 'voyager.appscode.com/v1beta1',
           kind: 'Ingress',
           metadata: {
             name: item['name'],
             namespace: namespace,
+            labels: { createdByWtkUIVersion: version}
           },
           spec: {
             rules: [
@@ -76,13 +77,15 @@ define(['models/wkt-project', 'js-yaml'],
 
       createNginxRoutesAsYaml(item) {
         const namespace = item['targetServiceNameSpace'] || 'default';
+        const version = window.api.process.getVersion();
 
         const result = {
           apiVersion: 'networking.k8s.io/v1',
           kind: 'Ingress',
           metadata: {
             name: item['name'],
             namespace: namespace,
+            labels: { createdByWtkUIVersion: version}
           },
           spec: {
             rules: [
@@ -109,17 +112,22 @@ define(['models/wkt-project', 'js-yaml'],
         };
         this.addTlsSpec(result, item);
         this.addVirtualHost(result, item);
-        this.addAnnotations(result, item);
 
         if (this.isSSLTerminateAtIngress(item)) {
           if (item['isConsoleService']) {
-            const snippet = 'more_clear_input_headers "WL-Proxy-Client-IP" "WL-Proxy-SSL";\n'
+            if (!('annotations' in item)) {
+              item['annotations'] = {};
+            }
+            // must have nl at the end
+            item.annotations['nginx.ingress.kubernetes.io/configuration-snippet'] = 'more_clear_input_headers' +
+              ' "WL-Proxy-Client-IP" "WL-Proxy-SSL";\n'
               + 'more_set_input_headers "X-Forwarded-Proto: https";\n'
-              + 'more_set_input_headers "WL-Proxy-SSL: true";\n';  // must have nl at the end
-            result.metadata.annotations['nginx.ingress.kubernetes.io/configuration-snippet'] = snippet;
-            result.metadata.annotations['nginx.ingress.kubernetes.io/ingress.allow-http'] = 'false';
+              + 'more_set_input_headers "WL-Proxy-SSL: true";\n';
+            item.annotations['nginx.ingress.kubernetes.io/ingress.allow-http'] = 'false';
           }
         }
+
+        this.addAnnotations(result, item);
         return jsYaml.dump(result);
       }
 
@@ -150,13 +158,15 @@ define(['models/wkt-project', 'js-yaml'],
       createTraefikMiddlewaresAsYaml(item) {
 
         const namespace = item['targetServiceNameSpace'] || 'default';
+        const version = window.api.process.getVersion();
 
         const result = {
           apiVersion: 'traefik.containo.us/v1alpha1',
           kind: 'Middleware',
           metadata: {
             name: item['name'] + '-middleware',
             namespace: namespace,
+            labels: { createdByWtkUIVersion: version}
           }
         };
 

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

@@ -47,6 +47,7 @@
 
         <oj-radioset id="tlsOptionId"
                      label-hint="[[labelMapper('route-tls-label')]]"
+                     help.instruction="[[labelMapper('route-tls-help')]]"
                      label-edge="inside"
                      on-value-changed = "[[transportValueChanged]]"
                      value="{{tlsOption.observable}}">

webui/src/test/ingress-definition-test.js

@@ -12,10 +12,11 @@ const expect = chai.expect;
 const wkt_assertions = require('./wkt-assertions');
 chai.use(wkt_assertions);
 
-const { after, before, describe, it } = require('mocha');
+const { after, before, beforeEach, describe, it } = require('mocha');
 const requirejs = require('requirejs');
 const testHelper = require('./test-helper');
 const jsyaml = require('js-yaml');
+const {WindowStub} = require('./window-stub');
 
 describe('ingress-definition', function () {
   let ingressResource;
@@ -30,15 +31,21 @@ describe('ingress-definition', function () {
 
   before(function (done) {
     testHelper.install();
+    WindowStub.install();
     requirejs(['utils/ingress-resource-generator'],
       function (IngressResourceGenerator) {
         ingressResource = new IngressResourceGenerator();
         done();
       });
   });
 
+  beforeEach(function () {
+    WindowStub.initialize();
+  });
+
   after(function() {
     testHelper.remove();
+    WindowStub.remove();
   });
 
   describe('generate', function() {

webui/src/test/window-stub.js

@@ -56,6 +56,9 @@ class WindowStub {
         }
       },
       process: {
+        getVersion: () => {
+          return '1.1.0';
+        },
         isWindows: () => {
           return _isWindows;
         },