Merge branch 'helm-large-integers' into 'main'

working around Helm bug #1707

See merge request weblogic-cloud/weblogic-toolkit-ui!246

Author: robertpatrick

electron/app/js/helmUtils.js

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright (c) 2021, Oracle and/or its affiliates.
+ * Copyright (c) 2021, 2023, Oracle and/or its affiliates.
  * Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
  */
 'use strict';
@@ -250,6 +250,12 @@ function processHelmChartValues(args, helmChartValues) {
           args.push('--timeout', `${propertyValue}m`);
           break;
 
+        // Workaround Helm bug #1707 that formats large integers in scientific notation...
+        //
+        case 'javaLoggingFileSizeLimit':
+          args.push('--set-string', formatSetArgument(propertyName, propertyValue));
+          break;
+
         default:
           args.push('--set', formatSetArgument(propertyName, propertyValue));
           break;

webui/src/js/utils/k8s-domain-deployer.js

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates.
+ * Copyright (c) 2021, 2023, Oracle and/or its affiliates.
  * Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
  */
 'use strict';
@@ -123,6 +123,13 @@ function (K8sDomainActionsBase, project, wktConsole, i18n, projectIo, dialogHelp
             break;
         }
 
+        // Prior to WKO 4.1.0, the operator Helm charts were vulnerable to Helm bug #1707 that mangles the value of
+        // large integers by putting them in scientific notation.  This causes the javaLoggingFileSizeLimit to not be
+        // honored.  As a workaround, always include this parameter in the Helm chart values.  The code processing this
+        // collection will use --set-string for this property to ensure that it is set correctly.
+        //
+        helmChartValues['javaLoggingFileSizeLimit'] = this.project.wko.javaLoggingFileSizeLimit.value;
+
         // Run helm upgrade so that operator picks up the new namespace.
         //
         // Skip passing kubectlExe and kubectlOptions args since the installed version

webui/src/js/utils/wko-actions-base.js

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright (c) 2021, Oracle and/or its affiliates.
+ * Copyright (c) 2021, 2023, Oracle and/or its affiliates.
  * Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
  */
 'use strict';
@@ -176,7 +176,7 @@ function(WktActionsBase, project, wktConsole, i18n, projectIo, dialogHelper, val
         // Only put the values in here where the UI is not following the operator helm chart's default values.
         //
         serviceAccount: operatorServiceAccount,
-        domainNamespaceSelectionStrategy: this.project.wko.operatorDomainNamespaceSelectionStrategy.value
+        domainNamespaceSelectionStrategy: this.project.wko.operatorDomainNamespaceSelectionStrategy.value,
       };
 
       if (!this.isValueEmpty(this.project.wko.operatorImage.value)) {
@@ -232,9 +232,15 @@ function(WktActionsBase, project, wktConsole, i18n, projectIo, dialogHelper, val
       }
 
       this.addHelmChartValueIfSet(helmChartValues, 'javaLoggingLevel', this.project.wko.javaLoggingLevel);
-      this.addHelmChartValueIfSet(helmChartValues, 'javaLoggingFileSizeLimit', this.project.wko.javaLoggingFileSizeLimit);
       this.addHelmChartValueIfSet(helmChartValues, 'javaLoggingFileCount', this.project.wko.javaLoggingFileCount);
 
+      // Prior to WKO 4.1.0, the operator Helm charts were vulnerable to Helm bug #1707 that mangles the value of
+      // large integers by putting them in scientific notation.  This causes the javaLoggingFileSizeLimit to not be
+      // honored.  As a workaround, always include this parameter in the Helm chart values.  The code processing this
+      // collection will use --set-string for this property to ensure that it is set correctly.
+      //
+      helmChartValues['javaLoggingFileSizeLimit'] = this.project.wko.javaLoggingFileSizeLimit.value;
+
       if (this.project.wko.nodeSelector.hasValue()) {
         const nodeSelectorMap = {};
         this.project.wko.nodeSelector.value.forEach(label => {