From cd225018f9fdbe8427f2edc1b873c0c5c174e2d0 Mon Sep 17 00:00:00 2001
From: Jennifer Richards <jennifer@staff.ietf.org>
Date: Sat, 16 Mar 2024 01:18:23 +1000
Subject: [PATCH] ci: Memcached service (#7185)
* ci: service.yaml -> services/datatracker.yaml
* ci: memcached service
* ci: simplify memcached service name
* ci: Use correct service.type for memcached
---
helm/settings_local.py | 4 +--
helm/templates/deployments/memcached.yaml | 4 +--
.../datatracker.yaml} | 36 +++++++++----------
helm/templates/services/memcached.yaml | 19 ++++++++++
4 files changed, 41 insertions(+), 22 deletions(-)
rename helm/templates/{service.yaml => services/datatracker.yaml} (96%)
create mode 100644 helm/templates/services/memcached.yaml
diff --git a/helm/settings_local.py b/helm/settings_local.py
index 3434b5420..993c8c327 100644
--- a/helm/settings_local.py
+++ b/helm/settings_local.py
@@ -75,8 +75,8 @@ DE_GFM_BINARY = "/usr/local/bin/de-gfm"
SITE_URL = os.environ.get("OIDC_SITE_URL")
# todo: parameterize memcached url in settings.py
-MEMCACHED_HOST = os.environ.get("DTH_DATATRACKER_MEMCACHED_SERVICE_HOST", "127.0.0.1")
-MEMCACHED_PORT = os.environ.get("DTH_DATATRACKER_MEMCACHED_SERVICE_PORT", "11211")
+MEMCACHED_HOST = os.environ.get(f"MEMCACHED_SERVICE_HOST", "127.0.0.1")
+MEMCACHED_PORT = os.environ.get("MEMCACHED_SERVICE_PORT", "11211")
from ietf import __version__
CACHES = {
"default": {
diff --git a/helm/templates/deployments/memcached.yaml b/helm/templates/deployments/memcached.yaml
index 02d440183..36ef48466 100644
--- a/helm/templates/deployments/memcached.yaml
+++ b/helm/templates/deployments/memcached.yaml
@@ -41,8 +41,8 @@ spec:
{{- toYaml . | nindent 12 }}
{{- end }}
ports:
- - name: http
- containerPort: 8000
+ - name: memcached
+ containerPort: 11211
protocol: TCP
livenessProbe:
{{- toYaml $podValues.livenessProbe | nindent 12 }}
diff --git a/helm/templates/service.yaml b/helm/templates/services/datatracker.yaml
similarity index 96%
rename from helm/templates/service.yaml
rename to helm/templates/services/datatracker.yaml
index e7b310f98..2fbea5826 100644
--- a/helm/templates/service.yaml
+++ b/helm/templates/services/datatracker.yaml
@@ -1,19 +1,19 @@
-apiVersion: v1
-kind: Service
-metadata:
- name: {{include "datatracker.fullname" .}}
- labels: {{- include "datatracker.labels" . | nindent 4 }}
- {{- with .Values.datatracker.service.annotations }}
- annotations:
- {{- range $key, $value := . }}
- {{ $key }}: {{ $value | quote }}
- {{- end }}
- {{- end }}
-spec:
- type: {{.Values.datatracker.service.type}}
- ports:
- - port: {{ default "80" .Values.datatracker.service.port}}
- targetPort: http
- protocol: TCP
- name: http
+apiVersion: v1
+kind: Service
+metadata:
+ name: {{include "datatracker.fullname" .}}
+ labels: {{- include "datatracker.labels" . | nindent 4 }}
+ {{- with .Values.datatracker.service.annotations }}
+ annotations:
+ {{- range $key, $value := . }}
+ {{ $key }}: {{ $value | quote }}
+ {{- end }}
+ {{- end }}
+spec:
+ type: {{.Values.datatracker.service.type}}
+ ports:
+ - port: {{ default "80" .Values.datatracker.service.port}}
+ targetPort: http
+ protocol: TCP
+ name: http
selector: {{- include "datatracker.selectorLabels" . | nindent 4}}
\ No newline at end of file
diff --git a/helm/templates/services/memcached.yaml b/helm/templates/services/memcached.yaml
new file mode 100644
index 000000000..1337571b0
--- /dev/null
+++ b/helm/templates/services/memcached.yaml
@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Service
+metadata:
+ name: memcached
+ labels: {{- include "datatracker.labels" . | nindent 4 }}
+ {{- with .Values.memcached.service.annotations }}
+ annotations:
+ {{- range $key, $value := . }}
+ {{ $key }}: {{ $value | quote }}
+ {{- end }}
+ {{- end }}
+spec:
+ type: {{.Values.memcached.service.type}}
+ ports:
+ - port: {{ default "11211" .Values.memcached.service.port}}
+ targetPort: memcached
+ protocol: TCP
+ name: memcached
+ selector: {{- include "datatracker.selectorLabels" . | nindent 4}}