Skip to content

Fix KubeLB option precedence enforced over enabled #7999

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
KhizerRehan wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −12
Open

Fix KubeLB option precedence enforced over enabled #7999

Show file tree
Hide file tree
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
8 changes: 4 additions & 4 deletions modules/web/src/app/cluster/details/cluster/edit-cluster/component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,15 +511,15 @@ export class EditClusterComponent implements OnInit, OnDestroy {
}

private _isKubeLBEnabled(datacenter: Datacenter, seedSettings: SeedSettings): boolean {
// If enabled is explicitly false at datacenter level, hide regardless of enforced
if (datacenter.spec.kubelb?.enforced) {
return true;
}
if (datacenter.spec.kubelb?.enabled === false) {
Copy link
Copy Markdown
Contributor

@ahmadhamzh ahmadhamzh Apr 15, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

according to my understand this sholdn't return false unless the seedSettings?.kubelb?.enableForAllDatacenters is also false, so we need to check that before returning false

return false;
}
// If enforced or enabled at datacenter level, show
if (datacenter.spec.kubelb?.enforced || datacenter.spec.kubelb?.enabled) {
if (datacenter.spec.kubelb?.enabled) {
return true;
}
// Fall back to seed-level setting
return !!seedSettings?.kubelb?.enableForAllDatacenters;
}

Expand Down
8 changes: 4 additions & 4 deletions modules/web/src/app/shared/components/cluster-summary/component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,14 +90,14 @@ export class ClusterSummaryComponent implements OnInit {
}

get kubeLBAssignPublicIPWarning(): boolean {
// Check all sources: cluster spec, datacenter enforced/enabled, and seed-level setting
// Respect explicit datacenter disable (enabled === false)
const dcKubeLB = this.datacenter?.spec?.kubelb;
let isKubeLBActive = !!this.cluster?.spec?.kubelb?.enabled;
if (!isKubeLBActive) {
if (dcKubeLB?.enabled === false) {
if (dcKubeLB?.enforced) {
isKubeLBActive = true;
} else if (dcKubeLB?.enabled === false) {
isKubeLBActive = false;
} else if (dcKubeLB?.enforced || dcKubeLB?.enabled) {
} else if (dcKubeLB?.enabled) {
isKubeLBActive = true;
} else {
isKubeLBActive = !!this.seedSettings?.kubelb?.enableForAllDatacenters;
Expand Down
8 changes: 4 additions & 4 deletions modules/web/src/app/wizard/step/cluster/component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1367,15 +1367,15 @@ export class ClusterStepComponent extends StepBase implements OnInit, ControlVal
}

private _isKubeLBEnabled(datacenter: Datacenter, seedSettings: SeedSettings): boolean {
// If enabled is explicitly false at datacenter level, hide regardless of enforced
if (datacenter.spec.kubelb?.enforced) {
return true;
}
if (datacenter.spec.kubelb?.enabled === false) {
return false;
}
// If enforced or enabled at datacenter level, show
if (datacenter.spec.kubelb?.enforced || datacenter.spec.kubelb?.enabled) {
if (datacenter.spec.kubelb?.enabled) {
return true;
}
// Fall back to seed-level setting
return !!seedSettings?.kubelb?.enableForAllDatacenters;
}
}