Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-02 20:35:25 +02:00
Code Issues Releases Activity

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

Browse source
This commit is contained in:
Anthony Lapenna 2020-07-15 14:08:15 +12:00
commit a452599829
5 changed files with 8 additions and 0 deletions
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 {
Name string `json:"Name"`
AccessModes []string `json:"AccessModes"`
Provisioner string `json:"Provisioner"`
}
// 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) {
const res = new KubernetesStorageClass();
res.Name = data.metadata.name;
res.Provisioner = data.provisioner;
return res;
}
}

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

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

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

@ -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;
}
}),

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

@ -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>