From ca7361656c468efc0675e79cf7ba7037291c5457 Mon Sep 17 00:00:00 2001 From: "Christian M. Adams" Date: Fri, 8 Mar 2024 09:16:48 -0500 Subject: [PATCH] Revert change to cast settings values to strings as they could be nested - We cast the settings value to a string so that it would display properly in the Openshift UI. Unfortunately, the k8s validator will no longer allow arrays for settings values. --- config/crd/bases/awx.ansible.com_awxs.yaml | 3 +-- config/manifests/bases/awx-operator.clusterserviceversion.yaml | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/crd/bases/awx.ansible.com_awxs.yaml b/config/crd/bases/awx.ansible.com_awxs.yaml index 4cb028a1e..6c2a03651 100644 --- a/config/crd/bases/awx.ansible.com_awxs.yaml +++ b/config/crd/bases/awx.ansible.com_awxs.yaml @@ -1889,13 +1889,12 @@ spec: description: Set log level of receptor service type: string extra_settings: - description: Extra settings to specify for the API + description: Extra settings to specify for AWX items: properties: setting: type: string value: - type: string x-kubernetes-preserve-unknown-fields: true type: object type: array diff --git a/config/manifests/bases/awx-operator.clusterserviceversion.yaml b/config/manifests/bases/awx-operator.clusterserviceversion.yaml index 44b5c41f0..6b6605e56 100644 --- a/config/manifests/bases/awx-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/awx-operator.clusterserviceversion.yaml @@ -952,6 +952,7 @@ spec: path: extra_settings x-descriptors: - urn:alm:descriptor:com.tectonic.ui:advanced + - urn:alm:descriptor:com.tectonic.ui:hidden - displayName: No Log Configuration path: no_log x-descriptors: