This is an automated email from the ASF dual-hosted git repository.

sureshanaparti pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.


    from b1bb22d  ui: Pass rootdisksize only if template is not deployasis 
(#5995)
     add e0a5df5  CKS Enhancements and SystemVM template upgrade improvements 
(#5863)
     add b50542a  Merge branch '4.16' into main

No new revisions were added by this update.

Summary of changes:
 .gitignore                                         |   1 +
 .../src/main/java/com/cloud/agent/AgentShell.java  |  50 ++++-----
 .../main/java/com/cloud/vm/VmDetailConstants.java  |   1 +
 engine/schema/pom.xml                              |   8 +-
 .../com/cloud/upgrade/DatabaseUpgradeChecker.java  |   9 +-
 .../upgrade/SystemVmTemplateRegistration.java      |  81 ++++++--------
 .../resources/META-INF/db/schema-41600to41610.sql  |  23 ++++
 engine/schema/templateConfig.sh                    |  20 ++--
 .../cluster/KubernetesClusterManagerImpl.java      | 120 +++++++++-----------
 .../KubernetesClusterActionWorker.java             | 101 ++++++++++++-----
 ...ernetesClusterResourceModifierActionWorker.java | 123 +++++++++++----------
 .../KubernetesClusterScaleWorker.java              |   8 +-
 .../KubernetesClusterStartWorker.java              |  57 ++++++----
 .../KubernetesClusterUpgradeWorker.java            |  10 +-
 .../cluster/CreateKubernetesClusterCmd.java        |  22 +---
 .../main/resources/conf/k8s-control-node-add.yml   |  43 +++++--
 .../src/main/resources/conf/k8s-control-node.yml   |  46 ++++++--
 .../src/main/resources/conf/k8s-node.yml           |  43 +++++--
 .../main/resources/script/upgrade-kubernetes.sh    |   2 +-
 pom.xml                                            |   1 +
 scripts/util/create-kubernetes-binaries-iso.sh     |  22 ++--
 systemvm/debian/opt/cloud/bin/setup/cksnode.sh     |   4 +-
 test/integration/smoke/test_kubernetes_clusters.py |  20 ++--
 .../scripts/configure_systemvm_services.sh         |  15 ++-
 .../scripts/install_systemvm_packages.sh           |   2 +-
 tools/appliance/systemvmtemplate/template.json     |   4 +-
 ui/public/locales/en.json                          |   2 +
 ui/src/config/section/image.js                     |   1 -
 ui/src/views/compute/CreateKubernetesCluster.vue   |   8 --
 ui/src/views/compute/KubernetesServiceTab.vue      |   3 +
 .../main/java/com/cloud/utils/EncryptionUtil.java  |  14 +--
 .../main/java/com/cloud/utils/script/Script.java   |  19 ++--
 .../java/com/cloud/utils/ssh/SSHCmdHelper.java     |  13 +--
 .../cloudstack/utils/security/DigestHelper.java    |  17 ++-
 34 files changed, 521 insertions(+), 392 deletions(-)

Reply via email to