Skip to content

Commit c987bac

Browse files
jennifer-richardsNGPixel
authored andcommitted
ci: Rabbitmq progress (wip) (ietf-tools#7233)
* ci: rabbitmq service (wip) * ci: customize rabbitmq config
1 parent f6db3e8 commit c987bac

4 files changed

Lines changed: 91 additions & 9 deletions

File tree

helm/templates/configmap.yaml

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,59 @@ metadata:
55
data:
66
settings_local.py: |-
77
{{- .Files.Get "settings_local.py" | indent 4 }}
8+
---
9+
apiVersion: v1
10+
kind: ConfigMap
11+
metadata:
12+
name: rabbitmq-configmap
13+
data:
14+
definitions.json: |-
15+
{
16+
"permissions": [
17+
{
18+
"configure": ".*",
19+
"read": ".*",
20+
"user": "datatracker",
21+
"vhost": "dt",
22+
"write": ".*"
23+
}
24+
],
25+
"users": [
26+
{
27+
"hashing_algorithm": "rabbit_password_hashing_sha256",
28+
"limits": {},
29+
"name": "datatracker",
30+
"password_hash": "HJxcItcpXtBN+R/CH7dUelfKBOvdUs3AWo82SBw2yLMSguzb",
31+
"tags": []
32+
}
33+
],
34+
"vhosts": [
35+
{
36+
"limits": [],
37+
"metadata": {
38+
"description": "",
39+
"tags": []
40+
},
41+
"name": "dt"
42+
}
43+
]
44+
}
45+
rabbitmq.conf: |-
46+
# prevent guest from logging in over tcp
47+
loopback_users.guest = true
48+
49+
# load saved definitions
50+
load_definitions = /etc/rabbitmq/definitions.json
51+
52+
# Ensure that enough disk is available to flush to disk. To do this, need to limit the
53+
# memory available to the container to something reasonable. See
54+
# https://www.rabbitmq.com/production-checklist.html#monitoring-and-resource-usage
55+
# for recommendations.
56+
57+
# 1-1.5 times the memory available to the container is adequate for disk limit
58+
disk_free_limit.absolute = 6000MB
59+
60+
# This should be ~40% of the memory available to the container. Use an
61+
# absolute number because relative will be proprtional to the full machine
62+
# memory.
63+
vm_memory_high_watermark.absolute = 1600MB
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
apiVersion: v1
2+
kind: Service
3+
metadata:
4+
name: rabbitmq
5+
labels: {{- include "datatracker.labels" . | nindent 4 }}
6+
{{- with .Values.rabbitmq.service.annotations }}
7+
annotations:
8+
{{- range $key, $value := . }}
9+
{{ $key }}: {{ $value | quote }}
10+
{{- end }}
11+
{{- end }}
12+
spec:
13+
type: {{.Values.rabbitmq.service.type}}
14+
clusterIP: None # headless service
15+
ports:
16+
- port: {{ default "5672" .Values.rabbitmq.service.port}}
17+
targetPort: amqp
18+
protocol: TCP
19+
name: amqp
20+
selector: {{- include "datatracker.selectorLabels" . | nindent 4}}
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
apiVersion: apps/v1
2-
kind: Deployment
2+
kind: StatefulSet
33
metadata:
44
name: {{ include "datatracker.rabbitmq.fullname" . }}
55
labels:
@@ -41,8 +41,8 @@ spec:
4141
{{- toYaml . | nindent 12 }}
4242
{{- end }}
4343
ports:
44-
- name: http
45-
containerPort: 8000
44+
- name: amqp
45+
containerPort: 5672
4646
protocol: TCP
4747
livenessProbe:
4848
{{- toYaml $podValues.livenessProbe | nindent 12 }}

helm/values.yaml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -387,11 +387,11 @@ beat:
387387
# -------------------------------------------------------------
388388

389389
rabbitmq:
390-
name: rabbitmq
390+
name: "rabbitmq"
391391
image:
392-
repository: "ghcr.io/ietf-tools/datatracker-mq"
392+
repository: "rabbitmq"
393393
pullPolicy: IfNotPresent
394-
tag: "latest"
394+
tag: "3.13"
395395

396396
imagePullSecrets: []
397397
nameOverride: ""
@@ -433,7 +433,7 @@ rabbitmq:
433433

434434
service:
435435
type: ClusterIP
436-
port: 80
436+
port: 5672
437437

438438
serviceAccount:
439439
# Specifies whether a service account should be created
@@ -456,14 +456,19 @@ rabbitmq:
456456
command: ["rabbitmq-diagnostics", "-q", "ping"]
457457

458458
# Additional volumes on the output Deployment definition.
459-
volumes: []
459+
volumes:
460+
- name: "rabbitmq-config"
461+
configMap:
462+
name: "rabbitmq-configmap"
460463
# - name: foo
461464
# secret:
462465
# secretName: mysecret
463466
# optional: false
464467

465468
# Additional volumeMounts on the output Deployment definition.
466-
volumeMounts: []
469+
volumeMounts:
470+
- name: "rabbitmq-config"
471+
mountPath: "/etc/rabbitmq"
467472
# - name: foo
468473
# mountPath: "/etc/foo"
469474
# readOnly: true
@@ -557,3 +562,4 @@ env:
557562
DBUSER: "django"
558563
DBPASS: "RkTkDPFnKpko"
559564
DJANGO_SECRET_KEY: "PDwXboUq!=hPjnrtG2=ge#N$Dwy+wn@uivrugwpic8mxyPfHk"
565+
CELERY_BROKER_URL: "amqp://datatracker:frog@rabbitmq/dt"

0 commit comments

Comments
 (0)