Skip to content

Merge the same cloudInit userdata and networkdata into same option when creating harvester downstream cluster #15760

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
a110605 merged 3 commits into from
Oct 30, 2025
Merged

Merge the same cloudInit userdata and networkdata into same option when creating harvester downstream cluster #15760

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8056d7d
refactor: merge the same cloudInit userdata and network into same option
a110605 Oct 28, 2025
a62f702
refactor: extract userData and network data from configMaps
a110605 Oct 29, 2025
37afcd9
refactor: genCloudDataOptions function
a110605 Oct 30, 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
47 changes: 23 additions & 24 deletions pkg/harvester-manager/machine-config/harvester.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,30 +185,8 @@ export default {
}
}

const userDataOptions = [];
const networkDataOptions = [];

(res.configMaps.value?.data || []).map((O) => {
const cloudTemplate =
O.metadata?.labels?.[HCI_ANNOTATIONS.CLOUD_INIT];

if (cloudTemplate === 'user') {
userDataOptions.push({
label: O.id,
value: O.data.cloudInit
});
}

if (cloudTemplate === 'network') {
networkDataOptions.push({
label: O.id,
value: O.data.cloudInit
});
}
});

this.userDataOptions = userDataOptions;
this.networkDataOptions = networkDataOptions;
this.userDataOptions = this.genCloudDataOptions(res.configMaps.value?.data, 'user');
this.networkDataOptions = this.genCloudDataOptions(res.configMaps.value?.data, 'network');
this.images = res.images.value?.data;
this.storageClass = res.storageClass.value?.data;
this.networks = res.networks.value?.data;
Expand Down Expand Up @@ -591,7 +569,28 @@ export default {

methods: {
stringify,
genCloudDataOptions(configMaps = [], type = 'user') {
const valueMap = new Map();

for (const configMap of configMaps) {
const cloudTemplate = configMap.metadata?.labels?.[HCI_ANNOTATIONS.CLOUD_INIT];

if (cloudTemplate !== type) continue;

const value = configMap.data?.cloudInit;
const label = configMap.id;

if (!value) continue;

if (valueMap.has(value)) {
valueMap.set(value, `${ valueMap.get(value) }, ${ label }`);
} else {
valueMap.set(value, label);
}
}

return Array.from(valueMap, ([value, label]) => ({ value, label }));
},
test() {
const errors = [];

Expand Down