Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge two namespaces for lma TACO-APP-GROUP to one - lma #74

Merged
merged 1 commit into from
Jun 3, 2021
Merged

merge two namespaces for lma TACO-APP-GROUP to one - lma #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions lma/base/resources.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ spec:
name: kube-prometheus-stack
version: 14.5.0
releaseName: prometheus-fed-master
targetNamespace: fed
targetNamespace: lma
values:
defaultRules:
create: false
Expand Down Expand Up @@ -556,7 +556,7 @@ spec:
name: grafana
version: 5.5.7
releaseName: grafana
targetNamespace: fed
targetNamespace: lma
values:
adminPassword: password
sidecar:
Expand Down Expand Up @@ -912,6 +912,8 @@ spec:
jaeger:
enabled: true
interval: TO_BE_FIXED
pushgateway:
enabled: true
tacoWatcher:
rbac:
create: false
Expand All @@ -930,9 +932,9 @@ spec:
name: lma-addons
version: 1.5.0
releaseName: fed-addons
targetNamespace: fed
targetNamespace: lma
values:
createNamespace: true
createNamespace: false
metricbeat:
enabled: true
elasticsearch:
Expand All @@ -946,6 +948,7 @@ spec:
addtionalModules: []
grafanaDashboard:
enabled: true
namespace: lma
sidecar:
datasources:
prometheusAddress: "fed-master-prometheus:9090"
Expand All @@ -971,6 +974,8 @@ spec:
enabled: false
nodeExporter:
enabled: false
pushgateway:
enabled: false
federations: [] # TO_BE_FIXED
tacoWatcher:
host: TO_BE_FIXED
Expand Down Expand Up @@ -1059,7 +1064,7 @@ spec:
name: taco-watcher
version: 0.1.0
releaseName: taco-watcher
targetNamespace: fed
targetNamespace: lma
values:
config:
grafana:
Expand Down Expand Up @@ -1094,12 +1099,12 @@ spec:
name: thanos
version: 3.4.0
releaseName: thanos
targetNamespace: fed
targetNamespace: lma
values:
global:
storageClass: local-path
clusterDomain: TO_BE_FIXED
objstoreConfig: TO_BE_FIXED
existingObjstoreSecret: TO_BE_FIXED
query:
nodeSelector: {}
dnsDiscovery:
Expand Down Expand Up @@ -1255,7 +1260,7 @@ spec:
enabled: true
secretName: TO_BE_FIXED
bucketName: TO_BE_FIXED
endpoint: thanos-minio.fed.svc.cluster.local:9000
endpoint: thanos-minio:9000
access_key: TO_BE_FIXED
secret_key: TO_BE_FIXED
sidecarsService:
Expand Down
17 changes: 5 additions & 12 deletions lma/base/site-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,10 +139,10 @@ charts:
metricbeat.elasticsearch.host: https://eck-elasticsearch-es-http.lma.svc.$(clusterName):9200
metricbeat.kibana.host: eck-kibana-dashboard-kb-http.lma.svc.$(clusterName):5601
metricbeat.prometheus.hosts:
- thanos-query-frontend.fed.svc.$(clusterName):9090
tacoWatcher.host: taco-watcher.fed.svc.$(clusterName)
- thanos-query-frontend.lma.svc.$(clusterName):9090
tacoWatcher.host: taco-watcher.lma.svc.$(clusterName)
tacoWatcher.joinCluster.body.kibanaUrl: http://eck-kibana-dashboard-kb-http.lma.svc.$(clusterName):5601
tacoWatcher.joinCluster.body.grafanaUrl: http://grafana.fed.svc.$(clusterName)
tacoWatcher.joinCluster.body.grafanaUrl: http://grafana.lma.svc.$(clusterName)
tacoWatcher.joinCluster.body.k8sUrl: https://kubernetes.default.svc.$(clusterName)
kibanaInit.url: http://eck-kibana-dashboard-kb-http.lma.svc.$(clusterName):5601
serviceMonitor.grafana.interval: $(serviceScrapeInterval)
Expand All @@ -168,14 +168,7 @@ charts:
override:
global.storageClass: $(storageClassName)
clusterDomain: $(clusterName)
objstoreConfig: |-
type: s3
config:
bucket: thanos
endpoint: {{ include "thanos.minio.fullname" . }}.fed.svc.$(clusterName):9000
access_key: $(defaultUser)
secret_key: $(defaultPassword)
insecure: true
existingObjstoreSecret: $(thanosObjstoreSecret)
query.nodeSelector: $(nodeSelector)
queryFrontend.nodeSelector: $(nodeSelector)
queryFrontend.service.type: NodePort
Expand Down Expand Up @@ -235,7 +228,7 @@ charts:
override:
objectStorage:
bucketName: thanos
endpoint: thanos-minio.fed.svc.cluster.local:9000
endpoint: thanos-minio.lma.svc.$(clusterName):9000
access_key: $(defaultUser)
secret_key: $(defaultPassword)
secretName: $(thanosObjstoreSecret)
Expand Down