From 6cfa6a7b285e6e9b58da422c49b7fc7c5cbce31b Mon Sep 17 00:00:00 2001 From: galiacheng Date: Fri, 27 May 2022 14:29:53 +0800 Subject: [PATCH 1/2] Improve wording for model runtime encryption secret Signed-off-by: galiacheng Changes to be committed: modified: weblogic-azure-aks/src/main/arm/createUiDefinition.json --- weblogic-azure-aks/src/main/arm/createUiDefinition.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/weblogic-azure-aks/src/main/arm/createUiDefinition.json b/weblogic-azure-aks/src/main/arm/createUiDefinition.json index 61c9d8279..30a86de4a 100644 --- a/weblogic-azure-aks/src/main/arm/createUiDefinition.json +++ b/weblogic-azure-aks/src/main/arm/createUiDefinition.json @@ -52,10 +52,10 @@ "name": "wdtRuntimePassword", "type": "Microsoft.Common.PasswordBox", "label": { - "password": "Password for WebLogic Deploy Tooling runtime encrytion", + "password": "Password for WebLogic Model encryption", "confirmPassword": "Confirm password" }, - "toolTip": "The model WebLogic Deploy Tooling runtime encrytion secret.", + "toolTip": "Model in Image requires a runtime encryption secret with a secure `password` key. This secret is used by the operator to encrypt model and domain home artifacts before it adds them to a runtime ConfigMap or log. See https://aka.ms/wls-aks-model-runtime-encryption-secret.", "constraints": { "required": true, "regex": "^(?=.*[A-Z])(?=.*[a-z])(?=.*\\d)[A-Za-z\\d]{12,}$", From cd1b6f7d2abe667add023a80d9746fb2c54eb2c5 Mon Sep 17 00:00:00 2001 From: galiacheng Date: Fri, 27 May 2022 14:42:34 +0800 Subject: [PATCH 2/2] move domain home source type explainer to basics blade. Signed-off-by: galiacheng Changes to be committed: modified: weblogic-azure-aks/src/main/arm/createUiDefinition.json --- .../src/main/arm/createUiDefinition.json | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/weblogic-azure-aks/src/main/arm/createUiDefinition.json b/weblogic-azure-aks/src/main/arm/createUiDefinition.json index 30a86de4a..00340d00a 100644 --- a/weblogic-azure-aks/src/main/arm/createUiDefinition.json +++ b/weblogic-azure-aks/src/main/arm/createUiDefinition.json @@ -4,6 +4,18 @@ "version": "0.1.2-preview", "parameters": { "basics": [ + { + "name": "domainHomeSourceTypeExplainer", + "type": "Microsoft.Common.TextBlock", + "visible": true, + "options": { + "text": "This offer always deploys WebLogic Server using the 'Model in image' domain home source type, even when the persistent volume checkbox is checked in 'Configure AKS cluster' blade. For more information on domain home source types, follow the link below", + "link": { + "label": "Learn more", + "uri": "https://aka.ms/wls-aks-docs-domain-home-source-type" + } + } + }, { "name": "basicsRequired", "type": "Microsoft.Common.Section", @@ -280,18 +292,6 @@ }, "bladeTitle": "Configure AKS cluster", "elements": [ - { - "name": "domainHomeSourceTypeExplainer", - "type": "Microsoft.Common.TextBlock", - "visible": true, - "options": { - "text": "This offer always deploys WebLogic using the 'Model in image' domain home source type, even when the persistent volume checkbox is checked. For more information on domain home source types, follow the link below", - "link": { - "label": "Learn more", - "uri": "https://aka.ms/wls-aks-docs-domain-home-source-type" - } - } - }, { "name": "clusterInfo", "type": "Microsoft.Common.Section",