github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

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

pull/4050/head
Anthony Lapenna 2020-07-15 14:08:15 +12:00
parent b7e1abf89f f71abb5669
commit a452599829
5 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/portainer.go
View File

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

1
app/kubernetes/converters/storageClass.js
View File

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

1
app/kubernetes/models/storage-class/models.js
View File

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

1
app/kubernetes/views/configure/configureController.js
View File

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

4
app/kubernetes/views/volumes/edit/volume.html
View File

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