fixing kubectl version output parsing to work properly with Kubernetes 1.25+ (#217)

Author: robertpatrick

electron/app/js/kubectlUtils.js

@@ -281,7 +281,7 @@ async function getOperatorVersionFromDomainConfigMap(kubectlExe, domainNamespace
 }
 
 async function verifyClusterConnectivity(kubectlExe, options) {
-  const args = [ 'version', '--short' ];
+  const args = [ 'version', '-o', 'json' ];
   const httpsProxyUrl = getHttpsProxyUrl();
   const bypassProxyHosts = getBypassProxyHosts();
 
@@ -293,11 +293,11 @@ async function verifyClusterConnectivity(kubectlExe, options) {
   return new Promise(resolve => {
     executeFileCommand(kubectlExe, args, env).then(stdout => {
       if (stdout) {
-        const lines = stdout.split(/\r?\n/);
-        results.clientVersion = lines[0].trim().match(/.*(\d+\.\d+\.\d+).*/)[1];
+        const jsonOutput = JSON.parse(stdout);
+        results.clientVersion = jsonOutput?.clientVersion?.gitVersion;
         getLogger().debug('Kubernetes Client Version = %s', results.clientVersion);
-        if (lines.length > 1 && lines[1]) {
-          results.serverVersion = lines[1].trim().match(/.*(\d+\.\d+\.\d+).*/)[1];
+        if (jsonOutput?.serverVersion?.gitVersion) {
+          results.serverVersion = jsonOutput?.serverVersion?.gitVersion;
           getLogger().debug('Kubernetes Server Version = %s', results.serverVersion);
         }
       }

webui/package-lock.json

@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "@oracle/oraclejet": "^13.1.7",
-    "@oracle/wrc-jet-pack": "~2.4.2-develop",
+    "@oracle/wrc-jet-pack": "^2.4.2-develop.202303071626",
     "ace-builds": "^1.15.0",
     "i18next": "^22.4.9",
     "jquery": "^3.6.3",

webui/package.json

@@ -46,7 +46,8 @@
         'wdt-model-designer': 'jet-composites/wdt-model-designer/1.0.0',
         'cfe-navtree': 'jet-composites/cfe-navtree/1.0.0',
         'cfe-multi-select': 'jet-composites/cfe-multi-select/1.0.0',
-        'cfe-property-list-editor': 'jet-composites/cfe-property-list-editor/1.0.0'
+        'cfe-property-list-editor': 'jet-composites/cfe-property-list-editor/1.0.0',
+        'cfe-policy-editor': 'jet-composites/cfe-policy-editor/1.0.0'
       }
       // endinjector
 

webui/src/js/main.js

@@ -272,6 +272,7 @@
         "cdnPath": "preact/compat/dist/compat.umd"
       }
     },
+
     "preact/jsx-runtime": {
       "cdn": "3rdparty",
       "cwd": "node_modules/preact/jsx-runtime/dist",
@@ -499,6 +500,21 @@
         "path": "jet-composites/cfe-property-list-editor/1.0.0",
         "cdnPath": ""
       }
+    },
+
+    "cfe-policy-editor": {
+      "cdn": "3rdparty",
+      "cwd": "node_modules/@oracle/wrc-jet-pack/dist/jet-composites/cfe-policy-editor",
+      "debug": {
+        "src": ["**"],
+        "path": "jet-composites/cfe-policy-editor/1.0.0",
+        "cdnPath": ""
+      },
+      "release": {
+        "src": ["**"],
+        "path": "jet-composites/cfe-policy-editor/1.0.0",
+        "cdnPath": ""
+      }
     }
   }
 }