mirror of
https://github.com/ansible/awx-operator.git
synced 2026-05-07 13:52:58 +00:00
refactor: remove proxy env var CRD fields and CSV specDescriptors (#2114)
Proxy configuration is injected into the operator pod environment and propagated to containers via the existing ConfigMap mechanism. Assisted by: Claude Signed-off-by: James Marshall <jamarsha@redhat.com>
This commit is contained in:
@@ -1901,15 +1901,6 @@ spec:
|
||||
bundle_cacert_secret:
|
||||
description: Secret where can be found the trusted Certificate Authority Bundle
|
||||
type: string
|
||||
http_proxy:
|
||||
description: HTTP proxy URL to configure on AWX containers
|
||||
type: string
|
||||
https_proxy:
|
||||
description: HTTPS proxy URL to configure on AWX containers
|
||||
type: string
|
||||
no_proxy:
|
||||
description: Comma-separated list of hosts that bypass the proxy on AWX containers
|
||||
type: string
|
||||
projects_persistence:
|
||||
description: Whether or not the /var/lib/projects directory will be persistent
|
||||
default: false
|
||||
|
||||
@@ -1074,24 +1074,6 @@ spec:
|
||||
x-descriptors:
|
||||
- urn:alm:descriptor:com.tectonic.ui:advanced
|
||||
- urn:alm:descriptor:io.kubernetes:Secret
|
||||
- description: HTTP proxy URL to configure on AWX containers
|
||||
displayName: HTTP Proxy
|
||||
path: http_proxy
|
||||
x-descriptors:
|
||||
- urn:alm:descriptor:com.tectonic.ui:advanced
|
||||
- urn:alm:descriptor:com.tectonic.ui:text
|
||||
- description: HTTPS proxy URL to configure on AWX containers
|
||||
displayName: HTTPS Proxy
|
||||
path: https_proxy
|
||||
x-descriptors:
|
||||
- urn:alm:descriptor:com.tectonic.ui:advanced
|
||||
- urn:alm:descriptor:com.tectonic.ui:text
|
||||
- description: Comma-separated list of hosts that bypass the proxy on AWX containers
|
||||
displayName: No Proxy
|
||||
path: no_proxy
|
||||
x-descriptors:
|
||||
- urn:alm:descriptor:com.tectonic.ui:advanced
|
||||
- urn:alm:descriptor:com.tectonic.ui:text
|
||||
- displayName: Nodeport Port
|
||||
path: nodeport_port
|
||||
x-descriptors:
|
||||
|
||||
@@ -16,7 +16,3 @@ spec:
|
||||
requests:
|
||||
cpu: 50m
|
||||
memory: 64M
|
||||
# HTTP proxy settings (optional)
|
||||
# http_proxy: "http://proxy.example.com:3128"
|
||||
# https_proxy: "http://proxy.example.com:3128"
|
||||
# no_proxy: "localhost,127.0.0.1,.cluster.local"
|
||||
|
||||
@@ -460,9 +460,7 @@ ldap_password_secret: ''
|
||||
bundle_cacert_secret: ''
|
||||
|
||||
# Proxy environment variables for AWX containers.
|
||||
# Defaults inherit from the operator pod environment (e.g. set by the OCP cluster
|
||||
# proxy object). Set these fields in the CR spec to override the inherited values
|
||||
# per instance.
|
||||
# Values are inherited from the operator pod environment.
|
||||
http_proxy: "{{ lookup('env', 'http_proxy') or lookup('env', 'HTTP_PROXY') or '' }}"
|
||||
https_proxy: "{{ lookup('env', 'https_proxy') or lookup('env', 'HTTPS_PROXY') or '' }}"
|
||||
no_proxy: "{{ lookup('env', 'no_proxy') or lookup('env', 'NO_PROXY') or '' }}"
|
||||
|
||||
Reference in New Issue
Block a user