Skip to content

Commit cc9ef3d

Browse files
kd7lxlnschad
andauthored
exercise memcached in test (#197)
* exercise memcached in test Signed-off-by: Tom Hayward <[email protected]> * fix memberlist service in ci/test-values.yaml Signed-off-by: ShuzZzle <[email protected]> * fix store gateway service dns address in ci/test-values.yaml Signed-off-by: ShuzZzle <[email protected]> * remove memcached resource requests for ci testing Signed-off-by: ShuzZzle <[email protected]> * request zero resources in test to support small runner Signed-off-by: Tom Hayward <[email protected]> * use same name templates as used in services Signed-off-by: Tom Hayward <[email protected]> Co-authored-by: ShuzZzle <[email protected]>
1 parent b350600 commit cc9ef3d

File tree

3 files changed

+68
-6
lines changed

3 files changed

+68
-6
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ Kubernetes: `^1.19.0-0`
326326
| config.limits.reject_old_samples | bool | `true` | |
327327
| config.limits.reject_old_samples_max_age | string | `"168h"` | |
328328
| config.memberlist.bind_port | int | `7946` | |
329-
| config.memberlist.join_members | list | `[]` | |
329+
| config.memberlist.join_members | list | `[]` | the service name of the memberlist if using memberlist discovery |
330330
| config.querier.active_query_tracker_dir | string | `"/data/cortex/querier"` | |
331331
| config.querier.query_ingesters_within | string | `"12h"` | |
332332
| config.query_range.align_queries_with_step | bool | `true` | |

ci/test-values.yaml

Lines changed: 59 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@ config:
4949
dir: "/data/store"
5050

5151
querier:
52-
store_gateway_addresses: "dns+cortex-store-gateway-headless:9095"
52+
store_gateway_addresses: 'dns+{{ include "cortex.storeGatewayFullname" $ }}-headless:9095'
5353

5454
memberlist:
5555
join_members:
56-
- "cortex-memberlist.cortex"
56+
- '{{ include "cortex.fullname" $ }}-memberlist'
5757

5858
ingester:
5959
replicas: 1
@@ -72,3 +72,60 @@ querier:
7272
enabled: true
7373
nginx:
7474
replicas: 1
75+
76+
tags:
77+
blocks-storage-memcached: true
78+
memcached:
79+
enabled: true
80+
architecture: standalone
81+
replicaCount: 1
82+
resources:
83+
# https://github.com/helm/helm/issues/9136
84+
requests:
85+
cpu: 0
86+
memory: 0
87+
memcached-index-read:
88+
enabled: true
89+
architecture: standalone
90+
replicaCount: 1
91+
resources:
92+
requests:
93+
cpu: 0
94+
memory: 0
95+
memcached-index-write:
96+
enabled: true
97+
architecture: standalone
98+
replicaCount: 1
99+
resources:
100+
requests:
101+
cpu: 0
102+
memory: 0
103+
memcached-frontend:
104+
enabled: true
105+
architecture: standalone
106+
replicaCount: 1
107+
resources:
108+
requests:
109+
cpu: 0
110+
memory: 0
111+
memcached-blocks:
112+
architecture: standalone
113+
replicaCount: 1
114+
resources:
115+
requests:
116+
cpu: 0
117+
memory: 0
118+
memcached-blocks-index:
119+
architecture: standalone
120+
replicaCount: 1
121+
resources:
122+
requests:
123+
cpu: 0
124+
memory: 0
125+
memcached-blocks-metadata:
126+
architecture: standalone
127+
replicaCount: 1
128+
resources:
129+
requests:
130+
cpu: 0
131+
memory: 0

values.yaml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,13 +143,18 @@ config:
143143
health_check_ingesters: true
144144
memberlist:
145145
bind_port: 7946
146+
# -- the service name of the memberlist
147+
# if using memberlist discovery
146148
join_members: []
147-
## add here the service name of the memberlist
148-
## if using memberlist discovery, eg:
149-
# - cortex-memberlist
149+
# - '{{ include "cortex.fullname" $ }}-memberlist'
150150
querier:
151151
active_query_tracker_dir: /data/cortex/querier
152152
query_ingesters_within: 12h
153+
# Comma separated list of store-gateway addresses in DNS Service Discovery
154+
# format. This option should be set when using the blocks storage and the
155+
# store-gateway sharding is disabled (when enabled, the store-gateway instances
156+
# form a ring and addresses are picked from the ring).
157+
# store_gateway_addresses: 'dns+{{ include "cortex.storeGatewayFullname" $ }}-headless:9095'
153158
query_range:
154159
split_queries_by_interval: 24h
155160
align_queries_with_step: true

0 commit comments

Comments
 (0)