Merge pull request ceph#59843 from adk3798/cephadm-oauth2-image-variable-name

mgr/cephadm: update oauth2 proxy image variable name

Reviewed-by: Anthony D'Atri <[email protected]>
Reviewed-by: Guillaume Abrioux <[email protected]>
Reviewed-by: Ken Dreyer <[email protected]>

Author: adk3798

doc/cephadm/services/oauth2-proxy.rst

@@ -119,17 +119,17 @@ A non-exhaustive list of important limitations for the `oauth2-proxy` service fo
 * Proper configuration of the IDP and OAuth2 parameters is crucial to avoid authentication failures. Misconfigurations can lead to access issues.
 
 
-Default images
-~~~~~~~~~~~~~~
+Container images
+~~~~~~~~~~~~~~~~
 
-The `oauth2-proxy` service typically uses the default container image:
+The container image the `oauth2-proxy` service will use can be found by running:
 
 ::
 
-    DEFAULT_OAUTH2_PROXY = 'quay.io/oauth2-proxy/oauth2-proxy:v7.2.0'
+    ceph config get mgr mgr/cephadm/container_image_oauth2_proxy
 
-Admins can specify the image to be used by changing the `container_image_oauth2_proxy` cephadm module option. If there were already running daemon(s),
-you must redeploy the daemon(s) to apply the new image.
+Admins can specify a custom image to be used by changing the `container_image_oauth2_proxy` cephadm module option.
+If there were already running daemon(s), you must also redeploy the daemon(s) for them to use the new image.
 
 For example:
 

src/pybind/mgr/cephadm/module.py

@@ -145,7 +145,7 @@ def os_exit_noop(status: int) -> None:
 DEFAULT_JAEGER_COLLECTOR_IMAGE = 'quay.io/jaegertracing/jaeger-collector:1.29'
 DEFAULT_JAEGER_AGENT_IMAGE = 'quay.io/jaegertracing/jaeger-agent:1.29'
 DEFAULT_NGINX_IMAGE = 'quay.io/ceph/nginx:sclorg-nginx-126'
-DEFAULT_OAUTH2_PROXY = 'quay.io/oauth2-proxy/oauth2-proxy:v7.6.0'
+DEFAULT_OAUTH2_PROXY_IMAGE = 'quay.io/oauth2-proxy/oauth2-proxy:v7.6.0'
 DEFAULT_JAEGER_QUERY_IMAGE = 'quay.io/jaegertracing/jaeger-query:1.29'
 DEFAULT_SAMBA_IMAGE = 'quay.io/samba.org/samba-server:devbuilds-centos-amd64'
 DEFAULT_SAMBA_METRICS_IMAGE = 'quay.io/samba.org/samba-metrics:latest'
@@ -292,7 +292,7 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule,
         ),
         Option(
             'container_image_oauth2_proxy',
-            default=DEFAULT_OAUTH2_PROXY,
+            default=DEFAULT_OAUTH2_PROXY_IMAGE,
             desc='oauth2-proxy container image',
         ),
         Option(