diff --git a/app/authenticated/cluster/storage/persistent-volumes/index/controller.js b/app/authenticated/cluster/storage/persistent-volumes/index/controller.js
index 053546e1d..2b959dd79 100644
--- a/app/authenticated/cluster/storage/persistent-volumes/index/controller.js
+++ b/app/authenticated/cluster/storage/persistent-volumes/index/controller.js
@@ -15,6 +15,12 @@ export const headers = [
searchField: 'displayName',
translationKey: 'generic.name',
},
+ {
+ name: 'displayPvc',
+ sort: ['displayPvc', 'sortName', 'id'],
+ searchField: 'displayPvc',
+ translationKey: 'cruPersistentVolume.pvc',
+ },
{
name: 'source',
sort: ['displaySource', 'name', 'id'],
diff --git a/app/authenticated/cluster/storage/persistent-volumes/index/template.hbs b/app/authenticated/cluster/storage/persistent-volumes/index/template.hbs
index 2f18a9b4e..e3716d509 100644
--- a/app/authenticated/cluster/storage/persistent-volumes/index/template.hbs
+++ b/app/authenticated/cluster/storage/persistent-volumes/index/template.hbs
@@ -30,6 +30,13 @@
{{obj.displayName}}
|
+
+ {{#if obj.displayPvc}}
+ {{obj.displayPvc}}
+ {{else}}
+ {{t 'generic.na'}}
+ {{/if}}
+ |
{{obj.displaySource}}
|
diff --git a/app/components/cru-persistent-volume/template.hbs b/app/components/cru-persistent-volume/template.hbs
index e2c817c22..c5ea3b1bc 100644
--- a/app/components/cru-persistent-volume/template.hbs
+++ b/app/components/cru-persistent-volume/template.hbs
@@ -13,6 +13,9 @@
{{#if model.description}}
{{banner-message color='bg-secondary mb-0 mt-10' message=(linkify model.description)}}
{{/if}}
+ {{#if model.showTransitioningMessage}}
+ {{uc-first model.transitioningMessage}}
+ {{/if}}
{{else}}
{{form-name-description
model=primaryResource
@@ -24,10 +27,39 @@
}}
{{/if}}
-
-
-
- {{#if editing}}
+{{#if isView}}
+
+
+
+ {{t (concat 'volumeSource.' sourceName '.title')}}
+
+
+
+ {{capacity}} {{t 'cruPersistentVolume.capacity.unit'}}
+
+
+
+ {{model.persistentVolumeReclaimPolicy}}
+
+
+
+
+
+ {{#if model.displayPvc}}
+ {{model.displayPvc}}
+ {{else}}
+ {{t 'generic.na'}}
+ {{/if}}
+
+
+
+ {{date-calendar model.created}}
+
+
+{{else}}
+
+
+
{{new-select
content=sourceChoices
prompt="cruPersistentVolume.source.prompt"
@@ -36,26 +68,18 @@
value=sourceName
readOnly=isView
}}
- {{else}}
-
- {{t (concat 'volumeSource.' sourceName '.title')}}
-
- {{/if}}
-
-
-
- {{#if editing}}
+
+
+
{{input-number classNames="form-control" value=capacity}}
{{t 'cruPersistentVolume.capacity.unit'}}
- {{else}}
-
- {{capacity}} {{t 'cruPersistentVolume.capacity.unit'}}
-
- {{/if}}
+
-
+{{/if}}
+
+
@@ -139,14 +163,20 @@
{{/accordion-list-item}}
{{#if isView}}
- {{resource-event-list
- resourceType=(t 'generic.persistentVolume')
- expandAll=al.expandAll
- expandFn=expandFn
- name=model.name
- kind="PersistentVolume"
- }}
- {{/if}}
+ {{resource-event-list
+ resourceType=(t 'generic.persistentVolume')
+ expandAll=al.expandAll
+ expandFn=expandFn
+ name=model.name
+ kind="PersistentVolume"
+ }}
+
+ {{annotations-section
+ model=model
+ expandAll=al.expandAll
+ expandFn=expandFn
+ }}
+ {{/if}}
{{/accordion-list}}
{{#unless isView}}
diff --git a/app/components/form-node-affinity/template.hbs b/app/components/form-node-affinity/template.hbs
index be9b64715..8effaa3d6 100644
--- a/app/components/form-node-affinity/template.hbs
+++ b/app/components/form-node-affinity/template.hbs
@@ -4,7 +4,7 @@
rule=rule
editing=editing}}
{{else if (not editing)}}
-
{{t 'formNodeAffinity.noRules'}}
+
{{t 'formNodeAffinity.noRules'}}
{{/each}}
{{#if editing}}
diff --git a/app/models/persistentvolume.js b/app/models/persistentvolume.js
index 0a37e171d..2bf59653f 100644
--- a/app/models/persistentvolume.js
+++ b/app/models/persistentvolume.js
@@ -14,6 +14,12 @@ export default Volume.extend({
return !!get(this, 'links.remove') && get(this, 'state') !== 'bound';
}),
+ displayPvc: computed('claimRef.namespace', 'claimRef.name', function() {
+ if ( get(this, 'claimRef.name') ) {
+ return `${ get(this, 'claimRef.namespace') }/${ get(this, 'claimRef.name') }`;
+ }
+ }),
+
actions: {
edit() {
get(this, 'router').transitionTo('authenticated.cluster.storage.persistent-volumes.detail.edit', get(this, 'id'));
diff --git a/translations/en-us.yaml b/translations/en-us.yaml
index dd615886f..e7edbc993 100644
--- a/translations/en-us.yaml
+++ b/translations/en-us.yaml
@@ -2261,6 +2261,8 @@ cruPersistentVolume:
storageClass:
label: Assign to Storage Class
prompt: None
+ pvc: Persistent Volume Claim
+ reclaimPolicy: Reclaim Policy
capacity:
label: Capacity
unit: GiB