Merge branch 'develop' of github.com:portainer/portainer into develop

api/portainer.go

@@ -342,6 +342,7 @@ type (
 	KubernetesStorageClassConfig struct {
 		Name        string   `json:"Name"`
 		AccessModes []string `json:"AccessModes"`
+		Provisioner string   `json:"Provisioner"`
 	}
 
 	// LDAPGroupSearchSettings represents settings used to search for groups in a LDAP server

app/kubernetes/converters/storageClass.js

@@ -7,6 +7,7 @@ class KubernetesStorageClassConverter {
   static apiToStorageClass(data) {
     const res = new KubernetesStorageClass();
     res.Name = data.metadata.name;
+    res.Provisioner = data.provisioner;
     return res;
   }
 }

app/kubernetes/models/storage-class/models.js

@@ -24,6 +24,7 @@ export function KubernetesStorageClassAccessPolicies() {
 const _KubernetesStorageClass = Object.freeze({
   Name: '',
   AccessModes: [],
+  Provisioner: '',
 });
 
 export class KubernetesStorageClass {

app/kubernetes/views/configure/configureController.js

@@ -41,6 +41,7 @@ class KubernetesConfigureController {
             const res = new KubernetesStorageClass();
             res.Name = item.Name;
             res.AccessModes = _.map(item.AccessModes, 'Name');
+            res.Provisioner = item.Provisioner;
             return res;
           }
         }),

app/kubernetes/views/volumes/edit/volume.html

@@ -37,6 +37,10 @@
                       <td>Storage</td>
                       <td>{{ ctrl.volume.PersistentVolumeClaim.StorageClass.Name }}</td>
                     </tr>
+                    <tr>
+                      <td>Provisioner</td>
+                      <td>{{ ctrl.volume.PersistentVolumeClaim.StorageClass.Provisioner ? ctrl.volume.PersistentVolumeClaim.StorageClass.Provisioner : '-' }}</td>
+                    </tr>
                     <tr>
                       <td>Size</td>
                       <td>{{ ctrl.volume.PersistentVolumeClaim.Storage }}</td>