Skip to content

Commit 5682b63

Browse files
committed
Merge branch 'opss-secret-script-fix' into 'main'
fixing the Domain -> Code View install script for Domain on PV domains See merge request weblogic-cloud/weblogic-toolkit-ui!285
2 parents d161ec7 + 3bc859e commit 5682b63

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

webui/src/js/utils/k8s-domain-script-generator.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,11 @@ function(project, ScriptGeneratorBase, K8sDomainConfigMapGenerator, auxImageHelp
103103
//
104104
const secretName = secretEntry.name;
105105
if (Array.isArray(secretEntry.keys) && secretEntry.keys.length > 0) {
106-
this.adapter.addVariableDefinition(this.getSecretVariableName(name, 'NAME'), secretName);
106+
this.adapter.addVariableDefinition(this.getSecretVariableName(secretName, 'NAME'), secretName);
107107
for (const secretFieldEntry of secretEntry.keys) {
108108
const fieldName = secretFieldEntry.key;
109109
const fieldValue = this.credentialMask;
110-
this.adapter.addVariableDefinition(this.getSecretVariableName(name, fieldName), fieldValue);
110+
this.adapter.addVariableDefinition(this.getSecretVariableName(secretName, fieldName), fieldValue);
111111
}
112112
this.adapter.addEmptyLine();
113113
} else {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ define([],
290290

291291
addCreateOpssWalletPasswordSecretBlock(comment, kubectlExe, secretName, k8sDomainNamespace, secretData,
292292
createErrorMessage, deleteErrorMessage, replaceMessage) {
293-
const options = this.getGenericSecretOptions(secretName, k8sDomainNamespace, secretName,
293+
const options = this.getGenericSecretOptions(secretName, k8sDomainNamespace, secretData,
294294
createErrorMessage, deleteErrorMessage, replaceMessage);
295295
this._lines.push(...this._formatCreateReplaceBlock(comment, kubectlExe, options), '');
296296
}

0 commit comments

Comments
 (0)