Skip to content

Commit

Permalink
[PLAT-15400][PLAT-15401][PLAT-13051] - Connection pooling ui issues a…
Browse files Browse the repository at this point in the history
…nd other ui issues

Summary:
**[PLAT-15400]** - Connection Pooling not abled even on selecting Enable Connection Pooling during universe creation

**[PLAT-15401]** - Enable Connection Pooling Option Not Displayed as Toggled On in Edit Universe

**[PLAT-13051]** - Wording change for "Select new CA signed cert" dialog - for Encryption in Transit

Test Plan: Tested manually

Reviewers: kkannan

Reviewed By: kkannan

Subscribers: yugaware, ui

Differential Revision: https://phorge.dev.yugabyte.com/D38311
  • Loading branch information
Lingeshwar committed Sep 23, 2024
1 parent 8642555 commit 253ab07
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,7 @@ export default class RollingUpgradeForm extends Component {
}}
/>
) : (
<span>Select new CA signed cert from the list</span>
<span>Select a new certificate from the list</span>
)
}
asyncValidating={
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,8 @@ export const getFormData = (
communicationPorts,
customizePort: false, //** */
ybcPackagePath: null, //** */,
enablePGCompatibitilty: isPGEnabledFromIntent(userIntent)
enablePGCompatibitilty: isPGEnabledFromIntent(userIntent),
enableConnectionPooling: _.get(userIntent, 'enableConnectionPooling', false)
},
instanceTags: transformInstanceTags(userIntent.instanceTags),
gFlags: userIntent?.specificGFlags
Expand All @@ -252,10 +253,6 @@ export const getFormData = (
inheritFlagsFromPrimary: userIntent?.specificGFlags?.inheritFromPrimary
};

if (!_.isEmpty(userIntent?.enableConnectionPooling)) {
data.advancedConfig.enableConnectionPooling = userIntent.enableConnectionPooling;
}

if (data.cloudConfig.masterPlacement === MasterPlacementMode.DEDICATED) {
data.instanceConfig.masterInstanceType = userIntent.masterInstanceType;
data.instanceConfig.masterDeviceInfo = userIntent.masterDeviceInfo;
Expand Down Expand Up @@ -319,6 +316,7 @@ export const getUserIntent = (
enableIPV6: advancedConfig.enableIPV6,
enableExposingService: advancedConfig.enableExposingService,
useSystemd: advancedConfig.useSystemd,
enableConnectionPooling: _.get(advancedConfig, 'enableConnectionPooling', false),
imageBundleUUID: instanceConfig.imageBundleUUID!
};

Expand Down Expand Up @@ -354,9 +352,6 @@ export const getUserIntent = (
if (!_.isEmpty(azOverrides)) intent.userIntentOverrides = { azOverrides };
if (!_.isEmpty(proxyConfig)) intent.proxyConfig = proxyConfig;
if (!_.isEmpty(universeOverrides)) intent.universeOverrides = universeOverrides;
if (!_.isEmpty(advancedConfig?.enableConnectionPooling)) {
intent.enableConnectionPooling = advancedConfig.enableConnectionPooling;
}

if (
cloudConfig.provider?.code === CloudType.kubernetes &&
Expand Down

0 comments on commit 253ab07

Please sign in to comment.