summaryrefslogtreecommitdiffstats
path: root/src/pybind
diff options
context:
space:
mode:
authorRedouane Kachach <rkachach@ibm.com>2024-09-12 15:57:07 +0200
committerRedouane Kachach <rkachach@ibm.com>2024-09-12 16:14:57 +0200
commit25e0a323ad2016e88393e38721b1e4d392bcc126 (patch)
treed436c633d6a42bdd56c4f6fc797ee4d5f9a3c832 /src/pybind
parentMerge pull request #59634 from rkachach/fix_issue_67934 (diff)
downloadceph-25e0a323ad2016e88393e38721b1e4d392bcc126.tar.xz
ceph-25e0a323ad2016e88393e38721b1e4d392bcc126.zip
mgr/cephadm: renaming whitelist_domains field to allowlist_domains
Fixes: https://tracker.ceph.com/issues/68052 Signed-off-by: Redouane Kachach <rkachach@ibm.com>
Diffstat (limited to '')
-rw-r--r--src/pybind/mgr/cephadm/services/oauth2_proxy.py6
-rw-r--r--src/pybind/mgr/cephadm/templates/services/oauth2-proxy/oauth2-proxy.conf.j22
2 files changed, 4 insertions, 4 deletions
diff --git a/src/pybind/mgr/cephadm/services/oauth2_proxy.py b/src/pybind/mgr/cephadm/services/oauth2_proxy.py
index c19005c95f3..cabb21bce13 100644
--- a/src/pybind/mgr/cephadm/services/oauth2_proxy.py
+++ b/src/pybind/mgr/cephadm/services/oauth2_proxy.py
@@ -67,12 +67,12 @@ class OAuth2ProxyService(CephadmService):
def generate_config(self, daemon_spec: CephadmDaemonDeploySpec) -> Tuple[Dict[str, Any], List[str]]:
assert self.TYPE == daemon_spec.daemon_type
svc_spec = cast(OAuth2ProxySpec, self.mgr.spec_store[daemon_spec.service_name].spec)
- whitelist_domains = svc_spec.whitelist_domains or []
- whitelist_domains += self.get_service_ips_and_hosts('mgmt-gateway')
+ allowlist_domains = svc_spec.allowlist_domains or []
+ allowlist_domains += self.get_service_ips_and_hosts('mgmt-gateway')
context = {
'spec': svc_spec,
'cookie_secret': svc_spec.cookie_secret or self.generate_random_secret(),
- 'whitelist_domains': whitelist_domains,
+ 'allowlist_domains': allowlist_domains,
'redirect_url': svc_spec.redirect_url or self.get_redirect_url()
}
diff --git a/src/pybind/mgr/cephadm/templates/services/oauth2-proxy/oauth2-proxy.conf.j2 b/src/pybind/mgr/cephadm/templates/services/oauth2-proxy/oauth2-proxy.conf.j2
index 20ca8cb6504..c8d9f920adf 100644
--- a/src/pybind/mgr/cephadm/templates/services/oauth2-proxy/oauth2-proxy.conf.j2
+++ b/src/pybind/mgr/cephadm/templates/services/oauth2-proxy/oauth2-proxy.conf.j2
@@ -34,4 +34,4 @@ set_xauthrequest= true
# Secret value for encrypting cookies.
cookie_secret= "{{ cookie_secret }}"
email_domains= "*"
-whitelist_domains= "{{ whitelist_domains | join(',') }}"
+whitelist_domains= "{{ allowlist_domains | join(',') }}"