From ab08e9c91658124e0e41e370ea6780bf3db004af Mon Sep 17 00:00:00 2001
From: sungil <si.im@sk.com>
Date: Mon, 31 May 2021 07:57:01 +0000
Subject: [PATCH 1/2] TACODEV-797: merge two namespaces for lma TACO-APP-GROUP
 to one - lma

---
 lma/base/resources.yaml   | 21 +++++++++++++--------
 lma/base/site-values.yaml | 17 +++++------------
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/lma/base/resources.yaml b/lma/base/resources.yaml
index 10e5c4a..70afccd 100755
--- a/lma/base/resources.yaml
+++ b/lma/base/resources.yaml
@@ -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
@@ -556,7 +556,7 @@ spec:
     name: grafana
     version: 5.5.7
   releaseName: grafana
-  targetNamespace: fed
+  targetNamespace: lma
   values:
     adminPassword: password
     sidecar:
@@ -912,6 +912,8 @@ spec:
       jaeger:
         enabled: true
         interval: TO_BE_FIXED
+      pushgateway:
+        enabled: true
     tacoWatcher:
       rbac:
         create: false
@@ -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:
@@ -946,6 +948,7 @@ spec:
       addtionalModules: []
     grafanaDashboard:
       enabled: true
+      namespace: lma
       sidecar:
         datasources:
           prometheusAddress: "fed-master-prometheus:9090"
@@ -971,6 +974,8 @@ spec:
         enabled: false
       nodeExporter:
         enabled: false
+      pushgateway:
+        enabled: false
       federations: [] # TO_BE_FIXED
     tacoWatcher:
       host: TO_BE_FIXED
@@ -1059,7 +1064,7 @@ spec:
     name: taco-watcher
     version: 0.1.0
   releaseName: taco-watcher
-  targetNamespace: fed
+  targetNamespace: lma
   values:
     config:
       grafana:
@@ -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:
@@ -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:
diff --git a/lma/base/site-values.yaml b/lma/base/site-values.yaml
index 447c79c..1c58dff 100755
--- a/lma/base/site-values.yaml
+++ b/lma/base/site-values.yaml
@@ -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)
@@ -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
@@ -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)

From bc06fd3731358be3ebf03bb4065d90688aeff6d4 Mon Sep 17 00:00:00 2001
From: sungil <si.im@sk.com>
Date: Thu, 3 Jun 2021 05:25:41 +0000
Subject: [PATCH 2/2] Bug fix, during making namespaces

---
 lma/base/resources.yaml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lma/base/resources.yaml b/lma/base/resources.yaml
index 70afccd..5104578 100755
--- a/lma/base/resources.yaml
+++ b/lma/base/resources.yaml
@@ -331,7 +331,7 @@ spec:
   chart:
     repository: https://helm.elastic.co
     name: eck-operator
-    version: 1.3.1
+    version: 1.6.0
   releaseName: eck-operator
   targetNamespace: elastic-system
   values:
@@ -342,6 +342,9 @@ spec:
     internal:
       manifestGen: true
       kubeVersion: 1.18.8
+      createOperatorNamespace: false
+    softMultiTenancy:
+      enabled: false
   wait: true
 ---
 apiVersion: helm.fluxcd.io/v1