Fixed /users and /password endpoint mappings (#7)

* Fixed /users and /password endpoint mappings * Use smtp fromAddress for both MF_EMAIL_FROM_ADDRESS and MF_EMAIL_FROM_NAME
orb-community · Dec 7, 2021 · 73749ae · 73749ae
1 parent c363141
commit 73749ae
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/charts/orb/Chart.yaml b/charts/orb/Chart.yaml
@@ -10,7 +10,7 @@ name: orb
 description: Orb Observability Platform
 icon: https://avatars1.githubusercontent.com/u/13207490
 type: application
-version: 1.0.8
+version: 1.0.9
 appVersion: "0.9.0"
 home: https://getorb.io
 sources:

diff --git a/charts/orb/templates/ingress.yaml b/charts/orb/templates/ingress.yaml
@@ -45,14 +45,14 @@ spec:
     - host: "{{ .Values.ingress.hostname }}"
       http:
         paths:
-          - path: /api/v1/(users)
+          - path: /api/v1/(users/?.*)
             pathType: Prefix
             backend:
               service:
                 name: {{ .Release.Name }}-users
                 port:
                   number: {{ .Values.users.httpPort }}
-          - path: /api/v1/(password)
+          - path: /api/v1/(password/?.*)
             pathType: Prefix
             backend:
               service:

diff --git a/charts/orb/templates/users-deployment.yaml b/charts/orb/templates/users-deployment.yaml
@@ -78,7 +78,7 @@ spec:
             - name: MF_EMAIL_FROM_ADDRESS
               value: {{ required "A valid .Values.smtp.fromAddress is required!" .Values.smtp.fromAddress | quote }}
             - name: MF_EMAIL_FROM_NAME
-              value: {{ .Values.smtp.fromName | quote }}
+              value:                 {{ required "A valid .Values.smtp.fromAddress is required!" .Values.smtp.fromAddress | quote }}
             - name: MF_EMAIL_TEMPLATE
               value: "/email.tmpl"
             {{- end }}

diff --git a/charts/orb/values.yaml b/charts/orb/values.yaml
@@ -19,10 +19,9 @@ defaults:
   natsPort: 4222
   jaegerPort: 6831
 
-orb:
-  smtp:
-    port: 25
-    fromName: Orb
+smtp:
+  port: 25
+  fromName: Orb
 
 ingress:
   issuer: "letsencrypt-prod"