fix: back to inlined readinessprobe block

Author: LukoJy3D

docs/sources/setup/install/helm/reference.md

@@ -6872,15 +6872,6 @@ false
   "readOnlyRootFilesystem": true
 }
 </pre>
-</td>
-		</tr>
-		<tr>
-			<td>memcached.customReadinessProbe</td>
-			<td>object</td>
-			<td>custom Readiness probe for memcached pods that overrides the default one</td>
-			<td><pre lang="json">
-{}
-</pre>
 </td>
 		</tr>
 		<tr>
@@ -6936,10 +6927,9 @@ null
 		<tr>
 			<td>memcached.readinessProbe</td>
 			<td>object</td>
-			<td>Readiness probe for memcached pods</td>
+			<td>Readiness probe for memcached pods (probe port defaults to container port)</td>
 			<td><pre lang="json">
 {
-  "enabled": false,
   "failureThreshold": 6,
   "initialDelaySeconds": 5,
   "periodSeconds": 5,

production/helm/loki/templates/memcached/_memcached-statefulset.tpl

@@ -124,17 +124,10 @@ spec:
             {{- end }}
           securityContext:
             {{- toYaml $.ctx.Values.memcached.containerSecurityContext | nindent 12 }}
-          {{- if $.ctx.Values.memcached.customReadinessProbe }}
           readinessProbe: 
-            {{- toYaml $.ctx.Values.memcached.customReadinessProbe | nindent 12 }}
-          {{- else if $.ctx.Values.memcached.readinessProbe.enabled }}
-          readinessProbe:
             tcpSocket:
               port: {{ .port }}
-            {{- with omit $.ctx.Values.memcached.readinessProbe "enabled" }}
-            {{- toYaml . | nindent 12 }}
-            {{- end }}
-          {{- end }}
+            {{- toYaml $.ctx.Values.memcached.readinessProbe | nindent 12 }}
           {{- if or .persistence.enabled .extraVolumeMounts }}
           volumeMounts:
           {{- if .persistence.enabled }}

production/helm/loki/values.yaml

@@ -3204,15 +3204,12 @@ memcached:
     fsGroup: 11211
   # -- The name of the PriorityClass for memcached pods
   priorityClassName: null
-  # -- Readiness probe for memcached pods
+  # -- Readiness probe for memcached pods (probe port defaults to container port)
   readinessProbe:
-    enabled: false
     initialDelaySeconds: 5
     periodSeconds: 5
     timeoutSeconds: 3
     failureThreshold: 6
-  # -- custom Readiness probe for memcached pods that overrides the default one
-  customReadinessProbe: {}
   # -- The SecurityContext for memcached containers
   containerSecurityContext:
     readOnlyRootFilesystem: true