Skip to content
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

feat(gce): add support for hyperdisk in GCE #10149

Merged
merged 9 commits into from
Oct 4, 2024
Merged

feat(gce): add support for hyperdisk in GCE #10149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a1b160b
test(gce): add hyperdisk-balanced in defaults for testing
edgarulg Sep 30, 2024
a94cc90
Revert "test(gce): add hyperdisk-balanced in defaults for testing"
edgarulg Oct 2, 2024
d4234e8
feat(gce): add hyperdisk-balanced in persistentDiskTypes options
edgarulg Oct 2, 2024
56763a6
feat(gce): add hyperdisk in handlePersistentDiskChange
edgarulg Oct 2, 2024
c4ca6f2
test(gce): add logs for debug
edgarulg Oct 2, 2024
1cb73e3
feat(gce): add hyperdisk in serverGroupCommandBuilder
edgarulg Oct 2, 2024
99870e6
feat(gce): add hyperdisk in getPersistentDisks for serverGroupCommand…
edgarulg Oct 3, 2024
70f674c
Revert "test(gce): add logs for debug"
edgarulg Oct 3, 2024
be3ea7d
Merge branch 'master' into hyperdisk-persist
edgarulg Oct 3, 2024
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: 6 additions & 2 deletions packages/google/src/serverGroup/configure/serverGroupCommandBuilder.service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,9 @@ angular
}
});
const localSSDDisks = disks.filter((disk) => disk.type === 'local-ssd');
const persistentDisks = disks.filter((disk) => disk.type.startsWith('pd-'));
const persistentDisks = disks.filter(
(disk) => disk.type.startsWith('pd-') || disk.type.startsWith('hyperdisk-'),
);

if (persistentDisks.length) {
command.disks = persistentDisks.concat(localSSDDisks);
Expand Down Expand Up @@ -149,7 +151,9 @@ angular
}

function getPersistentDisks(command) {
return (command.disks || []).filter((disk) => disk.type.startsWith('pd-'));
return (command.disks || []).filter(
(disk) => disk.type.startsWith('pd-') || disk.type.startsWith('hyperdisk-'),
);
}

function calculatePersistentDiskOverriddenStorageDescription(command) {
Expand Down
2 changes: 1 addition & 1 deletion packages/google/src/serverGroup/configure/serverGroupConfiguration.service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ angular
gceTagManager,
gceLoadBalancerSetTransformer,
) {
const persistentDiskTypes = ['pd-standard', 'pd-ssd'];
const persistentDiskTypes = ['pd-standard', 'pd-ssd', 'hyperdisk-balanced'];
const authScopes = [
'cloud-platform',
'userinfo.email',
Expand Down
8 changes: 6 additions & 2 deletions ...ages/google/src/serverGroup/configure/wizard/advancedSettings/diskConfigurer.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,9 @@ class GceDiskConfigurerController implements IComponentController {
}

private sortDisks(disks: IGceDisk[]): IGceDisk[] {
const diskWithoutImage = disks.find((disk) => disk.type.startsWith('pd-') && disk.sourceImage === undefined);
const diskWithoutImage = disks.find(
(disk) => (disk.type.startsWith('pd-') || disk.type.startsWith('hyperdisk-')) && disk.sourceImage === undefined,
);
return [diskWithoutImage].concat(without(disks, diskWithoutImage));
}

Expand All @@ -93,7 +95,9 @@ class GceDiskConfigurerController implements IComponentController {
}

private getPersistentDisks(): IGceDisk[] {
return (this.command.disks || []).filter((disk: IGceDisk) => disk.type.startsWith('pd-'));
return (this.command.disks || []).filter(
(disk: IGceDisk) => disk.type.startsWith('pd-') || disk.type.startsWith('hyperdisk-'),
);
}
}

Expand Down
Loading