Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
d5fefa8
Flexible tags for hosts and storage pools
Apr 13, 2023
4669e6f
fix sql
JoaoJandre May 8, 2023
edb401f
fix storage pool listing
JoaoJandre May 12, 2023
01fa877
Merge remote-tracking branch 'origin/main' into flexible-tags
JoaoJandre May 26, 2023
c6581f0
Fix zonewide storagepool listing with ruleTags
May 30, 2023
c5b33a2
Merge remote-tracking branch 'origin/main' into flexible-tags
JoaoJandre Jun 1, 2023
93c8f9b
Merge remote-tracking branch 'origin/main' into flexible-tags
JoaoJandre Jun 12, 2023
e28d991
Merge remote-tracking branch 'origin/main' into flexible-tags
JoaoJandre Jul 5, 2023
241f468
Merge remote-tracking branch 'origin/main' into flexible-tags
JoaoJandre Aug 8, 2023
1767649
Merge remote-tracking branch 'origin/main' into flexible-tags
JoaoJandre Aug 16, 2023
155a30b
Merge remote-tracking branch 'origin/main' into flexible-tags
JoaoJandre Sep 25, 2023
260ce20
fix merge errors
JoaoJandre Sep 25, 2023
00e5d79
Merge remote-tracking branch 'origin/main' into flexible-tags
JoaoJandre Sep 28, 2023
2919ab6
Merge remote-tracking branch 'origin/main' into flexible-tags
JoaoJandre Oct 26, 2023
2c7e1df
Merge remote-tracking branch 'origin/main' into flexible-tags
JoaoJandre Nov 13, 2023
76ea692
Merge remote-tracking branch 'origin/main' into flexible-tags
JoaoJandre Nov 14, 2023
fce2e8a
Add missing import
JoaoJandre Nov 14, 2023
f923536
Merge remote-tracking branch 'origin/main' into flexible-tags
JoaoJandre Nov 17, 2023
76e4aae
move views to their proper files
JoaoJandre Nov 17, 2023
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
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'origin/main' into flexible-tags
  • Loading branch information
JoaoJandre committed Jul 5, 2023
commit e28d9914d2baaca40a4ad01bfdea4358cfa9cfce
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,48 @@ ALTER TABLE `cloud`.`console_session` DROP `acquired`, ADD `acquired` datetime C
-- create_public_parameter_on_roles. #6960
ALTER TABLE `cloud`.`roles` ADD COLUMN `public_role` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'Indicates whether the role will be visible to all users (public) or only to root admins (private). If this parameter is not specified during the creation of the role its value will be defaulted to true (public).';

-- Add tables for VM Scheduler
DROP TABLE IF EXISTS `cloud`.`vm_schedule`;
CREATE TABLE `cloud`.`vm_schedule` (
`id` bigint unsigned NOT NULL auto_increment COMMENT 'id',
`vm_id` bigint unsigned NOT NULL,
`uuid` varchar(40) NOT NULL COMMENT 'schedule uuid',
`description` varchar(1024) COMMENT 'description of the vm schedule',
`schedule` varchar(255) NOT NULL COMMENT 'schedule frequency in cron format',
`timezone` varchar(100) NOT NULL COMMENT 'the timezone in which the schedule time is specified',
`action` varchar(20) NOT NULL COMMENT 'action to perform',
`enabled` int(1) NOT NULL COMMENT 'Enabled or disabled',
`start_date` datetime NOT NULL COMMENT 'start time for this schedule',
`end_date` datetime COMMENT 'end time for this schedule',
`created` datetime NOT NULL COMMENT 'date created',
`removed` datetime COMMENT 'date removed if not null',
PRIMARY KEY (`id`),
INDEX `i_vm_schedule__vm_id`(`vm_id`),
INDEX `i_vm_schedule__enabled_end_date`(`enabled`, `end_date`),
CONSTRAINT `fk_vm_schedule__vm_id` FOREIGN KEY (`vm_id`) REFERENCES `vm_instance`(`id`) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

DROP TABLE IF EXISTS `cloud`.`vm_scheduled_job`;
CREATE TABLE `cloud`.`vm_scheduled_job` (
`id` bigint unsigned NOT NULL auto_increment COMMENT 'id',
`vm_id` bigint unsigned NOT NULL,
`vm_schedule_id` bigint unsigned NOT NULL,
`uuid` varchar(40) NOT NULL COMMENT 'scheduled job uuid',
`action` varchar(20) NOT NULL COMMENT 'action to perform',
`scheduled_timestamp` datetime NOT NULL COMMENT 'Time at which the action is taken',
`async_job_id` bigint unsigned DEFAULT NULL COMMENT 'If this schedule is being executed, it is the id of the create aysnc_job. Before that it is null',
PRIMARY KEY (`id`),
UNIQUE KEY (`vm_schedule_id`, `scheduled_timestamp`),
INDEX `i_vm_scheduled_job__scheduled_timestamp`(`scheduled_timestamp`),
INDEX `i_vm_scheduled_job__vm_id`(`vm_id`),
CONSTRAINT `fk_vm_scheduled_job__vm_id` FOREIGN KEY (`vm_id`) REFERENCES `vm_instance`(`id`) ON DELETE CASCADE,
CONSTRAINT `fk_vm_scheduled_job__vm_schedule_id` FOREIGN KEY (`vm_schedule_id`) REFERENCES `vm_schedule`(`id`) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

-- Add support for different cluster types for kubernetes
ALTER TABLE `cloud`.`kubernetes_cluster` ADD COLUMN `cluster_type` varchar(64) DEFAULT 'CloudManaged' COMMENT 'type of cluster';
ALTER TABLE `cloud`.`kubernetes_cluster` MODIFY COLUMN `kubernetes_version_id` bigint unsigned NULL COMMENT 'the ID of the Kubernetes version of this Kubernetes cluster';

-- Flexible tags
ALTER TABLE `cloud`.`storage_pool_tags` ADD COLUMN is_tag_a_rule int(1) UNSIGNED not null DEFAULT 0;

Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.