diff --git a/deploy/olm-catalog/awx-operator/manifests/awx-operator.clusterserviceversion.yaml b/deploy/olm-catalog/awx-operator/manifests/awx-operator.clusterserviceversion.yaml index 019245b5..3c121af1 100644 --- a/deploy/olm-catalog/awx-operator/manifests/awx-operator.clusterserviceversion.yaml +++ b/deploy/olm-catalog/awx-operator/manifests/awx-operator.clusterserviceversion.yaml @@ -115,7 +115,7 @@ spec: - urn:alm:descriptor:com.tectonic.ui:select:none - urn:alm:descriptor:com.tectonic.ui:select:Ingress - urn:alm:descriptor:com.tectonic.ui:select:Route - - urn:alm:descriptor:com.tectonic.ui:select:Loadbalancer + - urn:alm:descriptor:com.tectonic.ui:select:LoadB alancer - displayName: Tower Ingress Annotations path: tower_ingress_annotations x-descriptors: @@ -140,11 +140,13 @@ spec: - urn:alm:descriptor:com.tectonic.ui:advanced - urn:alm:descriptor:com.tectonic.ui:select:http - urn:alm:descriptor:com.tectonic.ui:select:https + - urn:alm:descriptor:com.tectonic.ui:fieldDependency:tower_ingress_type:LoadBalancer - displayName: Tower LoadBalancer Port path: tower_loadbalancer_port x-descriptors: - urn:alm:descriptor:com.tectonic.ui:advanced - urn:alm:descriptor:com.tectonic.ui:number + - urn:alm:descriptor:com.tectonic.ui:fieldDependency:tower_ingress_type:LoadBalancer - displayName: Route DNS host path: tower_route_host x-descriptors: diff --git a/deploy/olm-catalog/awx-operator/manifests/awx.ansible.com_awxs_crd.yaml b/deploy/olm-catalog/awx-operator/manifests/awx.ansible.com_awxs_crd.yaml index b419fe00..d2f1b0f0 100644 --- a/deploy/olm-catalog/awx-operator/manifests/awx.ansible.com_awxs_crd.yaml +++ b/deploy/olm-catalog/awx-operator/manifests/awx.ansible.com_awxs_crd.yaml @@ -82,7 +82,7 @@ spec: - ingress - Route - route - - Loadbalancer + - LoadBalancer - loadbalancer type: string tower_loadbalancer_annotations: diff --git a/roles/installer/templates/tower_service.yaml.j2 b/roles/installer/templates/tower_service.yaml.j2 index 5c1d1e93..8d5d7cc0 100644 --- a/roles/installer/templates/tower_service.yaml.j2 +++ b/roles/installer/templates/tower_service.yaml.j2 @@ -32,7 +32,7 @@ spec: {% endif %} selector: app: '{{ deployment_type }}' -{% if tower_ingress_type == "loadbalancer" %} +{% if tower_ingress_type | lower == "loadbalancer" %} type: LoadBalancer {% elif tower_ingress_type != "none" %} type: NodePort