This is an automated email from the ASF dual-hosted git repository. shwstppr pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit f905f5f39a9855c93c40d95bfb165af411f55ba4 Merge: 8d6241fb1bf 0941d01e97d Author: Abhishek Kumar <[email protected]> AuthorDate: Thu Jun 1 16:50:24 2023 +0530 Merge remote-tracking branch 'apache/4.18' into main .../com/cloud/network/vpc/NetworkACLService.java | 2 + .../command/user/network/CreateNetworkCmdTest.java | 54 +++- .../command/user/network/UpdateNetworkCmdTest.java | 38 ++- debian/cloudstack-usage.postinst | 7 +- .../resources/META-INF/db/schema-41800to41810.sql | 10 + .../NonStrictHostAffinityProcessorTest.java | 35 +-- .../cluster/KubernetesClusterManagerImpl.java | 145 +++++---- .../KubernetesClusterActionWorker.java | 170 ++++++++--- .../KubernetesClusterDestroyWorker.java | 71 ++++- ...ernetesClusterResourceModifierActionWorker.java | 331 ++++++++++++++++----- .../KubernetesClusterScaleWorker.java | 92 ++++-- .../KubernetesClusterStartWorker.java | 140 +++------ .../cluster/KubernetesClusterManagerImplTest.java | 213 +++++++++++++ .../KubernetesClusterActionWorkerTest.java | 133 +++++++++ .../cloud/network/vpc/NetworkACLServiceImpl.java | 16 +- .../network/vpc/NetworkACLServiceImplTest.java | 35 ++- .../resource/NfsSecondaryStorageResource.java | 12 +- .../resource/NfsSecondaryStorageResourceTest.java | 17 ++ test/integration/smoke/test_kubernetes_clusters.py | 140 ++++++++- ui/src/config/section/compute.js | 2 +- ui/src/views/compute/ScaleKubernetesCluster.vue | 75 +++-- 21 files changed, 1320 insertions(+), 418 deletions(-) diff --cc engine/schema/src/main/resources/META-INF/db/schema-41800to41810.sql index e595f007a6d,b3600522f99..2bd19fe2cc6 --- a/engine/schema/src/main/resources/META-INF/db/schema-41800to41810.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-41800to41810.sql @@@ -19,5 -19,12 +19,15 @@@ -- Schema upgrade from 4.18.0.0 to 4.18.1.0 --; +-- 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 Windows Server 2022 guest OS and mappings + CALL ADD_GUEST_OS_AND_HYPERVISOR_MAPPING (6, 'Windows Server 2022 (64-bit)', 'KVM', 'default', 'Windows Server 2022 (64-bit)'); + CALL ADD_GUEST_OS_AND_HYPERVISOR_MAPPING (6, 'Windows Server 2022 (64-bit)', 'VMware', '7.0', 'windows2019srvNext_64Guest'); + CALL ADD_GUEST_OS_AND_HYPERVISOR_MAPPING (6, 'Windows Server 2022 (64-bit)', 'VMware', '7.0.1.0', 'windows2019srvNext_64Guest'); + CALL ADD_GUEST_OS_AND_HYPERVISOR_MAPPING (6, 'Windows Server 2022 (64-bit)', 'VMware', '7.0.2.0', 'windows2019srvNext_64Guest'); + CALL ADD_GUEST_OS_AND_HYPERVISOR_MAPPING (6, 'Windows Server 2022 (64-bit)', 'VMware', '7.0.3.0', 'windows2019srvNext_64Guest'); + CALL ADD_GUEST_OS_AND_HYPERVISOR_MAPPING (6, 'Windows Server 2022 (64-bit)', 'VMware', '8.0', 'windows2019srvNext_64Guest'); + CALL ADD_GUEST_OS_AND_HYPERVISOR_MAPPING (6, 'Windows Server 2022 (64-bit)', 'VMware', '8.0.0.1', 'windows2019srvNext_64Guest'); + CALL ADD_GUEST_OS_AND_HYPERVISOR_MAPPING (6, 'Windows Server 2022 (64-bit)', 'Xenserver', '8.2.0', 'Windows Server 2022 (64-bit)'); diff --cc ui/src/views/compute/ScaleKubernetesCluster.vue index aad6d6e5280,f9af2efac62..8d73ac861d7 --- a/ui/src/views/compute/ScaleKubernetesCluster.vue +++ b/ui/src/views/compute/ScaleKubernetesCluster.vue @@@ -28,6 -28,25 +28,25 @@@ :rules="rules" @finish="handleSubmit" layout="vertical"> + <a-form-item name="serviceofferingid" ref="serviceofferingid"> + <template #label> + <tooltip-label :title="$t('label.serviceofferingid')" :tooltip="apiParams.serviceofferingid.description"/> + </template> + <a-select + id="offering-selection" + v-model:value="form.serviceofferingid" + showSearch + optionFilterProp="label" + :filterOption="(input, option) => { - return option.children[0].children.toLowerCase().indexOf(input.toLowerCase()) >= 0 ++ return option.label.children.toLowerCase().indexOf(input.toLowerCase()) >= 0 + }" + :loading="serviceOfferingLoading" + :placeholder="apiParams.serviceofferingid.description"> - <a-select-option v-for="(opt, optIndex) in serviceOfferings" :key="optIndex"> ++ <a-select-option v-for="(opt, optIndex) in serviceOfferings" :key="optIndex" :label="opt.name || opt.description"> + {{ opt.name || opt.description }} + </a-select-option> + </a-select> + </a-form-item> <a-form-item name="autoscalingenabled" ref="autoscalingenabled" v-if="apiParams.autoscalingenabled"> <template #label> <tooltip-label :title="$t('label.cks.cluster.autoscalingenabled')" :tooltip="apiParams.autoscalingenabled.description"/>
