move grafana to the top of hosts

Author: 7va

helm/templates/grafana/deployment.yaml

@@ -40,7 +40,7 @@ spec:
                   key: POSTGRES_PASSWORD
             # For testing in Mariner
             - name: GF_SERVER_ROOT_URL
-              value: "https://opensampl-test.ornl.gov/grafana/"
+              value: "https://opensampl-test.ornl.gov/grafana"
             - name: GF_SERVER_SERVE_FROM_SUB_PATH
               value: "true"
           readinessProbe:

helm/values-mariner.yaml

@@ -56,15 +56,15 @@ ingress:
   hosts:
     - host: opensampl-test.ornl.gov  
       paths:
-       - path: /api
-         pathType: prefix
-         service: backend
-       - path: /docs
-         pathType: Prefix
-         service: backend
-       - path: /grafana(/|$)(.*)
-         pathType: Prefix
-         service: grafana
+      - path: /grafana
+        pathType: Prefix
+        service: grafana
+      - path: /api
+        pathType: prefix
+        service: backend
+      - path: /docs
+        pathType: Prefix
+        service: backend
   tls:
     - secretName: opensampl-tls
       hosts: