This is an automated email from the ASF dual-hosted git repository.
pearl11594 pushed a change to branch netris-integration-upstream
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from 8ad95c47973 Fix issue with duplicate parameter in json response
add 4a672fd9b35 docs: fix outdated Maven subtitle in INSTALL.md (#11012)
add 28e24111100 engine-schema: fix naming for AlmaLinux (#11011)
add 675ee2ab398 Add parameter to not create additional users on
`cloudstack-setup-databases` (#9969)
add 380884ed500 Fix data being replicated on VM's metadata file in the VR
(#10987)
add 7f13beb36a7 Check Qcow2 version before using --bitmaps (#10896)
add 685ee9e78f6 StorPool: support for direct download (#9833)
add 28ff19b7516 enabled discard option (#10077)
add e83a347ace0 Improves StoragePoolAllocators' logs (#10475)
add ea7919b0c1c Remove test/selenium/ test/src-not-used/ (#11013)
add 6aaaa838b25 docs: revise INSTALL.md with updated Maven setup (#11025)
add f8c4121ea34 Add access modifiers to `VirtualMachineTO` (#9277)
add 4662ffc4243 Changes baseurl for downloading kubectl (#11040)
add 6adfda2818e CKS Enhancements (#9102)
add 5b7c3b475e3 docs: Update INSTALL.md for frontend build instructions
(#11057)
add e61ca8eb0a3 Merge branch 'main' of
https://github.com/apache/cloudstack into netris-integration-upstream
No new revisions were added by this update.
Summary of changes:
INSTALL.md | 16 +-
.../com/cloud/agent/api/to/VirtualMachineTO.java | 129 +++--
api/src/main/java/com/cloud/event/EventTypes.java | 2 +
.../kubernetes/cluster/KubernetesCluster.java | 24 +
.../cluster/KubernetesServiceHelper.java | 9 +
.../java/com/cloud/network/NetworkService.java | 2 +
api/src/main/java/com/cloud/network/vpc/Vpc.java | 2 +
.../java/com/cloud/network/vpc/VpcService.java | 8 +-
.../java/com/cloud/server/ManagementService.java | 24 +-
.../com/cloud/template/TemplateApiService.java | 19 +-
.../com/cloud/template/VirtualMachineTemplate.java | 2 +
api/src/main/java/com/cloud/user/UserData.java | 1 +
api/src/main/java/com/cloud/vm/UserVmService.java | 3 +-
.../main/java/com/cloud/vm/VmDetailConstants.java | 3 +
.../cloudstack/api/ApiCommandResourceType.java | 2 +-
.../org/apache/cloudstack/api/ApiConstants.java | 22 +
.../api/command/user/iso/DetachIsoCmd.java | 2 +-
.../template/GetUploadParamsForTemplateCmd.java | 9 +
.../command/user/template/ListTemplatesCmd.java | 7 +
.../command/user/template/RegisterTemplateCmd.java | 9 +
.../command/user/template/UpdateTemplateCmd.java | 9 +
...erDataCmd.java => BaseRegisterUserDataCmd.java} | 85 +--
...DataCmd.java => DeleteCniConfigurationCmd.java} | 60 +-
...erDataCmd.java => ListCniConfigurationCmd.java} | 46 +-
.../api/command/user/userdata/ListUserDataCmd.java | 2 +-
...taCmd.java => RegisterCniConfigurationCmd.java} | 60 +-
.../command/user/userdata/RegisterUserDataCmd.java | 79 +--
.../api/command/user/vpc/CreateVPCCmd.java | 9 +
...Response.java => KubernetesUserVmResponse.java} | 37 +-
.../cloudstack/api/response/TemplateResponse.java | 9 +
.../command/user/userdata/ListUserDataCmdTest.java | 4 +-
...iorityCommand.java => HandleCksIsoCommand.java} | 15 +-
.../agent/resource/virtualnetwork/VRScripts.java | 3 +
.../virtualnetwork/VirtualRoutingResource.java | 12 +
debian/rules | 8 +
.../com/cloud/network/dao/FirewallRulesDao.java | 2 +
.../cloud/network/dao/FirewallRulesDaoImpl.java | 17 +
.../network/rules/dao/PortForwardingRulesDao.java | 2 +
.../rules/dao/PortForwardingRulesDaoImpl.java | 11 +
.../src/main/java/com/cloud/network/vpc/VpcVO.java | 12 +
.../main/java/com/cloud/storage/VMTemplateVO.java | 11 +
.../com/cloud/upgrade/dao/Upgrade42010to42100.java | 94 +++
.../src/main/java/com/cloud/user/UserDataVO.java | 10 +
.../resources/META-INF/db/schema-42010to42100.sql | 45 +-
.../META-INF/db/views/cloud.template_view.sql | 1 +
.../cloud/upgrade/dao/Upgrade42010to42100Test.java | 8 +
.../storage/image/store/TemplateObject.java | 5 +
.../ClusterScopeStoragePoolAllocator.java | 2 +-
.../allocator/ZoneWideStoragePoolAllocator.java | 2 +-
packaging/el8/cloud.spec | 9 +-
.../org/apache/cloudstack/utils/qemu/QemuImg.java | 5 +-
.../cluster/KubernetesClusterEventTypes.java | 2 +
.../cluster/KubernetesClusterManagerImpl.java | 629 +++++++++++++++++----
.../cluster/KubernetesClusterService.java | 57 +-
.../kubernetes/cluster/KubernetesClusterVO.java | 102 +++-
.../cluster/KubernetesClusterVmMapVO.java | 44 ++
.../cluster/KubernetesServiceHelperImpl.java | 134 +++++
.../KubernetesClusterActionWorker.java | 439 ++++++++++++--
.../actionworkers/KubernetesClusterAddWorker.java | 326 +++++++++++
.../KubernetesClusterDestroyWorker.java | 26 +-
.../KubernetesClusterRemoveWorker.java | 183 ++++++
...ernetesClusterResourceModifierActionWorker.java | 293 ++++++----
.../KubernetesClusterScaleWorker.java | 252 +++++++--
.../KubernetesClusterStartWorker.java | 383 +++++++++++--
.../KubernetesClusterUpgradeWorker.java | 22 +-
.../cluster/dao/KubernetesClusterVmMapDao.java | 3 +
.../cluster/dao/KubernetesClusterVmMapDaoImpl.java | 23 +
.../cluster/utils/KubernetesClusterUtil.java | 24 +-
...md.java => AddNodesToKubernetesClusterCmd.java} | 118 ++--
.../cluster/CreateKubernetesClusterCmd.java | 135 ++++-
...va => RemoveNodesFromKubernetesClusterCmd.java} | 112 ++--
.../cluster/ScaleKubernetesClusterCmd.java | 14 +
.../cluster/StartKubernetesClusterCmd.java | 6 +-
.../api/response/KubernetesClusterResponse.java | 115 +++-
.../src/main/resources/conf/etcd-node.yml | 134 +++++
.../main/resources/conf/k8s-control-node-add.yml | 14 +-
.../src/main/resources/conf/k8s-control-node.yml | 57 +-
.../src/main/resources/conf/k8s-node.yml | 29 +-
.../main/resources/script/remove-node-from-cluster | 40 +-
.../main/resources/script/upgrade-kubernetes.sh | 10 +-
.../src/main/resources/script/validate-cks-node | 45 ++
.../cluster/KubernetesClusterHelperImplTest.java | 145 +++++
.../cluster/KubernetesClusterManagerImplTest.java | 129 +++++
.../KubernetesClusterScaleWorkerTest.java | 128 +++++
.../KubernetesClusterUpgradeWorkerTest.java | 83 +++
.../cluster/utils/KubernetesClusterUtilTest.java | 8 +-
.../apache/cloudstack/service/NsxApiClient.java | 1 -
.../org/apache/cloudstack/service/NsxElement.java | 12 +-
.../allocator/RandomStoragePoolAllocator.java | 2 +-
.../lifecycle/StorageVmSharedFSLifeCycle.java | 4 +-
.../kvm/storage/StorPoolStorageAdaptor.java | 222 +++++++-
.../kvm/storage/StorPoolStoragePool.java | 8 +
pom.xml | 2 -
scripts/util/create-kubernetes-binaries-iso.sh | 12 +-
.../main/java/com/cloud/api/ApiResponseHelper.java | 10 +-
.../java/com/cloud/api/query/QueryManagerImpl.java | 15 +-
.../cloud/api/query/dao/TemplateJoinDaoImpl.java | 1 +
.../com/cloud/api/query/vo/TemplateJoinVO.java | 7 +
.../configuration/ConfigurationManagerImpl.java | 15 +
.../cloud/network/NetworkMigrationManagerImpl.java | 2 +-
.../java/com/cloud/network/NetworkServiceImpl.java | 24 +
.../cloud/network/router/CommandSetupHelper.java | 8 +
.../router/VirtualNetworkApplianceManagerImpl.java | 16 +
.../java/com/cloud/network/vpc/VpcManagerImpl.java | 5 +-
.../com/cloud/server/ManagementServerImpl.java | 49 +-
.../java/com/cloud/storage/TemplateProfile.java | 9 +
.../upload/params/TemplateUploadParams.java | 4 +-
.../storage/upload/params/UploadParamsBase.java | 7 +-
.../cloud/template/HypervisorTemplateAdapter.java | 1 +
.../java/com/cloud/template/TemplateAdapter.java | 2 +-
.../com/cloud/template/TemplateAdapterBase.java | 17 +-
.../com/cloud/template/TemplateManagerImpl.java | 66 ++-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 5 +-
.../com/cloud/network/vpc/VpcManagerImplTest.java | 10 +-
.../com/cloud/server/ManagementServerImplTest.java | 6 +-
.../java/com/cloud/vpc/MockNetworkManagerImpl.java | 5 +
.../storage/formatinspector/Qcow2Inspector.java | 28 +
setup/bindir/cloud-setup-databases.in | 21 +
.../opt/cloud/bin/{cleanup.sh => cks_iso.sh} | 20 +-
systemvm/debian/opt/cloud/bin/configure.py | 1 +
systemvm/debian/opt/cloud/bin/cs/CsConfig.py | 10 +-
systemvm/debian/opt/cloud/bin/cs/CsDatabag.py | 5 +
systemvm/debian/opt/cloud/bin/cs/CsDhcp.py | 7 +-
systemvm/debian/opt/cloud/bin/cs/CsGuestNetwork.py | 4 +-
test/integration/smoke/test_kubernetes_clusters.py | 294 +++++++++-
test/pom.xml | 10 -
test/selenium/ReadMe.txt | 66 ---
test/selenium/browser/firefox.py | 55 --
test/selenium/common/Global_Locators.py | 230 --------
test/selenium/common/__init__.py | 16 -
test/selenium/common/shared.py | 148 -----
test/selenium/cspages/__init__.py | 16 -
test/selenium/cspages/accounts/accountspage.py | 175 ------
test/selenium/cspages/accounts/userspage.py | 146 -----
test/selenium/cspages/cspage.py | 20 -
test/selenium/cspages/dashboard/__init__.py | 16 -
test/selenium/cspages/dashboard/dashboardpage.py | 73 ---
test/selenium/cspages/login/__init__.py | 16 -
test/selenium/cspages/login/loginpage.py | 103 ----
test/selenium/cstests/__init__.py | 16 -
test/selenium/cstests/regressiontests/__init__.py | 16 -
test/selenium/cstests/smoketests/__init__.py | 16 -
test/selenium/cstests/smoketests/adduser_test.py | 103 ----
.../cstests/smoketests/adduseraccount_test.py | 96 ----
.../selenium/cstests/smoketests/deleteuser_test.py | 100 ----
.../cstests/smoketests/deleteuseraccount_test.py | 91 ---
.../cstests/smoketests/global_settings_test.py | 69 ---
.../smoketests/login_logout_as_JohnD_test.py | 61 --
.../cstests/smoketests/login_logout_test.py | 190 -------
.../selenium/cstests/smoketests/navigation_test.py | 79 ---
test/selenium/cstests/smoketests/smokecfg.py | 62 --
test/selenium/lib/Global_Locators.py | 222 --------
test/selenium/lib/initialize.py | 46 --
test/selenium/smoke/Login_and_Accounts.py | 254 ---------
test/selenium/smoke/Service_Offering.py | 426 --------------
test/selenium/smoke/TemplatesAndISO.py | 244 --------
test/selenium/smoke/VM_lifeCycle.py | 613 --------------------
test/selenium/smoke/main.py | 142 -----
tools/apidoc/gen_toc.py | 2 +
.../cks/ubuntu/22.04/cks-ubuntu-2204.json | 56 ++
.../appliance/cks/ubuntu/22.04/http/meta-data | 0
tools/appliance/cks/ubuntu/22.04/http/user-data | 103 ++++
.../cks/ubuntu/22.04/scripts/add-interface-rule.sh | 40 +-
.../cks/ubuntu/22.04/scripts/apt_upgrade.sh | 28 +-
.../ubuntu/22.04}/scripts/cleanup.sh | 0
.../ubuntu/22.04/scripts/configure-cloud-init.sh | 51 ++
.../ubuntu/22.04}/scripts/configure_networking.sh | 9 +-
.../cks/ubuntu/22.04/scripts/setup-interfaces.sh | 63 +++
.../cks/ubuntu/22.04/scripts/setup_template.sh | 42 +-
tools/appliance/{ => cks/ubuntu}/build.sh | 52 +-
tools/docker/Dockerfile.smokedev | 1 -
ui/public/locales/en.json | 39 +-
ui/src/components/view/DetailsTab.vue | 10 +-
ui/src/components/view/InfoCard.vue | 27 +
ui/src/config/section/compute.js | 115 +++-
ui/src/config/section/image.js | 2 +-
ui/src/utils/plugins.js | 3 +
ui/src/views/AutogenView.vue | 4 +
ui/src/views/compute/CreateKubernetesCluster.vue | 437 +++++++++++++-
ui/src/views/compute/KubernetesAddNodes.vue | 186 ++++++
ui/src/views/compute/KubernetesRemoveNodes.vue | 151 +++++
ui/src/views/compute/KubernetesServiceTab.vue | 49 +-
ui/src/views/compute/RegisterUserData.vue | 53 +-
ui/src/views/compute/ScaleKubernetesCluster.vue | 146 ++++-
ui/src/views/compute/wizard/UserDataSelection.vue | 6 +
ui/src/views/image/RegisterOrUploadTemplate.vue | 5 +
ui/src/views/image/UpdateTemplate.vue | 8 +-
ui/src/views/network/CreateVpc.vue | 16 +-
188 files changed, 6709 insertions(+), 5101 deletions(-)
rename {plugins/integrations/kubernetes-service =>
api}/src/main/java/com/cloud/kubernetes/cluster/KubernetesCluster.java (82%)
copy
api/src/main/java/org/apache/cloudstack/api/command/user/userdata/{RegisterUserDataCmd.java
=> BaseRegisterUserDataCmd.java} (50%)
copy
api/src/main/java/org/apache/cloudstack/api/command/user/userdata/{DeleteUserDataCmd.java
=> DeleteCniConfigurationCmd.java} (54%)
copy
api/src/main/java/org/apache/cloudstack/api/command/user/userdata/{ListUserDataCmd.java
=> ListCniConfigurationCmd.java} (64%)
copy
api/src/main/java/org/apache/cloudstack/api/command/user/userdata/{ListUserDataCmd.java
=> RegisterCniConfigurationCmd.java} (57%)
copy
api/src/main/java/org/apache/cloudstack/api/response/{LoadBalancerRuleVmMapResponse.java
=> KubernetesUserVmResponse.java} (59%)
copy core/src/main/java/com/cloud/agent/api/{BumpUpPriorityCommand.java =>
HandleCksIsoCommand.java} (77%)
create mode 100644
plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterAddWorker.java
create mode 100644
plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterRemoveWorker.java
copy
plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/{UpgradeKubernetesClusterCmd.java
=> AddNodesToKubernetesClusterCmd.java} (54%)
copy
plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/{UpgradeKubernetesClusterCmd.java
=> RemoveNodesFromKubernetesClusterCmd.java} (56%)
create mode 100644
plugins/integrations/kubernetes-service/src/main/resources/conf/etcd-node.yml
copy systemvm/debian/root/reconfigLB.sh =>
plugins/integrations/kubernetes-service/src/main/resources/script/remove-node-from-cluster
(55%)
mode change 100755 => 100644
create mode 100644
plugins/integrations/kubernetes-service/src/main/resources/script/validate-cks-node
create mode 100644
plugins/integrations/kubernetes-service/src/test/java/com/cloud/kubernetes/cluster/KubernetesClusterHelperImplTest.java
create mode 100644
plugins/integrations/kubernetes-service/src/test/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterScaleWorkerTest.java
create mode 100644
plugins/integrations/kubernetes-service/src/test/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterUpgradeWorkerTest.java
copy systemvm/debian/opt/cloud/bin/{cleanup.sh => cks_iso.sh} (65%)
mode change 100755 => 100644
delete mode 100644 test/selenium/ReadMe.txt
delete mode 100644 test/selenium/browser/firefox.py
delete mode 100644 test/selenium/common/Global_Locators.py
delete mode 100644 test/selenium/common/__init__.py
delete mode 100644 test/selenium/common/shared.py
delete mode 100644 test/selenium/cspages/__init__.py
delete mode 100644 test/selenium/cspages/accounts/accountspage.py
delete mode 100644 test/selenium/cspages/accounts/userspage.py
delete mode 100644 test/selenium/cspages/cspage.py
delete mode 100644 test/selenium/cspages/dashboard/__init__.py
delete mode 100644 test/selenium/cspages/dashboard/dashboardpage.py
delete mode 100644 test/selenium/cspages/login/__init__.py
delete mode 100644 test/selenium/cspages/login/loginpage.py
delete mode 100644 test/selenium/cstests/__init__.py
delete mode 100644 test/selenium/cstests/regressiontests/__init__.py
delete mode 100644 test/selenium/cstests/smoketests/__init__.py
delete mode 100644 test/selenium/cstests/smoketests/adduser_test.py
delete mode 100644 test/selenium/cstests/smoketests/adduseraccount_test.py
delete mode 100644 test/selenium/cstests/smoketests/deleteuser_test.py
delete mode 100644 test/selenium/cstests/smoketests/deleteuseraccount_test.py
delete mode 100644 test/selenium/cstests/smoketests/global_settings_test.py
delete mode 100644
test/selenium/cstests/smoketests/login_logout_as_JohnD_test.py
delete mode 100644 test/selenium/cstests/smoketests/login_logout_test.py
delete mode 100644 test/selenium/cstests/smoketests/navigation_test.py
delete mode 100644 test/selenium/cstests/smoketests/smokecfg.py
delete mode 100644 test/selenium/lib/Global_Locators.py
delete mode 100644 test/selenium/lib/initialize.py
delete mode 100644 test/selenium/smoke/Login_and_Accounts.py
delete mode 100644 test/selenium/smoke/Service_Offering.py
delete mode 100644 test/selenium/smoke/TemplatesAndISO.py
delete mode 100644 test/selenium/smoke/VM_lifeCycle.py
delete mode 100644 test/selenium/smoke/main.py
create mode 100644 tools/appliance/cks/ubuntu/22.04/cks-ubuntu-2204.json
rename test/selenium/browser/__init__.py =>
tools/appliance/cks/ubuntu/22.04/http/meta-data (100%)
create mode 100644 tools/appliance/cks/ubuntu/22.04/http/user-data
copy scripts/vm/hypervisor/xenserver/kill_copy_process.sh =>
tools/appliance/cks/ubuntu/22.04/scripts/add-interface-rule.sh (52%)
mode change 100755 => 100644
copy test/scripts/bootstrap-regression.sh =>
tools/appliance/cks/ubuntu/22.04/scripts/apt_upgrade.sh (74%)
mode change 100755 => 100644
copy tools/appliance/{systemvmtemplate => cks/ubuntu/22.04}/scripts/cleanup.sh
(100%)
create mode 100644
tools/appliance/cks/ubuntu/22.04/scripts/configure-cloud-init.sh
copy tools/appliance/{systemvmtemplate =>
cks/ubuntu/22.04}/scripts/configure_networking.sh (93%)
create mode 100644 tools/appliance/cks/ubuntu/22.04/scripts/setup-interfaces.sh
copy scripts/vm/hypervisor/xenserver/kill_copy_process.sh =>
tools/appliance/cks/ubuntu/22.04/scripts/setup_template.sh (59%)
mode change 100755 => 100644
copy tools/appliance/{ => cks/ubuntu}/build.sh (86%)
create mode 100644 ui/src/views/compute/KubernetesAddNodes.vue
create mode 100644 ui/src/views/compute/KubernetesRemoveNodes.vue
