From 76d971964c409ee31dd5d9ab469123887ffdf167 Mon Sep 17 00:00:00 2001 From: kevin-kho Date: Fri, 12 Jul 2024 05:27:47 -0700 Subject: [PATCH] (chore) bring UI parity for existing cloud manager items (#336) --- ...rces.kyma-project.io_awsnfsvolumes_ui.yaml | 13 +-- ...resources.kyma-project.io_ipranges_ui.yaml | 6 +- ...yma-project.io_gcpnfsvolumebackups_ui.yaml | 6 +- ...rces.kyma-project.io_gcpnfsvolumes_ui.yaml | 89 +++++++++++++++++++ ...resources.kyma-project.io_ipranges_ui.yaml | 6 +- ...rces.kyma-project.io_awsnfsvolumes_ui.yaml | 13 +-- config/ui-extensions/awsnfsvolumes/details | 4 +- config/ui-extensions/awsnfsvolumes/form | 7 +- .../ui-extensions/awsnfsvolumes/translations | 2 +- ...yma-project.io_gcpnfsvolumebackups_ui.yaml | 6 +- .../ui-extensions/gcpnfsvolumebackups/details | 3 + .../gcpnfsvolumebackups/translations | 5 +- ...rces.kyma-project.io_gcpnfsvolumes_ui.yaml | 89 +++++++++++++++++++ config/ui-extensions/gcpnfsvolumes/details | 33 +++++++ config/ui-extensions/gcpnfsvolumes/form | 49 +++++++++- .../ui-extensions/gcpnfsvolumes/translations | 11 ++- ...resources.kyma-project.io_ipranges_ui.yaml | 6 +- config/ui-extensions/ipranges/form | 3 +- config/ui-extensions/ipranges/list | 3 - 19 files changed, 317 insertions(+), 37 deletions(-) diff --git a/config/dist/skr/crd/bases/providers/aws/cloud-resources.kyma-project.io_awsnfsvolumes_ui.yaml b/config/dist/skr/crd/bases/providers/aws/cloud-resources.kyma-project.io_awsnfsvolumes_ui.yaml index d02ea5e70..181708251 100644 --- a/config/dist/skr/crd/bases/providers/aws/cloud-resources.kyma-project.io_awsnfsvolumes_ui.yaml +++ b/config/dist/skr/crd/bases/providers/aws/cloud-resources.kyma-project.io_awsnfsvolumes_ui.yaml @@ -19,7 +19,7 @@ data: widget: Panel source: spec.ipRange children: - - name: name + - name: formName source: name widget: Labels - name: namespace @@ -29,7 +29,7 @@ data: source: spec.volume widget: Panel children: - - name: name + - name: formName source: name widget: Labels - name: labels @@ -65,17 +65,20 @@ data: simple: true name: spec.ipRange widget: FormGroup + required: false children: - path: name - name: name + name: formName simple: true required: true widget: Text + inputInfo: Leave blank for auto IP Range - path: namespace name: namespace simple: true required: true widget: Text + inputInfo: Leave blank for auto IP Range - path: spec.volume simple: true name: spec.volume @@ -83,7 +86,7 @@ data: children: - path: name simple: true - name: name + name: formName required: true widget: Text - path: labels @@ -132,7 +135,7 @@ data: status.state: State placeholders.dropdown: Type or choose an option ipRange: IP Range - name: Name + formName: Name namespace: Namespace spec.volume: Volume labels: Labels diff --git a/config/dist/skr/crd/bases/providers/aws/cloud-resources.kyma-project.io_ipranges_ui.yaml b/config/dist/skr/crd/bases/providers/aws/cloud-resources.kyma-project.io_ipranges_ui.yaml index ea4886d0d..4aca2ab20 100644 --- a/config/dist/skr/crd/bases/providers/aws/cloud-resources.kyma-project.io_ipranges_ui.yaml +++ b/config/dist/skr/crd/bases/providers/aws/cloud-resources.kyma-project.io_ipranges_ui.yaml @@ -24,7 +24,8 @@ data: name: spec.cidr widget: Text simple: true - required: true + required: false + inputInfo: Leave blank for Auto-CIDR general: | resource: kind: IpRange @@ -41,9 +42,6 @@ data: - source: status.cidr name: status.cidr sort: true - - source: metadata.namespace - name: metadata.namespace - sort: true - source: status.state name: status.state sort: true diff --git a/config/dist/skr/crd/bases/providers/gcp/cloud-resources.kyma-project.io_gcpnfsvolumebackups_ui.yaml b/config/dist/skr/crd/bases/providers/gcp/cloud-resources.kyma-project.io_gcpnfsvolumebackups_ui.yaml index 1a2e289c9..1cda20331 100644 --- a/config/dist/skr/crd/bases/providers/gcp/cloud-resources.kyma-project.io_gcpnfsvolumebackups_ui.yaml +++ b/config/dist/skr/crd/bases/providers/gcp/cloud-resources.kyma-project.io_gcpnfsvolumebackups_ui.yaml @@ -23,6 +23,9 @@ data: - widget: Labels source: state name: status.state + - widget: Labels + source: opIdentifier + name: status.opIdentifier form: |- - path: spec.location simple: true @@ -71,11 +74,12 @@ data: en: spec.location: Location spec.source.volume: Volume - spec.source.volume.name: Name + spec.source.volume.name: Volume Name spec.source.volume.namespace: Namespace status.state: State configuration: Configuration status: Status + status.opIdentifier: Operation Identifier kind: ConfigMap metadata: labels: diff --git a/config/dist/skr/crd/bases/providers/gcp/cloud-resources.kyma-project.io_gcpnfsvolumes_ui.yaml b/config/dist/skr/crd/bases/providers/gcp/cloud-resources.kyma-project.io_gcpnfsvolumes_ui.yaml index d704bf005..01d9550e3 100644 --- a/config/dist/skr/crd/bases/providers/gcp/cloud-resources.kyma-project.io_gcpnfsvolumes_ui.yaml +++ b/config/dist/skr/crd/bases/providers/gcp/cloud-resources.kyma-project.io_gcpnfsvolumes_ui.yaml @@ -18,6 +18,39 @@ data: - name: spec.tier source: tier widget: Labels + - name: spec.ipRange + widget: Panel + source: spec + children: + - name: spec.ipRange.name + source: ipRange.name + widget: Labels + - name: spec.volume + widget: Panel + source: spec + children: + - source: volume.name + name: spec.volume.name + widget: Labels + - source: volume.labels + name: spec.volume.labels + widget: Labels + - source: volume.annotations + name: spec.volume.annotations + widget: Labels + - name: spec.volumeClaim + widget: Panel + source: spec + children: + - source: volumeClaim.name + name: spec.volumeClaim.name + widget: Labels + - source: volumeClaim.labels + name: spec.volumeClaim.labels + widget: Labels + - source: volumeClaim.annotations + name: spec.volumeClaim.annotations + widget: Labels - name: status widget: Panel source: status @@ -42,6 +75,53 @@ data: simple: true name: spec.tier required: true + + - path: spec.ipRange + simple: false + name: spec.ipRange + widget: FormGroup + required: false + children: + - path: name + name: spec.ipRange.name + widget: Text + required: true + - path: spec.volume + simple: false + name: spec.volume + widget: FormGroup + required: false + children: + - path: name + name: spec.volume.name + widget: Text + required: true + - path: labels + name: spec.volume.labels + required: false + widget: KeyValuePair + - path: annotations + name: spec.volume.annotations + required: false + widget: KeyValuePair + - path: spec.volumeClaim + simple: false + name: spec.volumeClaim + widget: FormGroup + required: false + children: + - path: name + name: spec.volumeClaim.name + widget: Text + required: true + - path: labels + name: spec.volumeClaim.labels + required: false + widget: KeyValuePair + - path: annotations + name: spec.volumeClaim.annotations + required: false + widget: KeyValuePair general: |+ resource: kind: GcpNfsVolume @@ -77,9 +157,18 @@ data: spec.fileShareName: File Share Name spec.capacityGb: Capacity (Gb) spec.ipRange: IP Range + spec.ipRange.name: Name configuration: Configuration status.state: State status: Status + spec.volume: Volume + spec.volume.name: Name + spec.volume.labels: Labels + spec.volume.annotations: Annotations + spec.volumeClaim: Volume Claim + spec.volumeClaim.name: Name + spec.volumeClaim.labels: Labels + spec.volumeClaim.annotations: Annotations kind: ConfigMap metadata: labels: diff --git a/config/dist/skr/crd/bases/providers/gcp/cloud-resources.kyma-project.io_ipranges_ui.yaml b/config/dist/skr/crd/bases/providers/gcp/cloud-resources.kyma-project.io_ipranges_ui.yaml index ea4886d0d..4aca2ab20 100644 --- a/config/dist/skr/crd/bases/providers/gcp/cloud-resources.kyma-project.io_ipranges_ui.yaml +++ b/config/dist/skr/crd/bases/providers/gcp/cloud-resources.kyma-project.io_ipranges_ui.yaml @@ -24,7 +24,8 @@ data: name: spec.cidr widget: Text simple: true - required: true + required: false + inputInfo: Leave blank for Auto-CIDR general: | resource: kind: IpRange @@ -41,9 +42,6 @@ data: - source: status.cidr name: status.cidr sort: true - - source: metadata.namespace - name: metadata.namespace - sort: true - source: status.state name: status.state sort: true diff --git a/config/ui-extensions/awsnfsvolumes/cloud-resources.kyma-project.io_awsnfsvolumes_ui.yaml b/config/ui-extensions/awsnfsvolumes/cloud-resources.kyma-project.io_awsnfsvolumes_ui.yaml index d02ea5e70..181708251 100644 --- a/config/ui-extensions/awsnfsvolumes/cloud-resources.kyma-project.io_awsnfsvolumes_ui.yaml +++ b/config/ui-extensions/awsnfsvolumes/cloud-resources.kyma-project.io_awsnfsvolumes_ui.yaml @@ -19,7 +19,7 @@ data: widget: Panel source: spec.ipRange children: - - name: name + - name: formName source: name widget: Labels - name: namespace @@ -29,7 +29,7 @@ data: source: spec.volume widget: Panel children: - - name: name + - name: formName source: name widget: Labels - name: labels @@ -65,17 +65,20 @@ data: simple: true name: spec.ipRange widget: FormGroup + required: false children: - path: name - name: name + name: formName simple: true required: true widget: Text + inputInfo: Leave blank for auto IP Range - path: namespace name: namespace simple: true required: true widget: Text + inputInfo: Leave blank for auto IP Range - path: spec.volume simple: true name: spec.volume @@ -83,7 +86,7 @@ data: children: - path: name simple: true - name: name + name: formName required: true widget: Text - path: labels @@ -132,7 +135,7 @@ data: status.state: State placeholders.dropdown: Type or choose an option ipRange: IP Range - name: Name + formName: Name namespace: Namespace spec.volume: Volume labels: Labels diff --git a/config/ui-extensions/awsnfsvolumes/details b/config/ui-extensions/awsnfsvolumes/details index a0c8854e6..507205a1b 100644 --- a/config/ui-extensions/awsnfsvolumes/details +++ b/config/ui-extensions/awsnfsvolumes/details @@ -16,7 +16,7 @@ body: widget: Panel source: spec.ipRange children: - - name: name + - name: formName source: name widget: Labels - name: namespace @@ -26,7 +26,7 @@ body: source: spec.volume widget: Panel children: - - name: name + - name: formName source: name widget: Labels - name: labels diff --git a/config/ui-extensions/awsnfsvolumes/form b/config/ui-extensions/awsnfsvolumes/form index 7c6a5473c..1f510ab97 100644 --- a/config/ui-extensions/awsnfsvolumes/form +++ b/config/ui-extensions/awsnfsvolumes/form @@ -17,17 +17,20 @@ simple: true name: spec.ipRange widget: FormGroup + required: false children: - path: name - name: name + name: formName simple: true required: true widget: Text + inputInfo: Leave blank for auto IP Range - path: namespace name: namespace simple: true required: true widget: Text + inputInfo: Leave blank for auto IP Range - path: spec.volume simple: true name: spec.volume @@ -35,7 +38,7 @@ children: - path: name simple: true - name: name + name: formName required: true widget: Text - path: labels diff --git a/config/ui-extensions/awsnfsvolumes/translations b/config/ui-extensions/awsnfsvolumes/translations index e86315bf4..4d56b6d74 100644 --- a/config/ui-extensions/awsnfsvolumes/translations +++ b/config/ui-extensions/awsnfsvolumes/translations @@ -8,7 +8,7 @@ en: status.state: State placeholders.dropdown: Type or choose an option ipRange: IP Range - name: Name + formName: Name namespace: Namespace spec.volume: Volume labels: Labels diff --git a/config/ui-extensions/gcpnfsvolumebackups/cloud-resources.kyma-project.io_gcpnfsvolumebackups_ui.yaml b/config/ui-extensions/gcpnfsvolumebackups/cloud-resources.kyma-project.io_gcpnfsvolumebackups_ui.yaml index 1a2e289c9..1cda20331 100644 --- a/config/ui-extensions/gcpnfsvolumebackups/cloud-resources.kyma-project.io_gcpnfsvolumebackups_ui.yaml +++ b/config/ui-extensions/gcpnfsvolumebackups/cloud-resources.kyma-project.io_gcpnfsvolumebackups_ui.yaml @@ -23,6 +23,9 @@ data: - widget: Labels source: state name: status.state + - widget: Labels + source: opIdentifier + name: status.opIdentifier form: |- - path: spec.location simple: true @@ -71,11 +74,12 @@ data: en: spec.location: Location spec.source.volume: Volume - spec.source.volume.name: Name + spec.source.volume.name: Volume Name spec.source.volume.namespace: Namespace status.state: State configuration: Configuration status: Status + status.opIdentifier: Operation Identifier kind: ConfigMap metadata: labels: diff --git a/config/ui-extensions/gcpnfsvolumebackups/details b/config/ui-extensions/gcpnfsvolumebackups/details index eccd0c4c8..44963b3ff 100644 --- a/config/ui-extensions/gcpnfsvolumebackups/details +++ b/config/ui-extensions/gcpnfsvolumebackups/details @@ -20,3 +20,6 @@ body: - widget: Labels source: state name: status.state + - widget: Labels + source: opIdentifier + name: status.opIdentifier diff --git a/config/ui-extensions/gcpnfsvolumebackups/translations b/config/ui-extensions/gcpnfsvolumebackups/translations index 12c2dae25..8253fc46e 100644 --- a/config/ui-extensions/gcpnfsvolumebackups/translations +++ b/config/ui-extensions/gcpnfsvolumebackups/translations @@ -1,8 +1,9 @@ en: spec.location: Location spec.source.volume: Volume - spec.source.volume.name: Name + spec.source.volume.name: Volume Name spec.source.volume.namespace: Namespace status.state: State configuration: Configuration - status: Status \ No newline at end of file + status: Status + status.opIdentifier: Operation Identifier \ No newline at end of file diff --git a/config/ui-extensions/gcpnfsvolumes/cloud-resources.kyma-project.io_gcpnfsvolumes_ui.yaml b/config/ui-extensions/gcpnfsvolumes/cloud-resources.kyma-project.io_gcpnfsvolumes_ui.yaml index d704bf005..01d9550e3 100644 --- a/config/ui-extensions/gcpnfsvolumes/cloud-resources.kyma-project.io_gcpnfsvolumes_ui.yaml +++ b/config/ui-extensions/gcpnfsvolumes/cloud-resources.kyma-project.io_gcpnfsvolumes_ui.yaml @@ -18,6 +18,39 @@ data: - name: spec.tier source: tier widget: Labels + - name: spec.ipRange + widget: Panel + source: spec + children: + - name: spec.ipRange.name + source: ipRange.name + widget: Labels + - name: spec.volume + widget: Panel + source: spec + children: + - source: volume.name + name: spec.volume.name + widget: Labels + - source: volume.labels + name: spec.volume.labels + widget: Labels + - source: volume.annotations + name: spec.volume.annotations + widget: Labels + - name: spec.volumeClaim + widget: Panel + source: spec + children: + - source: volumeClaim.name + name: spec.volumeClaim.name + widget: Labels + - source: volumeClaim.labels + name: spec.volumeClaim.labels + widget: Labels + - source: volumeClaim.annotations + name: spec.volumeClaim.annotations + widget: Labels - name: status widget: Panel source: status @@ -42,6 +75,53 @@ data: simple: true name: spec.tier required: true + + - path: spec.ipRange + simple: false + name: spec.ipRange + widget: FormGroup + required: false + children: + - path: name + name: spec.ipRange.name + widget: Text + required: true + - path: spec.volume + simple: false + name: spec.volume + widget: FormGroup + required: false + children: + - path: name + name: spec.volume.name + widget: Text + required: true + - path: labels + name: spec.volume.labels + required: false + widget: KeyValuePair + - path: annotations + name: spec.volume.annotations + required: false + widget: KeyValuePair + - path: spec.volumeClaim + simple: false + name: spec.volumeClaim + widget: FormGroup + required: false + children: + - path: name + name: spec.volumeClaim.name + widget: Text + required: true + - path: labels + name: spec.volumeClaim.labels + required: false + widget: KeyValuePair + - path: annotations + name: spec.volumeClaim.annotations + required: false + widget: KeyValuePair general: |+ resource: kind: GcpNfsVolume @@ -77,9 +157,18 @@ data: spec.fileShareName: File Share Name spec.capacityGb: Capacity (Gb) spec.ipRange: IP Range + spec.ipRange.name: Name configuration: Configuration status.state: State status: Status + spec.volume: Volume + spec.volume.name: Name + spec.volume.labels: Labels + spec.volume.annotations: Annotations + spec.volumeClaim: Volume Claim + spec.volumeClaim.name: Name + spec.volumeClaim.labels: Labels + spec.volumeClaim.annotations: Annotations kind: ConfigMap metadata: labels: diff --git a/config/ui-extensions/gcpnfsvolumes/details b/config/ui-extensions/gcpnfsvolumes/details index fdeb09baa..c7c7a79a9 100644 --- a/config/ui-extensions/gcpnfsvolumes/details +++ b/config/ui-extensions/gcpnfsvolumes/details @@ -15,6 +15,39 @@ body: - name: spec.tier source: tier widget: Labels + - name: spec.ipRange + widget: Panel + source: spec + children: + - name: spec.ipRange.name + source: ipRange.name + widget: Labels + - name: spec.volume + widget: Panel + source: spec + children: + - source: volume.name + name: spec.volume.name + widget: Labels + - source: volume.labels + name: spec.volume.labels + widget: Labels + - source: volume.annotations + name: spec.volume.annotations + widget: Labels + - name: spec.volumeClaim + widget: Panel + source: spec + children: + - source: volumeClaim.name + name: spec.volumeClaim.name + widget: Labels + - source: volumeClaim.labels + name: spec.volumeClaim.labels + widget: Labels + - source: volumeClaim.annotations + name: spec.volumeClaim.annotations + widget: Labels - name: status widget: Panel source: status diff --git a/config/ui-extensions/gcpnfsvolumes/form b/config/ui-extensions/gcpnfsvolumes/form index 6cff0d5d0..3fc447b14 100644 --- a/config/ui-extensions/gcpnfsvolumes/form +++ b/config/ui-extensions/gcpnfsvolumes/form @@ -13,4 +13,51 @@ - path: spec.tier simple: true name: spec.tier - required: true \ No newline at end of file + required: true + +- path: spec.ipRange + simple: false + name: spec.ipRange + widget: FormGroup + required: false + children: + - path: name + name: spec.ipRange.name + widget: Text + required: true +- path: spec.volume + simple: false + name: spec.volume + widget: FormGroup + required: false + children: + - path: name + name: spec.volume.name + widget: Text + required: true + - path: labels + name: spec.volume.labels + required: false + widget: KeyValuePair + - path: annotations + name: spec.volume.annotations + required: false + widget: KeyValuePair +- path: spec.volumeClaim + simple: false + name: spec.volumeClaim + widget: FormGroup + required: false + children: + - path: name + name: spec.volumeClaim.name + widget: Text + required: true + - path: labels + name: spec.volumeClaim.labels + required: false + widget: KeyValuePair + - path: annotations + name: spec.volumeClaim.annotations + required: false + widget: KeyValuePair \ No newline at end of file diff --git a/config/ui-extensions/gcpnfsvolumes/translations b/config/ui-extensions/gcpnfsvolumes/translations index 705120e50..d6fa8a7d6 100644 --- a/config/ui-extensions/gcpnfsvolumes/translations +++ b/config/ui-extensions/gcpnfsvolumes/translations @@ -5,6 +5,15 @@ en: spec.fileShareName: File Share Name spec.capacityGb: Capacity (Gb) spec.ipRange: IP Range + spec.ipRange.name: Name configuration: Configuration status.state: State - status: Status \ No newline at end of file + status: Status + spec.volume: Volume + spec.volume.name: Name + spec.volume.labels: Labels + spec.volume.annotations: Annotations + spec.volumeClaim: Volume Claim + spec.volumeClaim.name: Name + spec.volumeClaim.labels: Labels + spec.volumeClaim.annotations: Annotations \ No newline at end of file diff --git a/config/ui-extensions/ipranges/cloud-resources.kyma-project.io_ipranges_ui.yaml b/config/ui-extensions/ipranges/cloud-resources.kyma-project.io_ipranges_ui.yaml index ea4886d0d..4aca2ab20 100644 --- a/config/ui-extensions/ipranges/cloud-resources.kyma-project.io_ipranges_ui.yaml +++ b/config/ui-extensions/ipranges/cloud-resources.kyma-project.io_ipranges_ui.yaml @@ -24,7 +24,8 @@ data: name: spec.cidr widget: Text simple: true - required: true + required: false + inputInfo: Leave blank for Auto-CIDR general: | resource: kind: IpRange @@ -41,9 +42,6 @@ data: - source: status.cidr name: status.cidr sort: true - - source: metadata.namespace - name: metadata.namespace - sort: true - source: status.state name: status.state sort: true diff --git a/config/ui-extensions/ipranges/form b/config/ui-extensions/ipranges/form index e8c7b3efe..2b7eeb1b1 100644 --- a/config/ui-extensions/ipranges/form +++ b/config/ui-extensions/ipranges/form @@ -2,4 +2,5 @@ name: spec.cidr widget: Text simple: true - required: true \ No newline at end of file + required: false + inputInfo: Leave blank for Auto-CIDR \ No newline at end of file diff --git a/config/ui-extensions/ipranges/list b/config/ui-extensions/ipranges/list index e4c9f5403..aa576e251 100644 --- a/config/ui-extensions/ipranges/list +++ b/config/ui-extensions/ipranges/list @@ -1,9 +1,6 @@ - source: status.cidr name: status.cidr sort: true -- source: metadata.namespace - name: metadata.namespace - sort: true - source: status.state name: status.state sort: true \ No newline at end of file