Make tower_ingress_type to respect ClusterIP definition

This commit is contained in:
Marcelo Moreira de Mello
2021-05-18 14:22:56 -04:00
parent d6c9ebf35c
commit e37c091d17
15 changed files with 256 additions and 126 deletions

View File

@@ -1,3 +1,4 @@
operator_image: quay.io/ansible/awx-operator
operator_version: 0.9.0
pull_policy: Always
ansible_debug_logs: "false"

View File

@@ -20,7 +20,8 @@
spec:
admin_user: admin
admin_email: admin@localhost
ingress_type: "{{ ingress_type | default(omit) }}" # Either Route, Ingress or LoadBalancer
service_type: "{{ service_type | default(omit) }}" # Either clusterIP, Loadbalancer or NodePort
ingress_type: "{{ ingress_type | default(omit) }}" # Either none, Ingress, Route
image: "{{ image | default(omit) }}"
image_version: "{{ image_version | default(omit) }}"
development_mode: "{{ development_mode | default(omit) | bool }}"

View File

@@ -70,6 +70,16 @@ spec:
extra_volumes:
description: Specify extra volumes to add to the application pod
type: string
service_type:
description: The service type to be used on the deployed instance
type: string
enum:
- LoadBalancer
- loadbalancer
- ClusterIP
- clusterip
- NodePort
- nodeport
ingress_type:
description: The ingress type to use to reach the deployed instance
type: string
@@ -79,15 +89,11 @@ spec:
- ingress
- Route
- route
- LoadBalancer
- loadbalancer
- NodePort
- nodeport
ingress_annotations:
description: Annotations to add to the ingress
description: Annotations to add to the Ingress Controller
type: string
ingress_tls_secret:
description: Secret where the ingress TLS secret can be found
description: Secret where the Ingress TLS secret can be found
type: string
loadbalancer_annotations:
description: Annotations to add to the loadbalancer

View File

@@ -35,6 +35,8 @@ spec:
value: explicit
- name: OPERATOR_VERSION
value: "{{ operator_version }}"
- name: ANSIBLE_DEBUG_LOGS
value: "{{ ansible_debug_logs|lower | default('false'|lower) }}"
livenessProbe:
httpGet:
path: /healthz