From f1e6c3729ff1cedde3da9cd007aa06313c57dd7c Mon Sep 17 00:00:00 2001
From: Jennifer Richards <jennifer@staff.ietf.org>
Date: Wed, 20 Mar 2024 05:21:38 +1000
Subject: [PATCH] ci: give rabbitmq a persistent volume claim (#7235)
* ci: give rabbitmq a persistent volume claim
This relies on minikube's dynamic creation of
persistent volumes - expect changes likely
needed for production deployment.
* ci: that's not an f-string
* ci: todo is todone
---
helm/settings_local.py | 3 +--
helm/templates/persistentvolumeclaims.yaml | 12 ++++++++++++
helm/values.yaml | 7 ++++++-
3 files changed, 19 insertions(+), 3 deletions(-)
create mode 100644 helm/templates/persistentvolumeclaims.yaml
diff --git a/helm/settings_local.py b/helm/settings_local.py
index 993c8c327..b07b559c4 100644
--- a/helm/settings_local.py
+++ b/helm/settings_local.py
@@ -68,14 +68,13 @@ IDSUBMIT_REPOSITORY_PATH = INTERNET_DRAFT_PATH
NOMCOM_PUBLIC_KEYS_DIR = "data/nomcom_keys/public_keys/"
SLIDE_STAGING_PATH = "/test/staging/"
-# todo check that de-gfm is in place
DE_GFM_BINARY = "/usr/local/bin/de-gfm"
# OIDC configuration
SITE_URL = os.environ.get("OIDC_SITE_URL")
# todo: parameterize memcached url in settings.py
-MEMCACHED_HOST = os.environ.get(f"MEMCACHED_SERVICE_HOST", "127.0.0.1")
+MEMCACHED_HOST = os.environ.get("MEMCACHED_SERVICE_HOST", "127.0.0.1")
MEMCACHED_PORT = os.environ.get("MEMCACHED_SERVICE_PORT", "11211")
from ietf import __version__
CACHES = {
diff --git a/helm/templates/persistentvolumeclaims.yaml b/helm/templates/persistentvolumeclaims.yaml
new file mode 100644
index 000000000..edf69aebc
--- /dev/null
+++ b/helm/templates/persistentvolumeclaims.yaml
@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+ name: "rabbitmq-data-claim"
+spec:
+# storageClassName: "local"
+# volumeName: ""
+ accessModes:
+ - ReadWriteOnce
+ resources:
+ requests:
+ storage: 8Gi
diff --git a/helm/values.yaml b/helm/values.yaml
index dc5c24f06..c64105abb 100644
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -37,7 +37,7 @@ datatracker:
pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion.
# tag: "v1.1.0"
-
+
imagePullSecrets: []
nameOverride: ""
fullnameOverride: ""
@@ -457,6 +457,9 @@ rabbitmq:
# Additional volumes on the output Deployment definition.
volumes:
+ - name: "rabbitmq-data"
+ persistentVolumeClaim:
+ claimName: "rabbitmq-data-claim"
- name: "rabbitmq-config"
configMap:
name: "rabbitmq-configmap"
@@ -467,6 +470,8 @@ rabbitmq:
# Additional volumeMounts on the output Deployment definition.
volumeMounts:
+ - name: "rabbitmq-data"
+ mountPath: "/var/lib/rabbitmq/mnesia"
- name: "rabbitmq-config"
mountPath: "/etc/rabbitmq"
# - name: foo