From 1d76b4d950951e8c960d70d055b80e666997e155 Mon Sep 17 00:00:00 2001 From: Jennifer Richards Date: Fri, 15 Mar 2024 10:49:17 +1000 Subject: [PATCH 1/4] ci: service.yaml -> services/datatracker.yaml --- .../datatracker.yaml} | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) rename helm/templates/{service.yaml => services/datatracker.yaml} (96%) 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 e7b310f98f4..2fbea5826f7 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 From 385968de44a2fe1d42140382576a52f7c29ab841 Mon Sep 17 00:00:00 2001 From: Jennifer Richards Date: Fri, 15 Mar 2024 11:01:29 +1000 Subject: [PATCH 2/4] ci: memcached service --- helm/templates/deployments/memcached.yaml | 4 ++-- helm/templates/services/memcached.yaml | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 helm/templates/services/memcached.yaml diff --git a/helm/templates/deployments/memcached.yaml b/helm/templates/deployments/memcached.yaml index 02d4401832d..36ef4846667 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/services/memcached.yaml b/helm/templates/services/memcached.yaml new file mode 100644 index 00000000000..c6ae85f2948 --- /dev/null +++ b/helm/templates/services/memcached.yaml @@ -0,0 +1,19 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{include "datatracker.memcached.fullname" .}} + labels: {{- include "datatracker.labels" . | nindent 4 }} + {{- with .Values.memcached.service.annotations }} + annotations: + {{- range $key, $value := . }} + {{ $key }}: {{ $value | quote }} + {{- end }} + {{- end }} +spec: + type: {{.Values.datatracker.service.type}} + ports: + - port: {{ default "11211" .Values.memcached.service.port}} + targetPort: memcached + protocol: TCP + name: memcached + selector: {{- include "datatracker.selectorLabels" . | nindent 4}} From ece24b2f60c003e21486a3097bdb2b55f54d41b0 Mon Sep 17 00:00:00 2001 From: Jennifer Richards Date: Fri, 15 Mar 2024 12:36:38 +1000 Subject: [PATCH 3/4] ci: simplify memcached service name --- helm/settings_local.py | 4 ++-- helm/templates/services/memcached.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/helm/settings_local.py b/helm/settings_local.py index 3434b54205d..993c8c32766 100644 --- a/helm/settings_local.py +++ b/helm/settings_local.py @@ -75,8 +75,8 @@ 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/services/memcached.yaml b/helm/templates/services/memcached.yaml index c6ae85f2948..1208efde22a 100644 --- a/helm/templates/services/memcached.yaml +++ b/helm/templates/services/memcached.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Service metadata: - name: {{include "datatracker.memcached.fullname" .}} + name: memcached labels: {{- include "datatracker.labels" . | nindent 4 }} {{- with .Values.memcached.service.annotations }} annotations: From 45895b338336bd27fd056662ca3f17ee72fd7586 Mon Sep 17 00:00:00 2001 From: Jennifer Richards Date: Fri, 15 Mar 2024 14:52:52 +1000 Subject: [PATCH 4/4] ci: Use correct service.type for memcached --- helm/templates/services/memcached.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/templates/services/memcached.yaml b/helm/templates/services/memcached.yaml index 1208efde22a..1337571b04f 100644 --- a/helm/templates/services/memcached.yaml +++ b/helm/templates/services/memcached.yaml @@ -10,7 +10,7 @@ metadata: {{- end }} {{- end }} spec: - type: {{.Values.datatracker.service.type}} + type: {{.Values.memcached.service.type}} ports: - port: {{ default "11211" .Values.memcached.service.port}} targetPort: memcached