Make cacheSize maxConn configurable

Jira: OSPRH-12339
openstack-k8s-operators · Jan 9, 2025 · bdc706a · bdc706a
1 parent c302f3d
commit bdc706a
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 2 deletions.
diff --git a/apis/bases/memcached.openstack.org_memcacheds.yaml b/apis/bases/memcached.openstack.org_memcacheds.yaml
@@ -48,10 +48,20 @@ spec:
           spec:
             description: MemcachedSpec defines the desired state of Memcached
             properties:
+              cacheSize:
+                default: 9932
+                description: Maximum Memcached cache size in MB
+                format: int32
+                type: integer
               containerImage:
                 description: Name of the memcached container image to run (will be
                   set to environmental default if empty)
                 type: string
+              maxConn:
+                default: 9932
+                description: Maximum number of connections accepted by Memcached
+                format: int32
+                type: integer
               nodeSelector:
                 additionalProperties:
                   type: string

diff --git a/apis/memcached/v1beta1/memcached_types.go b/apis/memcached/v1beta1/memcached_types.go
@@ -60,6 +60,16 @@ type MemcachedSpecCore struct {
 	// +operator-sdk:csv:customresourcedefinitions:type=spec
 	// TLS settings for memcached service
 	TLS tls.SimpleService `json:"tls,omitempty"`
+
+	// +kubebuilder:validation:Optional
+	// +kubebuilder:default=9932
+	// Maximum Memcached cache size in MB
+	CacheSize int32 `json:"cacheSize"`
+
+	// +kubebuilder:validation:Optional
+	// +kubebuilder:default=9932
+	// Maximum number of connections accepted by Memcached
+	MaxConn int32 `json:"maxConn"`
 }
 
 // MemcachedStatus defines the observed state of Memcached

diff --git a/config/crd/bases/memcached.openstack.org_memcacheds.yaml b/config/crd/bases/memcached.openstack.org_memcacheds.yaml
@@ -48,10 +48,20 @@ spec:
           spec:
             description: MemcachedSpec defines the desired state of Memcached
             properties:
+              cacheSize:
+                default: 9932
+                description: Maximum Memcached cache size in MB
+                format: int32
+                type: integer
               containerImage:
                 description: Name of the memcached container image to run (will be
                   set to environmental default if empty)
                 type: string
+              maxConn:
+                default: 9932
+                description: Maximum number of connections accepted by Memcached
+                format: int32
+                type: integer
               nodeSelector:
                 additionalProperties:
                   type: string

diff --git a/config/samples/memcached_v1beta1_memcached.yaml b/config/samples/memcached_v1beta1_memcached.yaml
@@ -4,3 +4,4 @@ metadata:
   name: memcached
 spec:
   replicas: 1
+  cacheSize: 1024
diff --git a/controllers/memcached/memcached_controller.go b/controllers/memcached/memcached_controller.go
@@ -394,6 +394,8 @@ func (r *Reconciler) generateConfigMaps(
 		"memcachedTLSListen":  memcachedTLSListen,
 		"memcachedTLSOptions": memcachedTLSOptions,
 		"memcachedPort":       memcachedPort,
+		"memcachedCacheSize":  instance.Spec.CacheSize,
+		"memcachedMaxConn":    instance.Spec.MaxConn,
 	}
 
 	cms := []util.Template{

diff --git a/templates/memcached/config/memcached b/templates/memcached/config/memcached
@@ -1,7 +1,7 @@
 PORT="{{ .memcachedPort }}"
 USER="memcached"
-MAXCONN="8192"
-CACHESIZE="9932"
+MAXCONN="{{ .memcachedMaxConn }}"
+CACHESIZE="{{ .memcachedCacheSize }}"
 # explicit IP to bind to (wrap IPv6 in brackets)
 LISTEN=$(echo 127.0.0.1 ::1 $POD_IPS | tr ',' ' ' | tr ' ' '\n' | sed 's/\(.*\):\(.*\)/[\1:\2]/' {{ .memcachedTLSListen }})
 OPTIONS="-l $(echo $LISTEN | tr ' ' ',') {{ .memcachedTLSOptions }} -vv"