use eck-operator and eck-resource chart

lma/base/resources.yaml

@@ -51,26 +51,21 @@ apiVersion: helm.fluxcd.io/v1
 kind: HelmRelease
 metadata:
   labels:
-    name: elasticsearch-operator
-  name: elasticsearch-operator
+    name: eck-operator
+  name: eck-operator
 spec:
   helmVersion: v3
   chart:
-    repository: https://openinfradev.github.io/hanu-helm-repo
-    name: elasticsearch-operator
-    version: 1.0.3
-  releaseName: elasticsearch-operator
+    repository: https://helm.elastic.co
+    name: eck-operator
+    version: 1.3.1
+  releaseName: eck-operator
   targetNamespace: elastic-system
   values:
-    elasticsearchOperator:
-      enabled: true
-      createNamespace: false
-      createCustomResource: true
-    customResource:
-      elasticsearch:
-        enabled: false
-      kibana:
-        enabled: false
+    installCRDs: true
+    replicaCount: 1
+    config:
+      containerRegistry: docker.elastic.co
   wait: true
 ---
 apiVersion: helm.fluxcd.io/v1
@@ -430,83 +425,81 @@ apiVersion: helm.fluxcd.io/v1
 kind: HelmRelease
 metadata:
   labels:
-    name: elasticsearch-kibana
-  name: elasticsearch-kibana
+    name: eck-resource
+  name: eck-resource
 spec:
   helmVersion: v3
   chart:
     repository: https://openinfradev.github.io/hanu-helm-repo
-    name: elasticsearch-operator
-    version: 1.0.3
-  releaseName: elasticsearch-kibana
+    name: eck-resource
+    version: 1.0.0
+  releaseName: eck-resource
   targetNamespace: lma
   values:
-    elasticsearchOperator:
-      enabled: false
-    customResource:
-      elasticsearch:
-        version: 7.5.1
-        enabled: true 
-        count: 3        # FIXME
-        nodeSets:
-          master:
-            enabled: true
-            nodeSelector: {} # TO_BE_FIXED
-            count: 3
-            javaOpts: TO_BE_FIXED
-            limitCpu: TO_BE_FIXED
-            limitMem: TO_BE_FIXED
-            pvc:
-              storageClassName: TO_BE_FIXED
-              size: TO_BE_FIXED
-          hotdata:
-            enabled: true
-            nodeSelector: {} # TO_BE_FIXED
-            count: 3
-            javaOpts: TO_BE_FIXED
-            limitCpu: TO_BE_FIXED
-            limitMem: TO_BE_FIXED
-            pvc:
-              storageClassName: TO_BE_FIXED
-              size: TO_BE_FIXED
-          warmdata:
-            enabled: false # TO_BE_FIXED
-            nodeSelector: {} # TO_BE_FIXED
-            count: 2
-            javaOpts: TO_BE_FIXED
-            limitCpu: TO_BE_FIXED
-            limitMem: TO_BE_FIXED
-            pvc:
-              storageClassName: TO_BE_FIXED
-              size: TO_BE_FIXED
-          client:
-            enabled: true # TO_BE_FIXED
-            nodeSelector: {} # TO_BE_FIXED
-            count: TO_BE_FIXED
-            javaOpts: TO_BE_FIXED
-            limitCpu: TO_BE_FIXED
-            limitMem: TO_BE_FIXED
-            pvc:
-              storageClassName: TO_BE_FIXED
-              size: 0.5Gi
-      kibana:
-        version: 7.5.1
-        enabled: true
-        http:
-          tls:
-            selfSignedCertificate:
-              disabled: true
-          service:
-            spec:
-              type: NodePort
-              ports:
-              - name: http
-                nodePort: 30001
-                targetPort: 5601
-                port: 5601
-        limitCpu: TO_BE_FIXED
-        limitMem: TO_BE_FIXED
-        nodeSelector: {} # TO_BE_FIXED
+    elasticsearch:
+      version: 7.5.1
+      adminPassword: TO_BE_FIXED
+      enabled: true 
+      count: 3        # FIXME
+      nodeSets:
+        master:
+          enabled: true
+          nodeSelector: {} # TO_BE_FIXED
+          count: 3
+          javaOpts: TO_BE_FIXED
+          limitCpu: TO_BE_FIXED
+          limitMem: TO_BE_FIXED
+          pvc:
+            storageClassName: TO_BE_FIXED
+            size: TO_BE_FIXED
+        hotdata:
+          enabled: true
+          nodeSelector: {} # TO_BE_FIXED
+          count: 3
+          javaOpts: TO_BE_FIXED
+          limitCpu: TO_BE_FIXED
+          limitMem: TO_BE_FIXED
+          pvc:
+            storageClassName: TO_BE_FIXED
+            size: TO_BE_FIXED
+        warmdata:
+          enabled: false # TO_BE_FIXED
+          nodeSelector: {} # TO_BE_FIXED
+          count: 2
+          javaOpts: TO_BE_FIXED
+          limitCpu: TO_BE_FIXED
+          limitMem: TO_BE_FIXED
+          pvc:
+            storageClassName: TO_BE_FIXED
+            size: TO_BE_FIXED
+        client:
+          enabled: true # TO_BE_FIXED
+          nodeSelector: {} # TO_BE_FIXED
+          count: TO_BE_FIXED
+          javaOpts: TO_BE_FIXED
+          limitCpu: TO_BE_FIXED
+          limitMem: TO_BE_FIXED
+          pvc:
+            storageClassName: TO_BE_FIXED
+            size: 0.5Gi
+    kibana:
+      version: 7.5.1
+      enabled: true
+      http:
+        tls:
+          selfSignedCertificate:
+            disabled: true
+        service:
+          spec:
+            type: NodePort
+            ports:
+            - name: http
+              nodePort: 30001
+              targetPort: 5601
+              port: 5601
+      limitCpu: TO_BE_FIXED
+      limitMem: TO_BE_FIXED
+      nodeSelector: {} # TO_BE_FIXED
   wait: true
 ---
 apiVersion: helm.fluxcd.io/v1

lma/base/site-values.yaml

@@ -16,8 +16,6 @@ charts:
   override:
     prometheusOperator.nodeSelector: $(nodeSelector)
 
-- name: elasticsearch-operator
-
 - name: prometheus
   override:
     kubeEtcd.endpoints: [TO_BE_FIXED]
@@ -56,41 +54,42 @@ charts:
 
 - name: prometheus-process-exporter
 
-- name: elasticsearch-kibana
+- name: eck-resource
   override:
-    customResource.kibana.nodeSelector: $(nodeSelector)
-    customResource.kibana.limitCpu: 4
-    customResource.kibana.limitMem: 8Gi
-
-    customResource.elasticsearch.nodeSets.master.nodeSelector: $(nodeSelector)
-    customResource.elasticsearch.nodeSets.master.javaOpts: "-Xms2g -Xmx2g"
-    customResource.elasticsearch.nodeSets.master.limitCpu: 2
-    customResource.elasticsearch.nodeSets.master.limitMem: 4Gi
-    customResource.elasticsearch.nodeSets.master.pvc.storageClassName: $(storageClassName)
-    customResource.elasticsearch.nodeSets.master.pvc.size: 2Gi
-
-    customResource.elasticsearch.nodeSets.hotdata.nodeSelector: $(nodeSelector)
-    customResource.elasticsearch.nodeSets.hotdata.javaOpts: "-Xms2g -Xmx2g"
-    customResource.elasticsearch.nodeSets.hotdata.limitCpu: 2
-    customResource.elasticsearch.nodeSets.hotdata.limitMem: 4Gi
-    customResource.elasticsearch.nodeSets.hotdata.pvc.storageClassName: $(storageClassName)
-    customResource.elasticsearch.nodeSets.hotdata.pvc.size: 100Gi
-
-    customResource.elasticsearch.nodeSets.warmdata.enabled: false
-    customResource.elasticsearch.nodeSets.warmdata.nodeSelector: $(nodeSelector)
-    customResource.elasticsearch.nodeSets.warmdata.javaOpts: "-Xms2g -Xmx2g"
-    customResource.elasticsearch.nodeSets.warmdata.limitCpu: 1
-    customResource.elasticsearch.nodeSets.warmdata.limitMem: 2Gi
-    customResource.elasticsearch.nodeSets.warmdata.pvc.storageClassName: $(storageClassName)
-    customResource.elasticsearch.nodeSets.warmdata.pvc.size: 200Gi
-
-    customResource.elasticsearch.nodeSets.client.enabled: true
-    customResource.elasticsearch.nodeSets.client.count: 1
-    customResource.elasticsearch.nodeSets.client.nodeSelector: $(nodeSelector)
-    customResource.elasticsearch.nodeSets.client.javaOpts: "-Xms2g -Xmx2g"
-    customResource.elasticsearch.nodeSets.client.limitCpu: 2
-    customResource.elasticsearch.nodeSets.client.limitMem: 4Gi
-    customResource.elasticsearch.nodeSets.client.pvc.storageClassName: $(storageClassName)
+    kibana.nodeSelector: $(nodeSelector)
+    kibana.limitCpu: 4
+    kibana.limitMem: 8Gi
+
+    elasticsearch.adminPassword: tacoword
+    elasticsearch.nodeSets.master.nodeSelector: $(nodeSelector)
+    elasticsearch.nodeSets.master.javaOpts: "-Xms2g -Xmx2g"
+    elasticsearch.nodeSets.master.limitCpu: 2
+    elasticsearch.nodeSets.master.limitMem: 4Gi
+    elasticsearch.nodeSets.master.pvc.storageClassName: $(storageClassName)
+    elasticsearch.nodeSets.master.pvc.size: 2Gi
+
+    elasticsearch.nodeSets.hotdata.nodeSelector: $(nodeSelector)
+    elasticsearch.nodeSets.hotdata.javaOpts: "-Xms2g -Xmx2g"
+    elasticsearch.nodeSets.hotdata.limitCpu: 2
+    elasticsearch.nodeSets.hotdata.limitMem: 4Gi
+    elasticsearch.nodeSets.hotdata.pvc.storageClassName: $(storageClassName)
+    elasticsearch.nodeSets.hotdata.pvc.size: 100Gi
+
+    elasticsearch.nodeSets.warmdata.enabled: false
+    elasticsearch.nodeSets.warmdata.nodeSelector: $(nodeSelector)
+    elasticsearch.nodeSets.warmdata.javaOpts: "-Xms2g -Xmx2g"
+    elasticsearch.nodeSets.warmdata.limitCpu: 1
+    elasticsearch.nodeSets.warmdata.limitMem: 2Gi
+    elasticsearch.nodeSets.warmdata.pvc.storageClassName: $(storageClassName)
+    elasticsearch.nodeSets.warmdata.pvc.size: 200Gi
+
+    elasticsearch.nodeSets.client.enabled: true
+    elasticsearch.nodeSets.client.count: 1
+    elasticsearch.nodeSets.client.nodeSelector: $(nodeSelector)
+    elasticsearch.nodeSets.client.javaOpts: "-Xms2g -Xmx2g"
+    elasticsearch.nodeSets.client.limitCpu: 2
+    elasticsearch.nodeSets.client.limitMem: 4Gi
+    elasticsearch.nodeSets.client.pvc.storageClassName: $(storageClassName)
 
 - name: grafana
   override:
@@ -108,12 +107,12 @@ charts:
     global.base_cluster_url: $(clusterName)
     global.nodeSelector: $(nodeSelector)
     fluentbit.clusterName: $(clusterName)
-    fluentbit.outputs.es.host: taco-elasticsearch-es-http.lma.svc.$(clusterName)
+    fluentbit.outputs.es.host: eck-elasticsearch-es-http.lma.svc.$(clusterName)
     fluentbit.outputs.kafka:
       enabled: false
       broker: "YOUR_BORKER_INFO"
       topic: "YOUR_TACO_LOG_INFO"
-    fluentbit.esTemplate.url: https://taco-elasticsearch-es-http.lma.svc.$(clusterName):9200
+    fluentbit.esTemplate.url: https://eck-elasticsearch-es-http.lma.svc.$(clusterName):9200
     fluentbit.nodeSelector: $(nodeSelector)
 
 - name: addons
@@ -127,15 +126,15 @@ charts:
 
 - name: fed-addons
   override:
-    metricbeat.elasticsearch.host: https://taco-elasticsearch-es-http.lma.svc.$(clusterName):9200
-    metricbeat.kibana.host: taco-kibana-dashboard-kb-http.lma.svc.$(clusterName):5601
+    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:
     - fed-master-prometheus.fed.svc.$(clusterName):9090
     tacoWatcher.host: taco-watcher.fed.svc.$(clusterName)
-    tacoWatcher.joinCluster.body.kibanaUrl: http://taco-kibana-dashboard-kb-http.lma.svc.$(clusterName):5601
+    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.k8sUrl: https://kubernetes.default.svc.$(clusterName)
-    kibanaInit.url: http://taco-kibana-dashboard-kb-http.lma.svc.$(clusterName):5601
+    kibanaInit.url: http://eck-kibana-dashboard-kb-http.lma.svc.$(clusterName):5601
     serviceMonitor.grafana.interval: $(serviceScrapeInterval)
     serviceMonitor.federations: 
     - name: dev-federate

lma/image/image-values.yaml

@@ -6,19 +6,17 @@ global:
   registry: private-registry:5000
 
 charts:
-- name: elasticsearch-kibana
+- name: eck-resource
   override:
-    customResource.elasticsearch.image.repository: $(registry)/elasticsearch/elasticsearch
-    customResource.elasticsearch.image.tag: 7.5.1
-    customResource.kibana.image.repository: $(registry)/kibana/kibana
-    customResource.kibana.image.tag: 7.5.1
+    elasticsearch.image.repository: $(registry)/elasticsearch/elasticsearch
+    elasticsearch.image.tag: 7.5.1
+    kibana.image.repository: $(registry)/kibana/kibana
+    kibana.image.tag: 7.5.1
 
-- name: elasticsearch-operator
+- name: eck-operator
   override:
-    elasticsearchOperator.hyperkubeImage.repository: $(registry)/hyperkube
-    elasticsearchOperator.hyperkubeImage.tag: v1.17.6
-    elasticsearchOperator.image.repository: $(registry)/eck/eck-operator
-    elasticsearchOperator.image.tag: 1.1.1
+    image.repository: docker.elastic.co/eck/eck-operator
+    image.tag: null
 
 - name: fed-addons
   override: