Merge pull request #256 from openinfradev/render_lma

servicemesh: flexible namespace for LMA
openinfradev · Nov 18, 2024 · e4dd570 · e4dd570
2 parents 8cd3981 + 76f1c86
commit e4dd570
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 10 deletions.
diff --git a/aws-msa-reference/lma/site-values.yaml b/aws-msa-reference/lma/site-values.yaml
@@ -200,7 +200,6 @@ charts:
     prometheusRules.istio.aggregation.enabled: false
     prometheusRules.istio.optimization.enabled: false
     grafanaDatasource.prometheus.url: $(grafanaDatasourceMetric)
-    # grafanaDatasource.prometheus.url: "thanos-query.lma:9090"
     grafanaDatasource.loki.url: $(lokiHost):$(lokiPort)
 
 - name: prometheus-adapter

diff --git a/aws-msa-reference/service-mesh/site-values.yaml b/aws-msa-reference/service-mesh/site-values.yaml
@@ -18,6 +18,7 @@ global:
   keycloakIssuerUri: https://keycloak.com/auth/realms/oraganization
   keycloakClientPrefix: client-prefix
   gatekeeperSecret: gatekeeper-secret
+  lmaNameSpace: taco-system
 
 charts:
 - name: cert-manager
@@ -252,14 +253,14 @@ charts:
     auth.openid.disable_rbac: true
     externalServices.istio.configMapName: istio
     externalServices.istio.istioIdentityDomain: svc.$(clusterName)
-    externalServices.prometheus.url: http://lma-prometheus.lma.svc:9090
+    externalServices.prometheus.url: http://lma-prometheus.$(lmaNameSpace).svc:9090
     externalServices.tracing.inClusterUrl: http://jaeger-operator-jaeger-query.tks-msa:16686
     externalServices.tracing.url: https://jaeger-v2.taco-cat.xyz
     externalServices.tracing.useGrpc: false
     externalServices.grafana.auth.type: basic
     externalServices.grafana.auth.username: admin
     externalServices.grafana.auth.password: password
-    externalServices.grafana.inClusterUrl: http://grafana.lma.svc:80
+    externalServices.grafana.inClusterUrl: http://grafana.$(lmaNameSpace).svc:80
     externalServices.grafana.url: https://grafana-v2.taco-cat.xyz
     server.webRoot: /
 

diff --git a/aws-reference/lma/site-values.yaml b/aws-reference/lma/site-values.yaml
@@ -200,7 +200,6 @@ charts:
     prometheusRules.istio.aggregation.enabled: false
     prometheusRules.istio.optimization.enabled: false
     grafanaDatasource.prometheus.url: $(grafanaDatasourceMetric)
-    # grafanaDatasource.prometheus.url: "thanos-query.lma:9090"
     grafanaDatasource.loki.url: $(lokiHost):$(lokiPort)
 
 - name: prometheus-adapter

diff --git a/byoh-reference/lma/site-values.yaml b/byoh-reference/lma/site-values.yaml
@@ -203,7 +203,6 @@ charts:
     prometheusRules.istio.aggregation.enabled: false
     prometheusRules.istio.optimization.enabled: false
     grafanaDatasource.prometheus.url: $(grafanaDatasourceMetric)
-    # grafanaDatasource.prometheus.url: "thanos-query.lma:9090"
     grafanaDatasource.loki.url: $(lokiHost):$(lokiPort)
 
 - name: prometheus-adapter

diff --git a/byoh-reference/service-mesh/site-values.yaml b/byoh-reference/service-mesh/site-values.yaml
@@ -18,6 +18,7 @@ global:
   keycloakIssuerUri: https://keycloak.com/auth/realms/oraganization
   keycloakClientPrefix: client-prefix
   gatekeeperSecret: gatekeeper-secret
+  lmaNameSpace: taco-system
 
 charts:
 - name: cert-manager
@@ -269,14 +270,14 @@ charts:
     auth.openid.disable_rbac: true
     externalServices.istio.configMapName: istio
     externalServices.istio.istioIdentityDomain: svc.$(clusterName)
-    externalServices.prometheus.url: http://lma-prometheus.lma.svc:9090
+    externalServices.prometheus.url: http://lma-prometheus.$(lmaNameSpace).svc:9090
     externalServices.tracing.inClusterUrl: http://jaeger-operator-jaeger-query.tks-msa:16686
     externalServices.tracing.url: https://jaeger-v2.taco-cat.xyz
     externalServices.tracing.useGrpc: false
     externalServices.grafana.auth.type: basic
     externalServices.grafana.auth.username: admin
     externalServices.grafana.auth.password: password
-    externalServices.grafana.inClusterUrl: http://grafana.lma.svc:80
+    externalServices.grafana.inClusterUrl: http://grafana.$(lmaNameSpace).svc:80
     externalServices.grafana.url: https://grafana-v2.taco-cat.xyz
     server.webRoot: /
 

diff --git a/eks-msa-reference/service-mesh/site-values.yaml b/eks-msa-reference/service-mesh/site-values.yaml
@@ -18,6 +18,7 @@ global:
   keycloakIssuerUri: https://keycloak.com/auth/realms/oraganization
   keycloakClientPrefix: client-prefix
   gatekeeperSecret: gatekeeper-secret
+  lmaNameSpace: taco-system
 
 charts:
 - name: cert-manager
@@ -252,14 +253,14 @@ charts:
     auth.openid.disable_rbac: true
     externalServices.istio.configMapName: istio
     externalServices.istio.istioIdentityDomain: svc.$(clusterName)
-    externalServices.prometheus.url: http://lma-prometheus.lma.svc:9090
+    externalServices.prometheus.url: http://lma-prometheus.$(lmaNameSpace).svc:9090
     externalServices.tracing.inClusterUrl: http://jaeger-operator-jaeger-query.tks-msa:16686
     externalServices.tracing.url: https://jaeger-v2.taco-cat.xyz
     externalServices.tracing.useGrpc: false
     externalServices.grafana.auth.type: basic
     externalServices.grafana.auth.username: admin
     externalServices.grafana.auth.password: password
-    externalServices.grafana.inClusterUrl: http://grafana.lma.svc:80
+    externalServices.grafana.inClusterUrl: http://grafana.$(lmaNameSpace).svc:80
     externalServices.grafana.url: https://grafana-v2.taco-cat.xyz
     server.webRoot: /
 

diff --git a/eks-reference/lma/site-values.yaml b/eks-reference/lma/site-values.yaml
@@ -201,7 +201,6 @@ charts:
     prometheusRules.istio.aggregation.enabled: false
     prometheusRules.istio.optimization.enabled: false
     grafanaDatasource.prometheus.url: $(grafanaDatasourceMetric)
-    # grafanaDatasource.prometheus.url: "thanos-query.lma:9090"
     grafanaDatasource.loki.url: $(lokiHost):$(lokiPort)
 
 - name: prometheus-adapter