Skip to content

feat(container): definitive removal of octavia load balancer in menu #17742

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat(container): definitive removal of octavia load balancer in menu #17742

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 6 additions & 24 deletions packages/manager/apps/container/src/core/routing/iframe-app-router.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,33 +67,15 @@ export function IFrameAppRouter({
configuration,
iframeRef,
}: IFrameAppRouterProps): JSX.Element {
const mockedConfiguration = useMemo(() => {
const newConfiguration = { ...configuration };
/**
* This is a temporary condition to ensure that the new pci-load-balancer µapp configuration
* overrides the angularjs octavia-load-balancer configuration in case pci-load-balancer config
* is active.
*
* This is temporary and needed during the rewriting of octavia-load-balancer from angularjs to react.
*
* @TODO remove this condition when pci-load-balancer µapp is prodded and validated.
*/
if ('pci-load-balancer' in newConfiguration) {
delete newConfiguration['octavia-load-balancer'];
}

return newConfiguration;
}, [configuration]);

const defaultRoute = useMemo(
() =>
makeDefaultRoute({ configuration: Object.entries(mockedConfiguration) }),
[mockedConfiguration],
makeDefaultRoute({ configuration: Object.entries(configuration) }),
[configuration],
);

const routes = useMemo(
() =>
Object.entries(mockedConfiguration)
Object.entries(configuration)
.flatMap(([id, appConfig]) =>
appConfig.container.hashes
? appConfig.container.hashes.map((hash) => ({
Expand All @@ -117,10 +99,10 @@ export function IFrameAppRouter({
(hashB || '').length - (hashA || '').length,
)
.map((config) => makeRoute({ ...config, iframeRef })),
[mockedConfiguration],
[configuration],
);
const redirections = useMemo(() => Redirections(mockedConfiguration), [
mockedConfiguration,
const redirections = useMemo(() => Redirections(configuration), [
configuration,
]);

return (
Expand Down
Loading