internet/awx-operator
3
0
Fork 0
mirror of https://github.com/ansible/awx-operator.git synced 2026-05-07 22:02:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added flag to disable ipv6 listener (#1135)

Browse Source
This commit is contained in:
dale-mittleman
2022-11-30 10:38:44 -05:00
committed by GitHub
parent 61f45147f6
commit dbd1e59a55
4 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/crd/bases/awx.ansible.com_awxs.yaml
View File

@@ -524,6 +524,10 @@ spec:
description: Maintain some of the recommended `app.kubernetes.io/*` labels on the resource (self) description: Maintain some of the recommended `app.kubernetes.io/*` labels on the resource (self)
type: boolean type: boolean
default: true default: true
ipv6_disabled:
description: Disable web container's nginx ipv6 listener
type: boolean
default: false
type: object type: object
status: status:
properties: properties:

5
config/manifests/bases/awx-operator.clusterserviceversion.yaml
View File

@@ -702,6 +702,11 @@ spec:
x-descriptors: x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:advanced - urn:alm:descriptor:com.tectonic.ui:advanced
- urn:alm:descriptor:com.tectonic.ui:booleanSwitch - urn:alm:descriptor:com.tectonic.ui:booleanSwitch
- displayName: Disable IPv6 listener?
path: ipv6_disabled
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:advanced
- urn:alm:descriptor:com.tectonic.ui:booleanSwitch
statusDescriptors: statusDescriptors:
- description: Route to access the instance deployed - description: Route to access the instance deployed
displayName: URL displayName: URL

3
roles/installer/defaults/main.yml
View File

@@ -303,3 +303,6 @@ auto_upgrade: true
# Maintain some of the recommended `app.kubernetes.io/*` labels on the resource (self) # Maintain some of the recommended `app.kubernetes.io/*` labels on the resource (self)
set_self_labels: true set_self_labels: true
# Disable web container's nginx ipv6 listener
ipv6_disabled: false

6
roles/installer/templates/configmaps/config.yaml.j2
View File

@@ -132,7 +132,9 @@ data:
{% if route_tls_termination_mechanism | lower == 'passthrough' %} {% if route_tls_termination_mechanism | lower == 'passthrough' %}
server { server {
listen 8052 default_server; listen 8052 default_server;
{% if not ipv6_disabled %}
listen [::]:8052 default_server; listen [::]:8052 default_server;
{% endif %}
server_name _; server_name _;
# Redirect all HTTP links to the matching HTTPS page # Redirect all HTTP links to the matching HTTPS page
@@ -143,7 +145,9 @@ data:
server { server {
{% if route_tls_termination_mechanism | lower == 'passthrough' %} {% if route_tls_termination_mechanism | lower == 'passthrough' %}
listen 8053 ssl; listen 8053 ssl;
{% if not ipv6_disabled %}
listen [::]:8053 ssl; listen [::]:8053 ssl;
{% endif %}
ssl_certificate /etc/nginx/pki/web.crt; ssl_certificate /etc/nginx/pki/web.crt;
ssl_certificate_key /etc/nginx/pki/web.key; ssl_certificate_key /etc/nginx/pki/web.key;
@@ -154,7 +158,9 @@ data:
ssl_prefer_server_ciphers on; ssl_prefer_server_ciphers on;
{% else %} {% else %}
listen 8052 default_server; listen 8052 default_server;
{% if not ipv6_disabled %}
listen [::]:8052 default_server; listen [::]:8052 default_server;
{% endif %}
{% endif %} {% endif %}
# If you have a domain name, this is where to add it # If you have a domain name, this is where to add it