Merge branch 'wktui-416' into 'main'

changing auxiliary image path location defaults to align with auxiliary image creation

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

Author: robertpatrick

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

@@ -13,19 +13,22 @@
 define(['knockout', 'utils/observable-properties', 'utils/common-utilities', 'utils/validation-helper', 'utils/wkt-logger'],
   function (ko, props, utils, validationHelper, wktLogger) {
 
-    return function(name, wdtModel, imageDomainHomePathProperty, imageDomainTypeProperty) {
+    return function(name, wdtModel, imageDefinition) {
       function asLegalK8sName(observable) {
         return utils.toLegalK8sName(observable());
       }
 
       function K8sDomainModel() {
+        const DEFAULT_AUX_IMAGE_WDT_INSTALL_HOME = imageDefinition.wdtHomePath.value + '/weblogic-deploy';
+        const DEFAULT_AUX_IMAGE_WDT_MODEL_HOME = imageDefinition.modelHomePath.value;
+
         this.uid = props.createProperty(asLegalK8sName, wdtModel.domainName);
         this.uid.addValidator(...validationHelper.getK8sNameValidators());
 
         this.kubernetesNamespace = props.createProperty('${1}-ns', this.uid.observable);
         this.kubernetesNamespace.addValidator(...validationHelper.getK8sNameValidators());
-        this.domainHome = imageDomainHomePathProperty;
-        this.domainType = imageDomainTypeProperty;
+        this.domainHome = imageDefinition.domainHomePath;
+        this.domainType = imageDefinition.targetDomainType;
 
         this.domainPersistentVolumeName = props.createProperty('weblogic-domain-storage-volume');
         this.domainPersistentVolumeMountPath = props.createProperty('/shared');
@@ -49,9 +52,8 @@ define(['knockout', 'utils/observable-properties', 'utils/common-utilities', 'ut
         // These fields are exposed to the user only when using an existing Primary Image and
         // not using an Auxiliary Image at all.
         //
-        this.imageModelHome = props.createProperty('/u01/wdt/models');
-        this.imageWDTInstallHome = props.createProperty('/u01/wdt/weblogic-deploy');
-
+        this.imageModelHome = props.createProperty(imageDefinition.modelHomePath.value);
+        this.imageWDTInstallHome = props.createProperty(imageDefinition.wdtHomePath.value);
 
         // Auxiliary image-related properties
         this.auxImageRegistryPullRequireAuthentication = props.createProperty(false);
@@ -66,8 +68,8 @@ define(['knockout', 'utils/observable-properties', 'utils/common-utilities', 'ut
 
         // These fields are exposed to the user only when using an existing Auxiliary Image.
         //
-        this.auxImageSourceModelHome = props.createProperty('/auxiliary/models');
-        this.auxImageSourceWDTInstallHome = props.createProperty('/auxiliary/weblogic-deploy');
+        this.auxImageSourceModelHome = props.createProperty(DEFAULT_AUX_IMAGE_WDT_MODEL_HOME);
+        this.auxImageSourceWDTInstallHome = props.createProperty(DEFAULT_AUX_IMAGE_WDT_INSTALL_HOME);
 
         this.clusterKeys = [
           'uid', 'name', 'maxServers', 'replicas', 'minHeap', 'maxHeap', 'cpuRequest', 'cpuLimit', 'memoryRequest',

webui/src/js/models/wkt-project.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';
@@ -88,7 +88,7 @@ function (ko, wdtConstructor, imageConstructor, kubectlConstructor, domainConstr
     this.image = imageConstructor('image', this.wdtModel);
     this.ingress = ingressConstructor('ingress');
     this.kubectl = kubectlConstructor('kubectl');
-    this.k8sDomain = domainConstructor('k8sDomain', this.wdtModel, this.image.domainHomePath, this.image.targetDomainType);
+    this.k8sDomain = domainConstructor('k8sDomain', this.wdtModel, this.image);
     this.wko = wkoConstructor('wko');
     this.vzInstall = verrazzanoInstallConstructor('vzInstall');
     this.vzComponent = verrazzanoComponentConstructor('vzComponent', this.k8sDomain);

webui/src/js/utils/k8s-domain-v9-resource-generator.js

@@ -8,6 +8,8 @@
 define(['models/wkt-project', 'utils/k8s-domain-configmap-generator', 'js-yaml', 'utils/i18n', 'utils/wkt-logger'],
   function(project, K8sDomainConfigMapGenerator, jsYaml, i18n) {
     const WDT_DIR_NAME = 'weblogic-deploy';
+    const DEFAULT_AUX_IMAGE_WDT_INSTALL_HOME = '/auxiliary/weblogic-deploy';
+    const DEFAULT_AUX_IMAGE_WDT_MODEL_HOME = '/auxiliary/models';
 
     class K8sDomainV9ResourceGenerator {
       constructor() {
@@ -249,10 +251,10 @@ define(['models/wkt-project', 'utils/k8s-domain-configmap-generator', 'js-yaml',
             if (usingExistingAuxImage()) {
               // If the source fields are exposed in the UI, use the values from those fields.
               //
-              if (this.project.k8sDomain.auxImageSourceWDTInstallHome.hasValue()) {
+              if (this.project.k8sDomain.auxImageSourceWDTInstallHome.value !== DEFAULT_AUX_IMAGE_WDT_INSTALL_HOME) {
                 result.sourceWDTInstallHome = this.project.k8sDomain.auxImageSourceWDTInstallHome.value;
               }
-              if (this.project.k8sDomain.auxImageSourceModelHome.hasValue()) {
+              if (this.project.k8sDomain.auxImageSourceModelHome.value !== DEFAULT_AUX_IMAGE_WDT_MODEL_HOME) {
                 result.sourceModelHome = this.project.k8sDomain.auxImageSourceModelHome.value;
               }
             } else {