Skip to content

Fixed imported cluster not being recognized correctly in 'Waiting' state #16213

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

Merged
eva-vashkevich merged 2 commits into from
Dec 23, 2025
Merged

Fixed imported cluster not being recognized correctly in 'Waiting' state #16213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
011a266
Fixed imported cluster not being recognized correctly in Waiting state
eva-vashkevich Dec 18, 2025
b30927d
improved readability
eva-vashkevich Dec 18, 2025
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
16 changes: 16 additions & 0 deletions shell/models/__tests__/provisioning.cattle.io.cluster.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,22 @@ describe('class ProvCluster', () => {
},
expected: true
},
{
description: 'should return true for an imported k3s cluster in waiting state',
clusterData: {
isLocal: false,
mgmt: { status: { provider: undefined, driver: 'k3s' } }
},
expected: true
},
{
description: 'should return true for an imported rke2 cluster in waiting state',
clusterData: {
isLocal: false,
mgmt: { status: { provider: undefined, driver: 'rke2' } }
},
expected: true
},
{
description: 'should return false for a provisioned k3s cluster',
clusterData: {
Expand Down
12 changes: 10 additions & 2 deletions shell/models/provisioning.cattle.io.cluster.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,8 +326,16 @@ export default class ProvCluster extends SteveModel {

// imported rke2 and k3s have status.driver === rke2 and k3s respectively
// Provisioned rke2 and k3s have status.driver === imported
if (this.mgmt?.status?.provider === 'k3s' || this.mgmt?.status?.provider === 'rke2') {
return this.mgmt?.status?.driver === this.mgmt?.status?.provider;
const provider = this.mgmt?.status?.provider;
const driver = this.mgmt?.status?.driver;

// The main case
if (provider === 'k3s' || provider === 'rke2') {
return driver === provider;
}
// The 'waiting' case
if (!provider && (driver === 'k3s' || driver === 'rke2')) {
return true;
}

// imported KEv2
Expand Down