Skip to content
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

Jump to bottom

Refs #249 #250, namespace letsencrypt issuer #251

Open
wants to merge 6 commits into
base: develop
Choose a base branch
from
+45 −43
Open

Refs #249 #250, namespace letsencrypt issuer #251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f40b9be
Refs #249 #250, namespace letsencrypt issuer
batpad Jul 26, 2022
1279a34
fix outputting of release name
batpad Jul 26, 2022
58152db
uff, forgot to commit change to letsencrypt-issuer
batpad Jul 29, 2022
53c3a8c
Add nodeSelector section for populateApidb
Aug 1, 2022
f753d69
at this point, trying random things a bit
batpad Aug 3, 2022
49f438e
fix spec on nominatim-ingress resource
batpad Aug 3, 2022
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
66 changes: 33 additions & 33 deletions osm-seed/templates/jobs/populate-apidb-job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,39 +9,39 @@ metadata:
environment: {{ .Values.environment }}
release: {{ .Release.Name }}
spec:
template:
spec:
containers:
- name: {{ .Release.Name }}-populate-apidb-job
image: {{ .Values.populateApidb.image.name }}:{{ .Values.populateApidb.image.tag }}
command: ['/start.sh']
template:
spec:
containers:
- name: {{ .Release.Name }}-populate-apidb-job
image: "{{ .Values.populateApidb.image.name }}:{{ .Values.populateApidb.image.tag }}"
command: ['/start.sh']
{{- if .Values.populateApidb.resources.enabled }}
resources:
requests:
memory: {{ .Values.populateApidb.resources.requests.memory }}
cpu: {{ .Values.populateApidb.resources.requests.cpu }}
limits:
memory: {{ .Values.populateApidb.resources.limits.memory }}
cpu: {{ .Values.populateApidb.resources.limits.cpu }}
{{- end }}
env:
- name: POSTGRES_HOST
value: {{ .Release.Name }}-db
- name: POSTGRES_DB
value: {{ .Values.db.env.POSTGRES_DB }}
- name: POSTGRES_PASSWORD
value: {{ quote .Values.db.env.POSTGRES_PASSWORD }}
- name: POSTGRES_USER
value: {{ .Values.db.env.POSTGRES_USER }}
- name: URL_FILE_TO_IMPORT
value: {{.Values.populateApidb.env.URL_FILE_TO_IMPORT}}
{{- if .Values.populateApidb.resources.enabled }}
resources:
requests:
memory: {{ .Values.populateApidb.resources.requests.memory }}
cpu: {{ .Values.populateApidb.resources.requests.cpu }}
limits:
memory: {{ .Values.populateApidb.resources.limits.memory }}
cpu: {{ .Values.populateApidb.resources.limits.cpu }}
- name: MEMORY_JAVACMD_OPTIONS
value: {{ .Values.populateApidb.resources.requests.memory | default "4Gi" | quote}}
{{- end }}
env:
- name: POSTGRES_HOST
value: {{ .Release.Name }}-db
- name: POSTGRES_DB
value: {{ .Values.db.env.POSTGRES_DB }}
- name: POSTGRES_PASSWORD
value: {{ quote .Values.db.env.POSTGRES_PASSWORD }}
- name: POSTGRES_USER
value: {{ .Values.db.env.POSTGRES_USER }}
- name: URL_FILE_TO_IMPORT
value: {{.Values.populateApidb.env.URL_FILE_TO_IMPORT}}
{{- if .Values.populateApidb.resources.enabled }}
- name: MEMORY_JAVACMD_OPTIONS
value: {{ .Values.populateApidb.resources.requests.memory | default "4Gi" | quote}}
{{- end }}
restartPolicy: Never
{{- if .Values.populateApidb.nodeSelector.enabled }}
nodeSelector:
{{ .Values.populateApidb.nodeSelector.label_key }} : {{ .Values.populateApidb.nodeSelector.label_value }}
{{- end }}
restartPolicy: Never
{{- if .Values.populateApidb.nodeSelector.enabled }}
nodeSelector:
{{ .Values.populateApidb.nodeSelector.label_key }} : {{ .Values.populateApidb.nodeSelector.label_value }}
{{- end }}
{{- end }}
2 changes: 1 addition & 1 deletion osm-seed/templates/letsencrypt-issuer.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
apiVersion: cert-manager.io/v1
kind: ClusterIssuer
metadata:
name: letsencrypt-prod-issuer
name: {{ .Release.Name }}-letsencrypt-prod-issuer
spec:
acme:
# You must replace this email address with your own.
Expand Down
2 changes: 1 addition & 1 deletion osm-seed/templates/nominatim-api/nominatim-api-ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
name: {{ template "osm-seed.fullname" . }}-ingress-nominatim-api
annotations:
kubernetes.io/ingress.class: nginx
cert-manager.io/cluster-issuer: letsencrypt-prod-issuer
cert-manager.io/cluster-issuer: {{ .Release.Name }}-letsencrypt-prod-issuer
spec:
tls:
- hosts:
Expand Down
2 changes: 1 addition & 1 deletion osm-seed/templates/overpass-api/overpass-api-ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
name: {{ template "osm-seed.fullname" . }}-ingress-overpass-api
annotations:
kubernetes.io/ingress.class: nginx
cert-manager.io/cluster-issuer: letsencrypt-prod-issuer
cert-manager.io/cluster-issuer: {{ .Release.Name }}-letsencrypt-prod-issuer
spec:
tls:
- hosts:
Expand Down
3 changes: 1 addition & 2 deletions osm-seed/templates/taginfo/taginfo-ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ metadata:
name: {{ template "osm-seed.fullname" . }}-ingress-taginfo-api
annotations:
kubernetes.io/ingress.class: nginx
cert-manager.io/cluster-issuer: letsencrypt-prod-issuer
spec:
cert-manager.io/cluster-issuer: {{ .Release.Name }}-letsencrypt-prod-issuer
tls:
- hosts:
- taginfo.{{ .Values.domain }}
Expand Down
2 changes: 1 addition & 1 deletion osm-seed/templates/tasking-manager-api/tasking-manager-api-ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
name: {{ template "osm-seed.fullname" . }}-ingress-tm-api
annotations:
kubernetes.io/ingress.class: nginx
cert-manager.io/cluster-issuer: letsencrypt-prod-issuer
cert-manager.io/cluster-issuer: {{ .Release.Name }}-letsencrypt-prod-issuer
spec:
tls:
- hosts:
Expand Down
2 changes: 1 addition & 1 deletion osm-seed/templates/tiler-server/tiler-server-ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
name: {{ template "osm-seed.fullname" . }}-ingress-tiler-server
annotations:
kubernetes.io/ingress.class: nginx
cert-manager.io/cluster-issuer: letsencrypt-prod-issuer
cert-manager.io/cluster-issuer: {{ .Release.Name }}-letsencrypt-prod-issuer
spec:
tls:
- hosts:
Expand Down
2 changes: 1 addition & 1 deletion osm-seed/templates/tiler-visor/tiler-visor-ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
name: {{ template "osm-seed.fullname" . }}-ingress-tiler-visor
annotations:
kubernetes.io/ingress.class: nginx
cert-manager.io/cluster-issuer: letsencrypt-prod-issuer
cert-manager.io/cluster-issuer: {{ .Release.Name }}-letsencrypt-prod-issuer
spec:
tls:
- hosts:
Expand Down
2 changes: 1 addition & 1 deletion osm-seed/templates/web/web-ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
name: {{ template "osm-seed.fullname" . }}-ingress-web
annotations:
kubernetes.io/ingress.class: nginx
cert-manager.io/cluster-issuer: letsencrypt-prod-issuer
cert-manager.io/cluster-issuer: {{ .Release.Name }}-letsencrypt-prod-issuer
spec:
tls:
- hosts:
Expand Down
5 changes: 4 additions & 1 deletion osm-seed/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,10 @@ populateApidb:
limits:
memory: '2Gi'
cpu: '2.5'

nodeSelector:
enabled: false
label_key: nodegroup_type
label_value: tiler
# ====================================================================================================
# Variables to start a pod to process osm files
# ====================================================================================================
Expand Down