Skip to content

Commit 76d9719

Browse files
authored
(chore) bring UI parity for existing cloud manager items (#336)
1 parent ee2db67 commit 76d9719

19 files changed

+317
-37
lines changed

config/dist/skr/crd/bases/providers/aws/cloud-resources.kyma-project.io_awsnfsvolumes_ui.yaml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ data:
1919
widget: Panel
2020
source: spec.ipRange
2121
children:
22-
- name: name
22+
- name: formName
2323
source: name
2424
widget: Labels
2525
- name: namespace
@@ -29,7 +29,7 @@ data:
2929
source: spec.volume
3030
widget: Panel
3131
children:
32-
- name: name
32+
- name: formName
3333
source: name
3434
widget: Labels
3535
- name: labels
@@ -65,25 +65,28 @@ data:
6565
simple: true
6666
name: spec.ipRange
6767
widget: FormGroup
68+
required: false
6869
children:
6970
- path: name
70-
name: name
71+
name: formName
7172
simple: true
7273
required: true
7374
widget: Text
75+
inputInfo: Leave blank for auto IP Range
7476
- path: namespace
7577
name: namespace
7678
simple: true
7779
required: true
7880
widget: Text
81+
inputInfo: Leave blank for auto IP Range
7982
- path: spec.volume
8083
simple: true
8184
name: spec.volume
8285
widget: FormGroup
8386
children:
8487
- path: name
8588
simple: true
86-
name: name
89+
name: formName
8790
required: true
8891
widget: Text
8992
- path: labels
@@ -132,7 +135,7 @@ data:
132135
status.state: State
133136
placeholders.dropdown: Type or choose an option
134137
ipRange: IP Range
135-
name: Name
138+
formName: Name
136139
namespace: Namespace
137140
spec.volume: Volume
138141
labels: Labels

config/dist/skr/crd/bases/providers/aws/cloud-resources.kyma-project.io_ipranges_ui.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ data:
2424
name: spec.cidr
2525
widget: Text
2626
simple: true
27-
required: true
27+
required: false
28+
inputInfo: Leave blank for Auto-CIDR
2829
general: |
2930
resource:
3031
kind: IpRange
@@ -41,9 +42,6 @@ data:
4142
- source: status.cidr
4243
name: status.cidr
4344
sort: true
44-
- source: metadata.namespace
45-
name: metadata.namespace
46-
sort: true
4745
- source: status.state
4846
name: status.state
4947
sort: true

config/dist/skr/crd/bases/providers/gcp/cloud-resources.kyma-project.io_gcpnfsvolumebackups_ui.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ data:
2323
- widget: Labels
2424
source: state
2525
name: status.state
26+
- widget: Labels
27+
source: opIdentifier
28+
name: status.opIdentifier
2629
form: |-
2730
- path: spec.location
2831
simple: true
@@ -71,11 +74,12 @@ data:
7174
en:
7275
spec.location: Location
7376
spec.source.volume: Volume
74-
spec.source.volume.name: Name
77+
spec.source.volume.name: Volume Name
7578
spec.source.volume.namespace: Namespace
7679
status.state: State
7780
configuration: Configuration
7881
status: Status
82+
status.opIdentifier: Operation Identifier
7983
kind: ConfigMap
8084
metadata:
8185
labels:

config/dist/skr/crd/bases/providers/gcp/cloud-resources.kyma-project.io_gcpnfsvolumes_ui.yaml

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,39 @@ data:
1818
- name: spec.tier
1919
source: tier
2020
widget: Labels
21+
- name: spec.ipRange
22+
widget: Panel
23+
source: spec
24+
children:
25+
- name: spec.ipRange.name
26+
source: ipRange.name
27+
widget: Labels
28+
- name: spec.volume
29+
widget: Panel
30+
source: spec
31+
children:
32+
- source: volume.name
33+
name: spec.volume.name
34+
widget: Labels
35+
- source: volume.labels
36+
name: spec.volume.labels
37+
widget: Labels
38+
- source: volume.annotations
39+
name: spec.volume.annotations
40+
widget: Labels
41+
- name: spec.volumeClaim
42+
widget: Panel
43+
source: spec
44+
children:
45+
- source: volumeClaim.name
46+
name: spec.volumeClaim.name
47+
widget: Labels
48+
- source: volumeClaim.labels
49+
name: spec.volumeClaim.labels
50+
widget: Labels
51+
- source: volumeClaim.annotations
52+
name: spec.volumeClaim.annotations
53+
widget: Labels
2154
- name: status
2255
widget: Panel
2356
source: status
@@ -42,6 +75,53 @@ data:
4275
simple: true
4376
name: spec.tier
4477
required: true
78+
79+
- path: spec.ipRange
80+
simple: false
81+
name: spec.ipRange
82+
widget: FormGroup
83+
required: false
84+
children:
85+
- path: name
86+
name: spec.ipRange.name
87+
widget: Text
88+
required: true
89+
- path: spec.volume
90+
simple: false
91+
name: spec.volume
92+
widget: FormGroup
93+
required: false
94+
children:
95+
- path: name
96+
name: spec.volume.name
97+
widget: Text
98+
required: true
99+
- path: labels
100+
name: spec.volume.labels
101+
required: false
102+
widget: KeyValuePair
103+
- path: annotations
104+
name: spec.volume.annotations
105+
required: false
106+
widget: KeyValuePair
107+
- path: spec.volumeClaim
108+
simple: false
109+
name: spec.volumeClaim
110+
widget: FormGroup
111+
required: false
112+
children:
113+
- path: name
114+
name: spec.volumeClaim.name
115+
widget: Text
116+
required: true
117+
- path: labels
118+
name: spec.volumeClaim.labels
119+
required: false
120+
widget: KeyValuePair
121+
- path: annotations
122+
name: spec.volumeClaim.annotations
123+
required: false
124+
widget: KeyValuePair
45125
general: |+
46126
resource:
47127
kind: GcpNfsVolume
@@ -77,9 +157,18 @@ data:
77157
spec.fileShareName: File Share Name
78158
spec.capacityGb: Capacity (Gb)
79159
spec.ipRange: IP Range
160+
spec.ipRange.name: Name
80161
configuration: Configuration
81162
status.state: State
82163
status: Status
164+
spec.volume: Volume
165+
spec.volume.name: Name
166+
spec.volume.labels: Labels
167+
spec.volume.annotations: Annotations
168+
spec.volumeClaim: Volume Claim
169+
spec.volumeClaim.name: Name
170+
spec.volumeClaim.labels: Labels
171+
spec.volumeClaim.annotations: Annotations
83172
kind: ConfigMap
84173
metadata:
85174
labels:

config/dist/skr/crd/bases/providers/gcp/cloud-resources.kyma-project.io_ipranges_ui.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ data:
2424
name: spec.cidr
2525
widget: Text
2626
simple: true
27-
required: true
27+
required: false
28+
inputInfo: Leave blank for Auto-CIDR
2829
general: |
2930
resource:
3031
kind: IpRange
@@ -41,9 +42,6 @@ data:
4142
- source: status.cidr
4243
name: status.cidr
4344
sort: true
44-
- source: metadata.namespace
45-
name: metadata.namespace
46-
sort: true
4745
- source: status.state
4846
name: status.state
4947
sort: true

config/ui-extensions/awsnfsvolumes/cloud-resources.kyma-project.io_awsnfsvolumes_ui.yaml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ data:
1919
widget: Panel
2020
source: spec.ipRange
2121
children:
22-
- name: name
22+
- name: formName
2323
source: name
2424
widget: Labels
2525
- name: namespace
@@ -29,7 +29,7 @@ data:
2929
source: spec.volume
3030
widget: Panel
3131
children:
32-
- name: name
32+
- name: formName
3333
source: name
3434
widget: Labels
3535
- name: labels
@@ -65,25 +65,28 @@ data:
6565
simple: true
6666
name: spec.ipRange
6767
widget: FormGroup
68+
required: false
6869
children:
6970
- path: name
70-
name: name
71+
name: formName
7172
simple: true
7273
required: true
7374
widget: Text
75+
inputInfo: Leave blank for auto IP Range
7476
- path: namespace
7577
name: namespace
7678
simple: true
7779
required: true
7880
widget: Text
81+
inputInfo: Leave blank for auto IP Range
7982
- path: spec.volume
8083
simple: true
8184
name: spec.volume
8285
widget: FormGroup
8386
children:
8487
- path: name
8588
simple: true
86-
name: name
89+
name: formName
8790
required: true
8891
widget: Text
8992
- path: labels
@@ -132,7 +135,7 @@ data:
132135
status.state: State
133136
placeholders.dropdown: Type or choose an option
134137
ipRange: IP Range
135-
name: Name
138+
formName: Name
136139
namespace: Namespace
137140
spec.volume: Volume
138141
labels: Labels

config/ui-extensions/awsnfsvolumes/details

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ body:
1616
widget: Panel
1717
source: spec.ipRange
1818
children:
19-
- name: name
19+
- name: formName
2020
source: name
2121
widget: Labels
2222
- name: namespace
@@ -26,7 +26,7 @@ body:
2626
source: spec.volume
2727
widget: Panel
2828
children:
29-
- name: name
29+
- name: formName
3030
source: name
3131
widget: Labels
3232
- name: labels

config/ui-extensions/awsnfsvolumes/form

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,25 +17,28 @@
1717
simple: true
1818
name: spec.ipRange
1919
widget: FormGroup
20+
required: false
2021
children:
2122
- path: name
22-
name: name
23+
name: formName
2324
simple: true
2425
required: true
2526
widget: Text
27+
inputInfo: Leave blank for auto IP Range
2628
- path: namespace
2729
name: namespace
2830
simple: true
2931
required: true
3032
widget: Text
33+
inputInfo: Leave blank for auto IP Range
3134
- path: spec.volume
3235
simple: true
3336
name: spec.volume
3437
widget: FormGroup
3538
children:
3639
- path: name
3740
simple: true
38-
name: name
41+
name: formName
3942
required: true
4043
widget: Text
4144
- path: labels

config/ui-extensions/awsnfsvolumes/translations

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ en:
88
status.state: State
99
placeholders.dropdown: Type or choose an option
1010
ipRange: IP Range
11-
name: Name
11+
formName: Name
1212
namespace: Namespace
1313
spec.volume: Volume
1414
labels: Labels

config/ui-extensions/gcpnfsvolumebackups/cloud-resources.kyma-project.io_gcpnfsvolumebackups_ui.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ data:
2323
- widget: Labels
2424
source: state
2525
name: status.state
26+
- widget: Labels
27+
source: opIdentifier
28+
name: status.opIdentifier
2629
form: |-
2730
- path: spec.location
2831
simple: true
@@ -71,11 +74,12 @@ data:
7174
en:
7275
spec.location: Location
7376
spec.source.volume: Volume
74-
spec.source.volume.name: Name
77+
spec.source.volume.name: Volume Name
7578
spec.source.volume.namespace: Namespace
7679
status.state: State
7780
configuration: Configuration
7881
status: Status
82+
status.opIdentifier: Operation Identifier
7983
kind: ConfigMap
8084
metadata:
8185
labels:

config/ui-extensions/gcpnfsvolumebackups/details

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,6 @@ body:
2020
- widget: Labels
2121
source: state
2222
name: status.state
23+
- widget: Labels
24+
source: opIdentifier
25+
name: status.opIdentifier
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
en:
22
spec.location: Location
33
spec.source.volume: Volume
4-
spec.source.volume.name: Name
4+
spec.source.volume.name: Volume Name
55
spec.source.volume.namespace: Namespace
66
status.state: State
77
configuration: Configuration
8-
status: Status
8+
status: Status
9+
status.opIdentifier: Operation Identifier

0 commit comments

Comments
 (0)