Merge branch 'wktui-443' into 'main'

Changing default value for WKO image

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

Author: robertpatrick

webui/src/js/models/wko-definition.js

@@ -19,8 +19,7 @@ define(['utils/observable-properties', 'utils/validation-helper'],
         this.k8sServiceAccount.addValidator(...validationHelper.getK8sNameValidators());
 
         this.versionTag = props.createProperty(window.api.ipc.invoke('get-latest-wko-version-number'));
-
-        this.operatorImage = props.createProperty('ghcr.io/oracle/weblogic-kubernetes-operator:${1}', this.versionTag.observable);
+        this.operatorImage = props.createProperty();
         const operatorImageValidators = validationHelper.getImageTagValidators();
         this.operatorImage.addValidator(...operatorImageValidators);
 

webui/src/js/models/wkt-project.js

@@ -173,6 +173,19 @@ function (ko, wdtConstructor, imageConstructor, kubectlConstructor, domainConstr
           }
         }
       }
+
+      // Version 1.7.1 changes the operator image default from populated to empty.  If the
+      // project value is the same as what the default currently is, remove it from the project.
+      //
+      if ('wko' in wktProjectJson && 'image' in wktProjectJson.wko) {
+        const currentImageValue = wktProjectJson.wko.image;
+        const defaultImageValue =
+            `ghcr.io/oracle/weblogic-kubernetes-operator:${window.api.ipc.invoke('get-latest-wko-version-number')}`;
+
+        if (currentImageValue === defaultImageValue) {
+          delete wktProjectJson.wko.image;
+        }
+      }
     };
 
     this.setFromJson = (wktProjectJson, modelContentsJson) => {

webui/src/js/utils/cmd-script-adapter.js

@@ -208,6 +208,12 @@ define(['utils/script-adapter-base'],
         }
 
         const variableRef = this.getVariableReference(variableName);
+        const imageTagLines = [
+          `IF "${helmChartValues.image}" NEQ "" (`,
+          `${this.indent(1)}SET "${variableName}=${variableRef} --set image=${helmChartValues.image}"`,
+          ')'
+        ];
+
         const serviceAccountLines = [
           `IF "${helmChartValues.serviceAccount}" NEQ "" (`,
           `${this.indent(1)}SET "${variableName}=${variableRef} --set serviceAccount=${helmChartValues.serviceAccount}"`,
@@ -298,6 +304,8 @@ define(['utils/script-adapter-base'],
         this._lines.push(
           ...strategyLines,
           '',
+          ...imageTagLines,
+          '',
           ...serviceAccountLines,
           '',
           ...pullSecretsLines,

webui/src/js/utils/operator-script-generator.js

@@ -212,6 +212,7 @@ define(['models/wkt-project', 'utils/script-generator-base', 'utils/helm-helper'
 
       _gatherHelmChartArgs() {
         return {
+          image: this.adapter.getVariableReference('WKO_IMAGE_TAG'),
           serviceAccount: this.adapter.getVariableReference('WKO_SERVICE_ACCOUNT'),
           domainNamespaceSelectionStrategy: this.adapter.getVariableReference('WKO_DOMAIN_NAMESPACE_SELECTION_STRATEGY'),
           domainNamespaceLabelSelector: this.adapter.getVariableReference('WKO_DOMAIN_NAMESPACE_LABEL_SELECTOR'),

webui/src/js/utils/powershell-script-adapter.js

@@ -161,6 +161,12 @@ define(['utils/script-adapter-base'],
         }
 
         const variableRef = this.getVariableReference(variableName);
+        const imageTagLines = [
+          `if ("${helmChartValues.image}" -ne "") {`,
+          `${this.indent(1)}${variableName} = "${variableRef} --set image=${helmChartValues.image}"`,
+          '}'
+        ];
+
         const serviceAccountLines = [
           `if ("${helmChartValues.serviceAccount}" -ne "") {`,
           `${this.indent(1)}${variableName} = "${variableRef} --set serviceAccount=${helmChartValues.serviceAccount}"`,
@@ -245,6 +251,8 @@ define(['utils/script-adapter-base'],
         this._lines.push(
           ...strategyLines,
           '',
+          ...imageTagLines,
+          '',
           ...serviceAccountLines,
           '',
           ...pullSecretsLines,

webui/src/js/utils/sh-script-adapter.js

@@ -164,6 +164,12 @@ define(['utils/script-adapter-base'],
         }
 
         const variableRef = this.getVariableReference(variableName);
+        const imageTagLines = [
+          `if [ "${helmChartValues.image}" != "" ]; then`,
+          `${this.indent(1)}${variableName}="${variableRef} --set image=${helmChartValues.image}"`,
+          'fi'
+        ];
+
         const serviceAccountLines = [
           `if [ "${helmChartValues.serviceAccount}" != "" ]; then`,
           `${this.indent(1)}${variableName}="${variableRef} --set serviceAccount=${helmChartValues.serviceAccount}"`,
@@ -248,6 +254,8 @@ define(['utils/script-adapter-base'],
         this._lines.push(
           ...strategyLines,
           '',
+          ...imageTagLines,
+          '',
           ...serviceAccountLines,
           '',
           ...pullSecretsLines,