Skip to content

Commit 66dad89

Browse files
author
Сентябов Александр Сергеевич
committed
fixup! fixup! [DEVOPS-2250] move proxy.licenseKey to secret
1 parent ed86563 commit 66dad89

File tree

3 files changed

+64
-64
lines changed

3 files changed

+64
-64
lines changed

‎charts/traffic-proxy/templates/_helpers.tpl‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -41,57 +41,57 @@
4141
{{- define "locationDG" -}}
4242
{{/* 1. ECA endpoints*/}}
4343
location = /eca/traffic/moses/speeds5.json {
44-
rewrite ^ /api/v1/services/navi/proxy/eca-index/traffic/moses/speeds5.json break;
45-
{{- include "proxyParams" . }}
44+
rewrite ^ /api/v1/services/navi/proxy/eca-index/traffic/moses/speeds5.json break;
45+
{{- include "proxyParams" . }}
4646
}
4747

4848
location ~ ^/eca/speeds/calculator-prod\.k8s\.m9\.2gis\.io/ {
49-
rewrite ^/eca(/speeds/calculator-prod\.k8s\.m9\.2gis\.io/.*)$ /api/v1/services/navi/proxy/online-speeds/traffic$1 break;
50-
{{- include "proxyParams" . }}
49+
rewrite ^/eca(/speeds/calculator-prod\.k8s\.m9\.2gis\.io/.*)$ /api/v1/services/navi/proxy/online-speeds/traffic$1 break;
50+
{{- include "proxyParams" . }}
5151
}
5252

5353
location ~ ^/eca/speeds_v3/([^/]+)/ {
54-
rewrite ^/eca(.*)$ /api/v1/services/navi/proxy/online-speeds-v3/traffic$1 break;
55-
{{- include "proxyParams" . }}
54+
rewrite ^/eca(.*)$ /api/v1/services/navi/proxy/online-speeds-v3/traffic$1 break;
55+
{{- include "proxyParams" . }}
5656
}
5757

5858
{{/* 2. Forecast endpoints*/}}
5959
location = /forecast/index.json {
60-
rewrite ^ /api/v1/services/navi/proxy/forecast-index/index.json break;
61-
{{- include "proxyParams" . }}
60+
rewrite ^ /api/v1/services/navi/proxy/forecast-index/index.json break;
61+
{{- include "proxyParams" . }}
6262
}
6363

6464
location ~ ^/forecast/([^/]+)/forecasted_speeds_v2\.zip$ {
65-
rewrite ^/forecast/(.*)$ /api/v1/services/navi/proxy/forecast-speeds/$1 break;
66-
{{- include "proxyParams" . }}
65+
rewrite ^/forecast/(.*)$ /api/v1/services/navi/proxy/forecast-speeds/$1 break;
66+
{{- include "proxyParams" . }}
6767
}
6868

6969
{{/*3. Long forecast endpoints*/}}
7070
location = /long-forecast/index.json {
71-
rewrite ^ /api/v1/services/navi/proxy/long-forecast-speeds-index/long_forecast_data/index.json break;
72-
{{- include "proxyParams" . }}
71+
rewrite ^ /api/v1/services/navi/proxy/long-forecast-speeds-index/long_forecast_data/index.json break;
72+
{{- include "proxyParams" . }}
7373
}
7474

7575
location ~ ^/long-forecast/([^/]+)/forecasted_speeds_v2\.zip$ {
76-
rewrite ^/long-forecast/(.*)$ /api/v1/services/navi/proxy/long-forecast-speeds/long_forecast_data/$1 break;
77-
{{- include "proxyParams" . }}
76+
rewrite ^/long-forecast/(.*)$ /api/v1/services/navi/proxy/long-forecast-speeds/long_forecast_data/$1 break;
77+
{{- include "proxyParams" . }}
7878
}
7979

8080
{{/*4. Navi-castle endpoints*/}}
8181
location = /navi-castle/restrictions_index.json.zip {
82-
rewrite ^ /api/v1/services/navi/proxy/restrictions-index/restrictions_index.json.zip break;
83-
{{- include "proxyParams" . }}
82+
rewrite ^ /api/v1/services/navi/proxy/restrictions-index/restrictions_index.json.zip break;
83+
{{- include "proxyParams" . }}
8484
}
8585

8686
location ~ ^/navi-castle/restrictions/([^/]+)/.*-restriction\.json$ {
87-
rewrite ^/navi-castle/restrictions/(.*)$ /api/v1/services/navi/proxy/restrictions/restrictions/$1 break;
88-
{{- include "proxyParams" . }}
87+
rewrite ^/navi-castle/restrictions/(.*)$ /api/v1/services/navi/proxy/restrictions/restrictions/$1 break;
88+
{{- include "proxyParams" . }}
8989
}
9090

9191
{{/*5. navi-castle-cache endpoints*/}}
9292
location = /navi-castle/index.json.zip {
93-
rewrite ^ /api/v1/services/navi/proxy/navi-castle-cache-index/index.json.zip break;
94-
{{- include "proxyParams" . }}
93+
rewrite ^ /api/v1/services/navi/proxy/navi-castle-cache-index/index.json.zip break;
94+
{{- include "proxyParams" . }}
9595
}
9696

9797
location ~ ^/navi-castle/eta_correction/ {
@@ -100,31 +100,31 @@ location ~ ^/navi-castle/eta_correction/ {
100100
}
101101

102102
location ~ ^/navi-castle/smatrix/ {
103-
rewrite ^/navi-castle(/smatrix/.*)$ /api/v1/services/navi/proxy/smatrix$1 break;
104-
{{- include "proxyParams" . }}
103+
rewrite ^/navi-castle(/smatrix/.*)$ /api/v1/services/navi/proxy/smatrix$1 break;
104+
{{- include "proxyParams" . }}
105105
}
106106

107107
location ~ ^/navi-castle/probability_matrix/ {
108-
rewrite ^/navi-castle(/probability_matrix/.*)$ /api/v1/services/navi/proxy/probability-matrix$1 break;
109-
{{- include "proxyParams" . }}
108+
rewrite ^/navi-castle(/probability_matrix/.*)$ /api/v1/services/navi/proxy/probability-matrix$1 break;
109+
{{- include "proxyParams" . }}
110110
}
111111

112112
location ~ ^/navi-castle/turn_penalties/ {
113-
rewrite ^/navi-castle(/turn_penalties/.*)$ /api/v1/services/navi/proxy/turn-penalties$1 break;
114-
{{- include "proxyParams" . }}
113+
rewrite ^/navi-castle(/turn_penalties/.*)$ /api/v1/services/navi/proxy/turn-penalties$1 break;
114+
{{- include "proxyParams" . }}
115115
}
116116

117117
location = /navi-castle/restricted_transport.json.zip {
118-
rewrite ^ /api/v1/services/navi/proxy/restricted-transport-index/restricted_transport.json.zip break;
119-
{{- include "proxyParams" . }}
118+
rewrite ^ /api/v1/services/navi/proxy/restricted-transport-index/restricted_transport.json.zip break;
119+
{{- include "proxyParams" . }}
120120
}
121121

122122
location = /eta/eta-predictions/index.json {
123-
rewrite ^ /api/v1/services/navi/proxy/eta-predictions-index/eta-predictions/index.json break;
124-
{{- include "proxyParams" . }}
123+
rewrite ^ /api/v1/services/navi/proxy/eta-predictions-index/eta-predictions/index.json break;
124+
{{- include "proxyParams" . }}
125125
}
126126
location ~ ^/eta/eta-predictions/eta-predictor-([0-9])\.eta-predictor/([^/]+)/eta_prediction\.zip$ {
127-
rewrite ^/eta/eta-predictions/(.*)$ /api/v1/services/navi/proxy/eta-predictions/eta-predictions/$1 break;
128-
{{- include "proxyParams" . }}
127+
rewrite ^/eta/eta-predictions/(.*)$ /api/v1/services/navi/proxy/eta-predictions/eta-predictions/$1 break;
128+
{{- include "proxyParams" . }}
129129
}
130130
{{- end }}

‎charts/traffic-proxy/templates/configmap.yaml‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -62,35 +62,35 @@ data:
6262
proxy_cache_path /var/cache/nginx/trafficcache keys_zone=trafficcache:{{ .Values.proxy.cache.size }};
6363
{{ end }}
6464
65-
server {
66-
listen {{ .Values.proxy.listen }} default;
67-
server_name _;
68-
69-
location / {
70-
{{- include "proxyParams" . | nindent 8 }}
71-
}
72-
73-
location /health {
74-
default_type text/html;
75-
return 200 "<!DOCTYPE html><h2>OK</h2>\n";
76-
}
77-
78-
{{- if .Values.proxy.locationDG }}
79-
{{- include "locationDG" . | nindent 8 }}
80-
{{- end }}
81-
82-
{{- if .Values.proxy.locations }}
83-
{{- range .Values.proxy.locations }}
84-
location {{ .path }} {
85-
{{- .definition | trim | nindent 10 }}
65+
server {
66+
listen {{ .Values.proxy.listen }} default;
67+
server_name _;
68+
69+
location / {
70+
{{- include "proxyParams" . | nindent 10 }}
71+
}
72+
73+
location /health {
74+
default_type text/html;
75+
return 200 "<!DOCTYPE html><h2>OK</h2>\n";
76+
}
77+
78+
{{- if .Values.proxy.locationDG }}
79+
{{- include "locationDG" . | nindent 12 }}
80+
{{- end }}
81+
82+
{{- if .Values.proxy.locations }}
83+
{{- range .Values.proxy.locations }}
84+
location {{ .path }} {
85+
{{- .definition | trim | nindent 16 }}
86+
}
87+
{{- end }}
88+
{{- end }}
8689
}
87-
{{- end }}
88-
{{- end }}
89-
}
9090
9191
{{- if .Values.proxy.httpServers }}
9292
{{- range .Values.proxy.httpServers }}
93-
{{- . | trim | nindent 6 }}
93+
{{- . | trim | nindent 8 }}
9494
{{- end }}
9595
{{- end }}
9696
}

‎charts/traffic-proxy/values.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -95,14 +95,14 @@ proxy:
9595
# @param proxy.httpServers List of additional server blocks to be included in the NGINX configuration
9696
httpServers: {}
9797
# examplecfg: |
98-
# server {
99-
# listen 0.0.0.0:8080;
100-
101-
# location / {
102-
# default_type text/html;
103-
# return 200 "<!DOCTYPE html><h2>test page</h2>\n";
98+
# server {
99+
# listen 0.0.0.0:8080;
100+
#
101+
# location / {
102+
# default_type text/html;
103+
# return 200 "<!DOCTYPE html><h2>test page</h2>\n";
104+
# }
104105
# }
105-
# }
106106

107107

108108
# @section Deployment settings

0 commit comments

Comments
 (0)