EOX GitLab Instance

Skip to content
Snippets Groups Projects
Commit 31941d8f authored by Nikola Jankovic's avatar Nikola Jankovic :computer:
Browse files

removed env variable defaults

added config value to renderer for enabling http_access
updated ingress to detect new route
parent 96d36ec9
No related branches found
No related tags found
1 merge request!7Configure http access
Pipeline #20784 passed
......@@ -42,7 +42,6 @@ global:
POSTGRES_DB: dbname
POSTGRES_PASSWORD: dbpw
POSTGRES_USER: dbuser
ENABLE_HTTP_ACCESS: "false"
collections: {}
productTypes: []
coverageTypes: []
......
......@@ -69,6 +69,12 @@ spec:
value: /opt/core/wait-initialized.sh {{- range $script := .Values.global.env.startup_scripts }} {{ $script }}{{ end }}
- name: WAIT_SERVICES
value: {{ .Release.Name }}-database:{{ .Values.global.env.DB_PORT }}
- name: ENABLE_HTTP_ACCESS
{{- if .Values.config.enableHttpAccess }}
value: "true"
{{- else }}
value: "false"
{{- end }}
envFrom:
- secretRef:
name: django-secret-key
......
......@@ -53,7 +53,16 @@ spec:
name: {{ $fullName }}
port:
number: 80
{{- else }}
{{- if $.Values.config.enableHttpAccess }}
- path: /(http.*)
pathType: Prefix
backend:
service:
name: {{ $fullName }}
port:
number: 80
{{- end -}}
{{- else -}}
- host: {{ .host | quote }}
http:
paths:
......@@ -69,6 +78,12 @@ spec:
backend:
serviceName: {{ $fullName }}
servicePort: http
{{- if $.Values.config.enableHttpAccess -}}
- path: /(http.*)
backend:
serviceName: {{ $fullName }}
servicePort: http
{{- end -}}
{{- end -}}
{{- end }}
{{- end -}}
{{- end -}}
......@@ -39,6 +39,9 @@ volumes: []
ingress:
enabled: true
config:
enableHttpAccess: false
global:
env:
REDIS_PORT: "6379"
......@@ -52,7 +55,6 @@ global:
POSTGRES_DB: dbname
POSTGRES_PASSWORD: dbpw
POSTGRES_USER: dbuser
ENABLE_HTTP_ACCESS: "false"
collections: {}
productTypes: []
coverageTypes: []
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment