Merge remote-tracking branch 'apache/main' into add-externaldetails-cleanup

Author: shwstppr

plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterStartWorker.java

@@ -198,16 +198,16 @@ private Pair<String, String> getKubernetesControlNodeConfig(final String control
         String initArgs = "";
         if (haSupported) {
             initArgs = String.format("--control-plane-endpoint %s:%d --upload-certs --certificate-key %s ",
-                    controlNodeIp,
+                    serverIp,
                     CLUSTER_API_PORT,
                     KubernetesClusterUtil.generateClusterHACertificateKey(kubernetesCluster));
         }
-        initArgs += String.format("--apiserver-cert-extra-sans=%s", controlNodeIp);
+        initArgs += String.format("--apiserver-cert-extra-sans=%s", serverIp);
         initArgs += String.format(" --kubernetes-version=%s", getKubernetesClusterVersion().getSemanticVersion());
         k8sControlNodeConfig = k8sControlNodeConfig.replace(clusterInitArgsKey, initArgs);
         k8sControlNodeConfig = k8sControlNodeConfig.replace(ejectIsoKey, String.valueOf(ejectIso));
         k8sControlNodeConfig = k8sControlNodeConfig.replace(etcdEndpointList, endpointList);
-        k8sControlNodeConfig = k8sControlNodeConfig.replace(k8sServerIp, controlNodeIp);
+        k8sControlNodeConfig = k8sControlNodeConfig.replace(k8sServerIp, serverIp);
         k8sControlNodeConfig = k8sControlNodeConfig.replace(k8sApiPort, String.valueOf(CLUSTER_API_PORT));
         k8sControlNodeConfig = k8sControlNodeConfig.replace(certSans, String.format("- %s", serverIp));
         k8sControlNodeConfig = k8sControlNodeConfig.replace(k8sCertificate, KubernetesClusterUtil.generateClusterHACertificateKey(kubernetesCluster));

scripts/vm/hypervisor/kvm/gpudiscovery.sh

@@ -324,7 +324,40 @@
 #           "used_by_vm": null
 #         }
 #       ]
-#     }
+#     },
+#	  {
+#	   "pci_address":"05:00.0",
+#   	"vendor_id":"1002",
+#	   "device_id":"74a5",
+#   	"vendor":"Advanced Micro Devices, Inc. [AMD/ATI]",
+#	   "device":"Aqua Vanjaram [Instinct MI325X]",
+#   	"driver":"amdgpu",
+#	   "pci_class":"Processing accelerators [1200]",
+#   	"iommu_group":"null",
+#	   "pci_root":"0000:05:00.0",
+#   	"numa_node":-1,
+#	   "sriov_totalvfs":0,
+#   	"sriov_numvfs":0,
+#	   "max_instances":null,
+#   	"video_ram":null,
+#	   "max_heads":null,
+#   	"max_resolution_x":null,
+#	   "max_resolution_y":null,
+#
+#   	"full_passthrough": {
+#     	  "enabled":1,
+#		  "libvirt_address": {
+#         "domain":"0x0000",
+#         "bus":"0x05",
+#         "slot":"0x00",
+#         "function":"0x0"
+#     	},
+#     	"used_by_vm":null
+#   	},
+
+#   	"vgpu_instances":[],
+#   	"vf_instances":[]
+# 	  }
 #   ]
 # }
 #
@@ -716,7 +749,7 @@ for LINE in "${LINES[@]}"; do
 	fi
 
 	# Only process GPU classes (3D controller)
-	if [[ ! "$PCI_CLASS" =~ (3D\ controller) ]]; then
+	if [[ ! "$PCI_CLASS" =~ (3D\ controller|Processing\ accelerators) ]]; then
 		continue
 	fi
 

server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManager.java

@@ -56,6 +56,10 @@ public interface ConsoleProxyManager extends Manager, ConsoleProxyService {
     ConfigKey<Boolean> NoVncConsoleSourceIpCheckEnabled = new ConfigKey<>(ConfigKey.CATEGORY_ADVANCED, Boolean.class, "novnc.console.sourceip.check.enabled", "false",
         "If true, The source IP to access novnc console must be same as the IP in request to management server for console URL. Needs to reconnect CPVM to management server when this changes (via restart CPVM, or management server, or cloud service in CPVM)", false);
 
+    ConfigKey<Boolean> NoVncConsoleShowDot = new ConfigKey<>(Boolean.class, "novnc.console.show.dot", ConfigKey.CATEGORY_ADVANCED, "true",
+            "If true, in noVNC console a dot cursor will be shown when the remote server provides no local cursor, or provides a fully-transparent (invisible) cursor.",
+            true, ConfigKey.Scope.Zone, null);
+
     ConfigKey<String> ConsoleProxyServiceOffering = new ConfigKey<>(String.class, "consoleproxy.service.offering", "Console Proxy", null,
             "Uuid of the service offering used by console proxy; if NULL - system offering will be used", true, ConfigKey.Scope.Zone, null);
 

server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java

@@ -1572,7 +1572,7 @@ public String getConfigComponentName() {
     public ConfigKey<?>[] getConfigKeys() {
         return new ConfigKey<?>[] { ConsoleProxySslEnabled, NoVncConsoleDefault, NoVncConsoleSourceIpCheckEnabled, ConsoleProxyServiceOffering,
                 ConsoleProxyCapacityStandby, ConsoleProxyCapacityScanInterval, ConsoleProxyCmdPort, ConsoleProxyRestart, ConsoleProxyUrlDomain, ConsoleProxySessionMax, ConsoleProxySessionTimeout, ConsoleProxyDisableRpFilter, ConsoleProxyLaunchMax,
-                ConsoleProxyManagementLastState, ConsoleProxyServiceManagementState };
+                ConsoleProxyManagementLastState, ConsoleProxyServiceManagementState, NoVncConsoleShowDot };
     }
 
     protected ConsoleProxyStatus parseJsonToConsoleProxyStatus(String json) throws JsonParseException {

server/src/main/java/org/apache/cloudstack/consoleproxy/ConsoleAccessManagerImpl.java

@@ -89,6 +89,8 @@
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
+import static com.cloud.consoleproxy.ConsoleProxyManager.NoVncConsoleShowDot;
+
 public class ConsoleAccessManagerImpl extends ManagerBase implements ConsoleAccessManager {
 
     @Inject
@@ -565,8 +567,9 @@ protected String generateConsoleAccessUrl(String rootUrl, ConsoleProxyClientPara
         if (param.getHypervHost() != null || !ConsoleProxyManager.NoVncConsoleDefault.value()) {
             sb.append("/ajax?token=").append(token);
         } else {
+            String showDot = NoVncConsoleShowDot.valueIn(vm.getDataCenterId()) ? "true" : "false";
             sb.append("/resource/noVNC/vnc.html")
-                    .append("?autoconnect=true&show_dot=true")
+                    .append("?autoconnect=true&show_dot=").append(showDot)
                     .append("&port=").append(vncPort)
                     .append("&token=").append(token);
             if (requiresVncOverWebSocketConnection(vm, hostVo) && StringUtils.isNotBlank(locale)) {