Merge branch 'dopv-fixes' into 'main'

addressing the first portion of the domain on PV support issues

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

Author: robertpatrick

electron/app/locales/en/webui.json

@@ -279,13 +279,13 @@
   "image-design-create-image-aux-help": "Whether you want to create a new primary image or use an existing image, such as one of the standard images in the Oracle Container Registry.",
 
   "image-design-aux-image-settings-label": "Auxiliary Image Configuration",
-  "image-design-aux-image-config-off-label": "Do not use an auxiliary image",
-  "image-design-aux-image-config-use-label": "Use an existing auxiliary image",
-  "image-design-aux-image-config-create-label": "Create a new auxiliary image",
+  "image-design-aux-image-config-off-label": "Do not use an auxiliary image so the model is in the primary image.",
+  "image-design-aux-image-config-use-label": "Use an existing auxiliary image created outside of this project so this project has no model.",
+  "image-design-aux-image-config-create-label": "Create a new auxiliary image using this project.",
   "image-design-domain-creation-image-settings-label": "Domain Creation Image Configuration",
-  "image-design-domain-creation-image-config-off-label": "Do not use a domain creation image",
-  "image-design-domain-creation-image-config-use-label": "Use an existing domain creation image",
-  "image-design-domain-creation-image-config-create-label": "Create a new domain creation image",
+  "image-design-domain-creation-image-config-off-label": "Do not use a domain creation image so this project has no model.",
+  "image-design-domain-creation-image-config-use-label": "Use an existing domain creation image created outside of this project so this project has no model.",
+  "image-design-domain-creation-image-config-create-label": "Create a new domain creation image using this project.",
 
   "image-design-image-tag-label": "Image Tag",
   "image-design-image-tag-mii-create-help": "The tag to use to identify the new image containing the Oracle Fusion Middleware installation and WebLogic Deploy Tooling model to use to create and run the domain.",
@@ -618,12 +618,14 @@
   "domain-design-image-registry-pull-email-label": "Image Registry Pull Email Address",
   "domain-design-image-registry-pull-email-help": "The image registry user's email address used to create the Kubernetes image pull secret.",
 
-  "domain-design-aux-image-config-off-label": "Do not use an auxiliary image",
-  "domain-design-aux-image-config-use-label": "Use an existing auxiliary image created outside of this project",
-  "domain-design-aux-image-config-create-label": "Use newly created auxiliary image created by this project",
-  "domain-design-domain-creation-image-config-off-label": "Do not use a domain creation image",
-  "domain-design-domain-creation-image-config-use-label": "Use an existing domain creation image created outside of this project",
-  "domain-design-domain-creation-image-config-create-label": "Use newly created domain creation image created by this project",
+  "domain-design-aux-image-config-off-label": "This project is not using an auxiliary image so the model is in the primary image.",
+  "domain-design-aux-image-config-use-label": "This project is using an existing auxiliary image created outside of this project so the project has no model.",
+  "domain-design-aux-image-config-create-label": "This project is using an auxiliary image created using this project.",
+  "domain-design-domain-creation-image-config-off-label": "This project is not using a domain creation image so this project has no model.",
+  "domain-design-domain-creation-image-config-use-label": "This project is using an existing domain creation image created outside of this project so this project has no model.",
+  "domain-design-domain-creation-image-config-create-label": "This project is using an domain creation image created using this project.",
+  "domain-design-revisit-aux-image-decision-label": "Change Setting",
+  "domain-design-revisit-aux-image-decision-help": "Jump to the Image page to change this setting",
 
   "domain-design-aux-image-title": "Auxiliary Image to Use for the Domain",
   "domain-design-hints-goto-create-aux-image": "Go To Create Auxiliary Image Page",
@@ -787,9 +789,15 @@
   "domain-design-cluster-additional-java-options-help": "A list of additional Java runtime options, separated by spaces, tabs, or commas.",
 
   "domain-design-configmap-table-aria-label": "ConfigMap Properties Table",
-  "domain-design-configmap-title": "Model Variables Overrides",
+  "domain-design-configmap-title": "Model Variable Overrides",
+  "domain-design-configmap-external-title": "External Model Variable Overrides",
   "domain-design-configmap-label": "Kubernetes ConfigMap Name",
   "domain-design-configmap-help": "The name of the Kubernetes ConfigMap that holds the model variable overrides.",
+  "domain-design-configmap-no-properties-message": "No model variables found.",
+  "domain-design-configmap-no-properties-add-remove-message": "No model variables for model in external image found.  Please add model variables, as needed.",
+  "domain-design-add-external-property-tooltip": "Add External Model Variable Override Entry",
+  "domain-design-delete-external-property-tooltip": "Delete External Model Variable Override Entry",
+
   "domain-design-encryption-secret-label": "Runtime Encryption Secret Name",
   "domain-design-encryption-secret-help": "The name of the Kubernetes secret which holds the password used to encrypt the domain.",
   "domain-design-encryption-value-label": "Runtime Encryption Secret Value",
@@ -828,6 +836,19 @@
   "domain-design-username-header": "Username",
   "domain-design-password-header": "Password",
   "domain-design-secrets-cell-field-name": "Secrets table {{name}} field at row {{position}} with UID {{uid}}",
+  "domain-design-add-external-secret-tooltip": "Add External Model Secret Entry",
+  "domain-design-delete-external-secret-tooltip": "Delete External Model Secret Entry",
+  "domain-design-no-secrets-message": "No additional model secrets found.",
+  "domain-design-no-secrets-add-remove-message": "No additional external model secrets found.  Please add secrets for any secret references in the external model that are not already handled in other parts of this page.",
+
+  "domain-design-domain-env-var-title": "Domain-Wide Environment Variables",
+  "domain-design-domain-env-var-table-aria-label": "Domain-Wide Environment Variables Table",
+  "domain-design-domain-env-var-name-header": "Environment Variable Name",
+  "domain-design-domain-env-var-value-header": "Environment Variable Value",
+  "domain-design-domain-add-env-var-tooltip": "Add Environment Variable Entry",
+  "domain-design-domain-delete-env-var-tooltip": "Delete Environment Variable Entry",
+  "domain-design-domain-no-env-vars-message": "No environment variables specified",
+
   "domain-design-domain-node-selector-title": "Domain-Wide Node Selector",
   "domain-design-domain-node-selector-table-aria-label": "Domain-Wide Node Selector Table",
   "domain-design-domain-node-selector-label-name-header": "Label Name",

webui/package-lock.json

@@ -12,7 +12,7 @@
   "dependencies": {
     "@oracle/oraclejet": "~14.1.2",
     "@oracle/oraclejet-core-pack": "~14.1.2",
-    "@oracle/wrc-jet-pack": "~2.4.5-develop",
+    "@oracle/wrc-jet-pack": "~2.4.5",
     "ace-builds": "^1.22.0",
     "i18next": "^22.5.0",
     "jquery": "^3.7.0",

webui/package.json

@@ -155,9 +155,12 @@ define(['knockout', 'utils/observable-properties', 'utils/common-utilities', 'ut
         this.pvcSizeLimit = props.createProperty();
         this.pvcSizeLimit.addValidator(...validationHelper.getK8sMemoryValidators());
 
+        this.externalProperties = props.createListProperty(['uid', 'Name', 'Override']).persistByKey('uid');
+
         // Jet tables do not work if you allow changing the value used as the primary key so always add a uid...
         //
         this.domainNodeSelector = props.createListProperty(['uid', 'name', 'value']);
+        this.serverPodEnvironmentVariables = props.createListProperty(['uid', 'name', 'value']).persistByKey('uid');
 
         // update the secrets list when the uid changes.
         this.uid.observable.subscribe(() => {

webui/src/js/models/k8s-domain-definition.js

@@ -5,7 +5,7 @@
  */
 'use strict';
 
-define(['models/wkt-project'],
+define(['models/wkt-project', 'utils/wkt-logger'],
   function(project) {
     function AuxImageHelper() {
 
@@ -28,11 +28,28 @@ define(['models/wkt-project'],
           project.k8sDomain.domainType.value !== 'RestrictedJRF';
       };
 
-      this.projectUsesModel = () => {
+      this.projectHasModel = () => {
         if (project.settings.targetDomainLocation.observable() === 'pv') {
-          return this.supportsDomainCreationImages() && project.image.useAuxImage.observable();
+          // PV - if not creating the domain creation image then no model.
+          return this.supportsDomainCreationImages() && project.image.useAuxImage.observable() &&
+            project.image.createAuxImage.observable();
+        } else if (project.settings.targetDomainLocation.observable() === 'mii') {
+          if (project.image.useAuxImage.observable()) {
+            // MII w/ aux image - if not creating the aux image then no model.
+            return project.image.createAuxImage.observable();
+          }
         }
-        return true;
+        // MII w/o aux image - if not creating the primary image, then no model.
+        // DII - if not creating the primary image, then no model.
+        return project.image.createPrimaryImage.observable();
+      };
+
+      this.projectUsingExternalImageContainingModel = () => {
+        if (this.supportsDomainCreationImages() || project.settings.targetDomainLocation.observable() === 'mii') {
+          return project.image.useAuxImage.observable() && !project.image.createAuxImage.observable();
+        }
+        // Old PV and DII never has a model in the image
+        return false;
       };
 
       this.isCreatingAuxImage = () => {

webui/src/js/utils/aux-image-helper.js

@@ -9,7 +9,7 @@
  * An object which controls display of the main dialog.
  * Returns a singleton.
  */
-define([],
+define(['utils/wkt-logger'],
   function () {
     const alphabet = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
 
@@ -129,7 +129,33 @@ define([],
           }
         }
         return result;
-      }
+      },
+
+      /**
+       * Generate a new name with an index larger than the largest existing one in the array.
+       *
+       * @param observableArray - the knockout ObservableArray of objects
+       * @param fieldName       - the field name in the object to match against
+       * @param generatedPrefix - the generated name prefix to match against and use for the new name
+       * @returns {string}      - the newly generated name
+       */
+      generateNewName(observableArray, fieldName, generatedPrefix, omitIndexDash = false) {
+        let index = 1;
+        const regexString = omitIndexDash ? `^${generatedPrefix}(\\d+)$` : `^${generatedPrefix}-(\\d+)$`;
+
+        const generatedRegex = new RegExp(regexString);
+        observableArray().forEach(obj => {
+          const match = obj[fieldName].match(generatedRegex);
+          if (match) {
+            const indexFound = Number(match[1]);
+
+            if (indexFound >= index) {
+              index = indexFound + 1;
+            }
+          }
+        });
+        return omitIndexDash ? `${generatedPrefix}${index}` : `${generatedPrefix}-${index}`;
+      },
     };
   }
 );

webui/src/js/utils/common-utilities.js

@@ -1,26 +1,35 @@
 /**
  * @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 (UPL), Version 1.0 as shown at https://oss.oracle.com/licenses/upl/
  */
 'use strict';
 
-define(['models/wkt-project', 'js-yaml'],
-  function(project, jsYaml) {
+define(['models/wkt-project', 'js-yaml', 'utils/aux-image-helper'],
+  function(project, jsYaml, auxImageHelper) {
     class K8sDomainConfigMapGenerator {
       constructor() {
         this.project = project;
       }
 
       shouldCreateConfigMap() {
-        return this.project.settings.targetDomainLocation.value === 'mii';
+        if (auxImageHelper.supportsDomainCreationImages()) {
+          return this.project.image.useAuxImage.value;
+        } else if (this.project.settings.targetDomainLocation.value === 'mii') {
+          return true;
+        }
+        return false;
       }
 
       generate(generateYaml = true) {
         if (!this.shouldCreateConfigMap()) {
           return generateYaml ? [] : undefined;
         }
 
+        const configMapData = auxImageHelper.projectHasModel() ?
+          this.project.wdtModel.getMergedPropertiesContent().observable() :
+          this.project.k8sDomain.externalProperties.observable();
+
         const configMap = {
           apiVersion: 'v1',
           kind: 'ConfigMap',
@@ -30,8 +39,9 @@ define(['models/wkt-project', 'js-yaml'],
           },
           data: {}
         };
+
         configMap.data[`${this.project.k8sDomain.uid.value}-overrides.properties`] =
-          getConfigMapValues(this.project.wdtModel.getMergedPropertiesContent().observable());
+          getConfigMapValues(configMapData);
 
         return generateYaml ? jsYaml.dump(configMap).split('\n') : configMap;
       }

webui/src/js/utils/k8s-domain-configmap-generator.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 (UPL), Version 1.0 as shown at https://oss.oracle.com/licenses/upl/
  */
 'use strict';
@@ -172,6 +172,16 @@ function(project, K8sDomainConfigMapGenerator, jsYaml, i18n) {
     _getDomainServerPod() {
       let serverPod = this._getServerPod();
 
+      if (this.project.k8sDomain.serverPodEnvironmentVariables.value.length > 0) {
+        if (!serverPod) {
+          serverPod = {};
+        }
+        serverPod.env = [];
+        this.project.k8sDomain.serverPodEnvironmentVariables.value.forEach(envVar => {
+          serverPod.env.push({ name: envVar.name, value: envVar.value });
+        });
+      }
+
       if (this.project.k8sDomain.domainNodeSelector.value.length > 0) {
         if (!serverPod) {
           serverPod = {};