Skip to content

ci: Memcached service #7185

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rjsparks merged 4 commits into from
Mar 15, 2024
+41 −22
Merged

ci: Memcached service #7185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1d76b4d
ci: service.yaml -> services/datatracker.yaml
jennifer-richards Mar 15, 2024
385968d
ci: memcached service
jennifer-richards Mar 15, 2024
ece24b2
ci: simplify memcached service name
jennifer-richards Mar 15, 2024
45895b3
ci: Use correct service.type for memcached
jennifer-richards Mar 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions helm/settings_local.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
4 changes: 2 additions & 2 deletions helm/templates/deployments/memcached.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
36 changes: 18 additions & 18 deletions helm/templates/service.yaml → helm/templates/services/datatracker.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}}
19 changes: 19 additions & 0 deletions helm/templates/services/memcached.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}}