Merge pull request #311 from olliewalsh/memcached_tls

Set tls_context for django/pymemcache
openstack-k8s-operators · Apr 3, 2024 · b48a63e · b48a63e
2 parents 7477c1f + ec5bb0d
commit b48a63e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/controllers/horizon_controller.go b/controllers/horizon_controller.go
@@ -786,6 +786,7 @@ func (r *HorizonReconciler) generateServiceConfigMaps(
 		"keystoneURL":        authURL,
 		"horizonEndpointUrl": url.Host,
 		"memcachedServers":   mc.GetMemcachedServerListQuotedString(),
+		"memcachedTLS":       mc.GetMemcachedTLSSupport(),
 		"ServerName":         fmt.Sprintf("%s.%s.svc", horizon.ServiceName, instance.Namespace),
 		"Port":               horizon.HorizonPort,
 		"TLS":                false,

diff --git a/templates/horizon/config/local_settings.py b/templates/horizon/config/local_settings.py
@@ -13,6 +13,7 @@
 # ----------------------------------------------------------------------
 
 import os
+import ssl
 
 from django.utils.translation import gettext_lazy as _
 
@@ -111,7 +112,12 @@ def get_pod_ip():
         'BACKEND': 'django.core.cache.backends.memcached.PyMemcacheCache',
         'LOCATION': [ {{.memcachedServers}} ],
         # To drop the cached sessions when config changes
-        'KEY_PREFIX': os.environ['CONFIG_HASH']
+        'KEY_PREFIX': os.environ['CONFIG_HASH'],
+        'OPTIONS': {
+{{- if .memcachedTLS }}
+            'tls_context': ssl.create_default_context()
+{{- end }}
+        }
     },
 }