Merge branch 'master' into delete-setup-page

endpoints/common.py

@@ -15,6 +15,7 @@ from auth.permissions import QuayDeferredPermissionUser
 from config import frontend_visible_config
 from external_libraries import get_external_javascript, get_external_css
 from endpoints.common_models_pre_oci import pre_oci_model as model
+from util.config.provider.k8sprovider import QE_NAMESPACE
 from util.secscan import PRIORITY_LEVELS
 from util.saas.useranalytics import build_error_callback
 from util.timedeltastring import convert_to_timedelta
@@ -143,7 +144,7 @@ def render_page_template(name, route_data=None, **kwargs):
                              preferred_scheme=app.config['PREFERRED_URL_SCHEME'],
                              version_number=version_number,
                              current_year=datetime.datetime.now().year,
-                             is_kubernetes=IS_KUBERNETES,
+                             kubernetes_namespace=IS_KUBERNETES and QE_NAMESPACE,
                              **kwargs)
 
   resp = make_response(contents)