This is an automated email from the ASF dual-hosted git repository. dahn pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 7b64236469c0ea46e3bd152ff300027461248677 Merge: 82f91066338 1605b2f0dbd Author: Daan Hoogland <[email protected]> AuthorDate: Thu Aug 10 14:50:46 2023 +0200 Merge release branch 4.18 to main * 4.18: server: remove registered userdata when cleanup an account (#7777) server: Use max secondary storage defined on the account during upload (#7441) test: upgrade kubernetes versions to 1.25.0/1.26.0 (#7685) kvm: Added VNI Devices as normal bridge slave devs (#7836) noVNC: fix JP keyboard on vmware7+ which uses websocket URL (#7694) .../java/com/cloud/user/ResourceLimitService.java | 9 + .../main/java/com/cloud/user/dao/UserDataDao.java | 2 + .../java/com/cloud/user/dao/UserDataDaoImpl.java | 7 + .../kvm/resource/LibvirtComputingResource.java | 3 +- .../resourcelimit/ResourceLimitManagerImpl.java | 12 + .../com/cloud/storage/VolumeApiServiceImpl.java | 18 +- .../cloud/template/HypervisorTemplateAdapter.java | 16 +- .../java/com/cloud/user/AccountManagerImpl.java | 7 + .../consoleproxy/ConsoleAccessManagerImpl.java | 7 +- .../com/cloud/user/AccountManagerImplTest.java | 1 + .../com/cloud/user/AccountManagetImplTestBase.java | 3 + .../cloud/vpc/MockResourceLimitManagerImpl.java | 5 + systemvm/agent/noVNC/app/ui.js | 1 + systemvm/agent/noVNC/core/rfb.js | 62 ++ .../noVNC/keymaps/generate-language-keymaps.py | 127 +++ systemvm/agent/noVNC/keymaps/keymap-ja | 995 +++++++++++++++++++++ systemvm/agent/noVNC/keymaps/keymap-ja-atset1.js | 102 +++ test/integration/smoke/test_kubernetes_clusters.py | 41 +- .../smoke/test_kubernetes_supported_versions.py | 3 +- tools/marvin/marvin/config/test_data.py | 15 + 20 files changed, 1398 insertions(+), 38 deletions(-) diff --cc test/integration/smoke/test_kubernetes_clusters.py index 3b453476fd3,e53f71871d8..c18711e7dde --- a/test/integration/smoke/test_kubernetes_clusters.py +++ b/test/integration/smoke/test_kubernetes_clusters.py @@@ -90,8 -86,10 +90,11 @@@ class TestKubernetesCluster(cloudstackT cls._cleanup = [] cls.kubernetes_version_ids = [] cls.vpcAllowAllAclDetailsMap = {} + cls.initial_configuration_cks_enabled = None + cls.k8s_version_from = cls.services["cks_kubernetes_version_upgrade_from"] + cls.k8s_version_to = cls.services["cks_kubernetes_version_upgrade_to"] + if cls.hypervisorNotSupported == False: cls.endpoint_url = Configurations.list(cls.apiclient, name="endpoint.url")[0].value if "localhost" in cls.endpoint_url:
