Merge remote-tracking branch 'origin/dev' into api-v1.5.4

api/chalicelib/core/funnels.py

@@ -108,6 +108,7 @@ def update(funnel_id, user_id, project_id, name=None, filter=None, is_public=Non
         r["created_at"] = TimeUTC.datetime_to_timestamp(r["created_at"])
         r = helper.dict_to_camel_case(r)
         r["filter"]["startDate"], r["filter"]["endDate"] = TimeUTC.get_start_end_from_range(r["filter"]["rangeValue"])
+        r["filter"] = helper.old_search_payload_to_flat(r["filter"])
         return {"data": r}
 
 

scripts/helmcharts/openreplay/charts/nginx-ingress/templates/service.yaml

@@ -19,7 +19,7 @@ spec:
     - port: {{ .port }}
       targetPort: {{ .targetPort }}
       protocol: TCP
-      name: {{ .targetPort }}
+      name: {{ .name }}
     {{- end }}
   selector:
     {{- include "nginx-ingress.selectorLabels" . | nindent 4 }}

scripts/helmcharts/openreplay/charts/nginx-ingress/values.yaml

@@ -42,8 +42,10 @@ service:
   ports:
     - port: 80
       targetPort: http
+      name: http
     - port: 443
       targetPort: https
+      name: https
 
 ingress:
   enabled: false