From 5e66b6aeb06c30ddc7300893145d7a31b1655ccd Mon Sep 17 00:00:00 2001 From: Dimitri Savineau Date: Tue, 26 Mar 2024 09:16:27 -0400 Subject: [PATCH] csv: Fix metrics utility fields (#1783) The metrics utility fields were configured under the statusDescriptors section rather than specDescriptors so displaying those fields in the UI wasn't done correctly (not under the Advanced section nor using the correct field type). This also changes the `metrics_utility_configmap` descriptor from `urn:alm:descriptor:com.tectonic.ui:selector:core:v1:ConfigMap` to `urn:alm:descriptor:io.kubernetes:ConfigMap` because the first value doesn't work. Finally, all metrics utility fields are only displayed (in the Advanced section) when `metrics_utility_enabled` is enabled (not default). Signed-off-by: Dimitri Savineau --- .../awx-operator.clusterserviceversion.yaml | 108 ++++++++++-------- 1 file changed, 58 insertions(+), 50 deletions(-) diff --git a/config/manifests/bases/awx-operator.clusterserviceversion.yaml b/config/manifests/bases/awx-operator.clusterserviceversion.yaml index 35512ded..95b6cf22 100644 --- a/config/manifests/bases/awx-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/awx-operator.clusterserviceversion.yaml @@ -1024,6 +1024,64 @@ spec: x-descriptors: - urn:alm:descriptor:com.tectonic.ui:advanced - urn:alm:descriptor:com.tectonic.ui:booleanSwitch + - displayName: Metrics-Utility Enabled + path: metrics_utility_enabled + x-descriptors: + - urn:alm:descriptor:com.tectonic.ui:advanced + - urn:alm:descriptor:com.tectonic.ui:booleanSwitch + - displayName: Metrics-Utility Image + path: metrics_utility_image + x-descriptors: + - urn:alm:descriptor:com.tectonic.ui:advanced + - urn:alm:descriptor:com.tectonic.ui:text + - displayName: Metrics-Utlity Image Version + path: metrics_utility_image_version + x-descriptors: + - urn:alm:descriptor:com.tectonic.ui:advanced + - urn:alm:descriptor:com.tectonic.ui:text + - urn:alm:descriptor:com.tectonic.ui:fieldDependency:metrics_utility_enabled:true + - displayName: Metrics-Utility Image PullPolicy + path: metrics_utility_image_pull_policy + x-descriptors: + - urn:alm:descriptor:com.tectonic.ui:advanced + - urn:alm:descriptor:com.tectonic.ui:imagePullPolicy + - urn:alm:descriptor:com.tectonic.ui:fieldDependency:metrics_utility_enabled:true + - displayName: Metrics-Utlity ConfigMap + path: metrics_utility_configmap + x-descriptors: + - urn:alm:descriptor:com.tectonic.ui:advanced + - urn:alm:descriptor:io.kubernetes:ConfigMap + - urn:alm:descriptor:com.tectonic.ui:fieldDependency:metrics_utility_enabled:true + - displayName: Metrics-Utlity Gather Data CronJob Schedule + path: metrics_utility_cronjob_gather_schedule + x-descriptors: + - urn:alm:descriptor:com.tectonic.ui:advanced + - urn:alm:descriptor:com.tectonic.ui:text + - urn:alm:descriptor:com.tectonic.ui:fieldDependency:metrics_utility_enabled:true + - displayName: Metrics-Utlity Report CronJob Schedule + path: metrics_utility_cronjob_report_schedule + x-descriptors: + - urn:alm:descriptor:com.tectonic.ui:advanced + - urn:alm:descriptor:com.tectonic.ui:text + - urn:alm:descriptor:com.tectonic.ui:fieldDependency:metrics_utility_enabled:true + - displayName: Metrics-Utlity PVC Claim + path: metrics_utility_pvc_claim + x-descriptors: + - urn:alm:descriptor:com.tectonic.ui:advanced + - urn:alm:descriptor:com.tectonic.ui:text + - urn:alm:descriptor:com.tectonic.ui:fieldDependency:metrics_utility_enabled:true + - displayName: Metrics-Utlity PVC Claim Size + path: metrics_utility_pvc_claim_size + x-descriptors: + - urn:alm:descriptor:com.tectonic.ui:advanced + - urn:alm:descriptor:com.tectonic.ui:text + - urn:alm:descriptor:com.tectonic.ui:fieldDependency:metrics_utility_enabled:true + - displayName: Metrics-Utlity PVC Claim Storage Class + path: metrics_utility_pvc_claim_storage_class + x-descriptors: + - urn:alm:descriptor:com.tectonic.ui:advanced + - urn:alm:descriptor:io.kubernetes:StorageClass + - urn:alm:descriptor:com.tectonic.ui:fieldDependency:metrics_utility_enabled:true statusDescriptors: - description: Route to access the instance deployed displayName: URL @@ -1050,56 +1108,6 @@ spec: path: image x-descriptors: - urn:alm:descriptor:com.tectonic.ui:text - - displayName: Metrics-Utility Enabled - path: metrics_utility_enabled - x-descriptors: - - urn:alm:descriptor:com.tectonic.ui:advanced - - urn:alm:descriptor:com.tectonic.ui:booleanSwitch - - displayName: Metrics-Utility Image - path: metrics_utility_image - x-descriptors: - - urn:alm:descriptor:com.tectonic.ui:advanced - - urn:alm:descriptor:com.tectonic.ui:text - - displayName: Metrics-Utlity Image Version - path: metrics_utility_image_version - x-descriptors: - - urn:alm:descriptor:com.tectonic.ui:advanced - - urn:alm:descriptor:com.tectonic.ui:text - - displayName: Metrics-Utility Image PullPolicy - path: metrics_utility_image_pull_policy - x-descriptors: - - urn:alm:descriptor:com.tectonic.ui:advanced - - urn:alm:descriptor:com.tectonic.ui:imagePullPolicy - - displayName: Metrics-Utlity ConfigMap - path: metrics_utility_configmap - x-descriptors: - - urn:alm:descriptor:com.tectonic.ui:advanced - - urn:alm:descriptor:com.tectonic.ui:selector:core:v1:ConfigMap - - displayName: Metrics-Utlity Gather Data CronJob Schedule - path: metrics_utility_cronjob_gather_schedule - x-descriptors: - - urn:alm:descriptor:com.tectonic.ui:advanced - - urn:alm:descriptor:com.tectonic.ui:text - - displayName: Metrics-Utlity Report CronJob Schedule - path: metrics_utility_cronjob_report_schedule - x-descriptors: - - urn:alm:descriptor:com.tectonic.ui:advanced - - urn:alm:descriptor:com.tectonic.ui:text - - displayName: Metrics-Utlity PVC Claim - path: metrics_utility_pvc_claim - x-descriptors: - - urn:alm:descriptor:com.tectonic.ui:advanced - - urn:alm:descriptor:com.tectonic.ui:text - - displayName: Metrics-Utlity PVC Claim Size - path: metrics_utility_pvc_claim_size - x-descriptors: - - urn:alm:descriptor:com.tectonic.ui:advanced - - urn:alm:descriptor:com.tectonic.ui:text - - displayName: Metrics-Utlity PVC Claim Storage Class - path: metrics_utility_pvc_claim_storage_class - x-descriptors: - - urn:alm:descriptor:com.tectonic.ui:advanced - - urn:alm:descriptor:io.kubernetes:StorageClass version: v1beta1 description: | AWX is designed to help accelerate and scale your business through automation.