forward Merge branch '4.19' into main

Author: DaanHoogland

engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStoreDriver.java

@@ -44,6 +44,10 @@ enum QualityOfServiceState { MIGRATION, NO_MIGRATION }
 
     void revokeAccess(DataObject dataObject, Host host, DataStore dataStore);
 
+    default boolean requiresAccessForMigration(DataObject dataObject) {
+        return false;
+    }
+
     /**
      * intended for managed storage (cloud.storage_pool.managed = true)
      * if not managed, return volume.getSize()

engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/VolumeService.java

@@ -57,6 +57,8 @@ public VolumeInfo getVolume() {
 
     void revokeAccess(DataObject dataObject, Host host, DataStore dataStore);
 
+    boolean requiresAccessForMigration(DataObject dataObject, DataStore dataStore);
+
     /**
      * Creates the volume based on the given criteria
      *

engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java

@@ -1230,8 +1230,8 @@ public void release(long vmId, long hostId) {
                 DataStore dataStore = dataStoreMgr.getDataStore(volumeForVm.getPoolId(), DataStoreRole.Primary);
                 PrimaryDataStore primaryDataStore = (PrimaryDataStore)dataStore;
 
-                // This might impact other managed storages, grant access for PowerFlex storage pool only
-                if (primaryDataStore.isManaged() && primaryDataStore.getPoolType() == Storage.StoragePoolType.PowerFlex) {
+                // This might impact other managed storages, enable requires access for migration in relevant datastore driver (currently enabled for PowerFlex storage pool only)
+                if (primaryDataStore.isManaged() && volService.requiresAccessForMigration(volumeInfo, dataStore)) {
                     volService.revokeAccess(volumeInfo, host, dataStore);
                 }
             }
@@ -1509,8 +1509,8 @@ public void prepareForMigration(VirtualMachineProfile vm, DeployDestination dest
             disk.setDetails(getDetails(volumeInfo, dataStore));
 
             PrimaryDataStore primaryDataStore = (PrimaryDataStore)dataStore;
-            // This might impact other managed storages, grant access for PowerFlex storage pool only
-            if (primaryDataStore.isManaged() && primaryDataStore.getPoolType() == Storage.StoragePoolType.PowerFlex) {
+            // This might impact other managed storages, enable requires access for migration in relevant datastore driver (currently enabled for PowerFlex storage pool only)
+            if (primaryDataStore.isManaged() && volService.requiresAccessForMigration(volumeInfo, dataStore)) {
                 volService.grantAccess(volFactory.getVolume(vol.getId()), dest.getHost(), dataStore);
             }
 

engine/schema/src/main/resources/META-INF/db/views/cloud.domain_view.sql

@@ -18,6 +18,7 @@
 -- VIEW `cloud`.`domain_view`;
 
 DROP VIEW IF EXISTS `cloud`.`domain_view`;
+
 CREATE VIEW `cloud`.`domain_view` AS
 select
     `domain`.`id` AS `id`,

engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java

@@ -268,6 +268,19 @@ public void revokeAccess(DataObject dataObject, Host host, DataStore dataStore)
         }
     }
 
+    @Override
+    public boolean requiresAccessForMigration(DataObject dataObject, DataStore dataStore) {
+        DataStoreDriver dataStoreDriver = dataStore != null ? dataStore.getDriver() : null;
+        if (dataStoreDriver == null) {
+            return false;
+        }
+
+        if (dataStoreDriver instanceof PrimaryDataStoreDriver) {
+            return ((PrimaryDataStoreDriver)dataStoreDriver).requiresAccessForMigration(dataObject);
+        }
+        return false;
+    }
+
     @Override
     public AsyncCallFuture<VolumeApiResult> createVolumeAsync(VolumeInfo volume, DataStore dataStore) {
         AsyncCallFuture<VolumeApiResult> future = new AsyncCallFuture<VolumeApiResult>();

plugins/integrations/kubernetes-service/src/main/resources/script/deploy-cloudstack-secret

@@ -21,14 +21,14 @@ function usage() {
 Usage: ./deploy-cloudstack-secret [OPTIONS]...
 To deploy the keys needed for the cloudstack kubernetes provider.
 Arguments:
-  -u, --url string         ID of the cluster
+  -u, --url string         URL of the CloudStack API
   -k, --key string         API Key
   -s, --secret string      Secret Key
   -p, --project string     Project ID
 Other arguments:
   -h, --help              Display this help message and exit
 Examples:
-  ./deploy-cloudstack-secret -u http://localhost:8080 -k abcd -s efgh
+  ./deploy-cloudstack-secret -u http://10.10.10.10:8080/client/api -k abcd -s efgh
 USAGE
     exit 0
 }

plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/driver/ScaleIOPrimaryDataStoreDriver.java

@@ -304,6 +304,11 @@ public String getConnectedSdc(long poolId, long hostId) {
         return null;
     }
 
+    @Override
+    public boolean requiresAccessForMigration(DataObject dataObject) {
+        return true;
+    }
+
     @Override
     public long getUsedBytes(StoragePool storagePool) {
         long usedSpaceBytes = 0;

ui/public/config.json

@@ -14,6 +14,8 @@
   "logo": "assets/logo.svg",
   "minilogo": "assets/mini-logo.svg",
   "banner": "assets/banner.svg",
+  "loginPageTitle": "CloudStack",
+  "loginPageFavicon": "assets/logo.svg",
   "error": {
     "403": "assets/403.png",
     "404": "assets/404.png",

ui/public/index.html

@@ -22,8 +22,8 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <link rel="icon" href="<%= BASE_URL %>cloud.ico">
-    <title>Apache CloudStack</title>
+    <link id="favicon" rel="icon" href="<%= BASE_URL %>cloud.ico">
+    <title id="title" >Apache CloudStack</title>
     <style>
       .loader {
         border: 16px solid #F3F3F3;
@@ -54,4 +54,12 @@
       <div class="loader"></div>
     </div>
   </body>
+  <script type="text/javascript">
+    fetch('./config.json')
+      .then(response => response.json())
+      .then(data => {
+        document.getElementById("favicon").setAttribute("href", data.loginPageFavicon);
+        document.getElementById("title").innerHTML = data.loginPageTitle;
+      }).catch((err) => {});
+  </script>
 </html>

ui/public/locales/en.json

@@ -580,6 +580,7 @@
 "label.creating.iprange": "Creating IP ranges",
 "label.credit": "Credit",
 "label.cron": "Cron expression",
+"label.cron.mode": "Cron mode",
 "label.crosszones": "Cross zones",
 "label.currency": "Currency",
 "label.current": "Current",