From 4fb40fc7de14992efb1a1e84450cf6fb94841608 Mon Sep 17 00:00:00 2001
From: JacksChoco <ljs8860@toss.im>
Date: Sat, 8 Aug 2020 19:21:44 +0900
Subject: [PATCH] helm collector value setup && chart dependencies about

---
 .../helm/pinpoint/charts/hbase/values.yaml    |  0
 .../templates/deployments.yaml                | 20 +++++++++++++------
 .../charts/pinpoint-collector/values.yaml     |  8 ++++++--
 .../helm/pinpoint/requirements.yaml           |  5 +++++
 install/kubernetes/helm/pinpoint/values.yaml  | 11 ++++++++++
 5 files changed, 36 insertions(+), 8 deletions(-)
 delete mode 100644 install/kubernetes/helm/pinpoint/charts/hbase/values.yaml
 create mode 100644 install/kubernetes/helm/pinpoint/requirements.yaml

diff --git a/install/kubernetes/helm/pinpoint/charts/hbase/values.yaml b/install/kubernetes/helm/pinpoint/charts/hbase/values.yaml
deleted file mode 100644
index e69de29..0000000
diff --git a/install/kubernetes/helm/pinpoint/charts/pinpoint-collector/templates/deployments.yaml b/install/kubernetes/helm/pinpoint/charts/pinpoint-collector/templates/deployments.yaml
index 10c7aec..93b221d 100644
--- a/install/kubernetes/helm/pinpoint/charts/pinpoint-collector/templates/deployments.yaml
+++ b/install/kubernetes/helm/pinpoint/charts/pinpoint-collector/templates/deployments.yaml
@@ -43,19 +43,27 @@ spec:
           - name: CLUSTER_ENABLE
             value: "{{ .Values.cluster.enable }}"
           - name: CLUSTER_ZOOKEEPER_ADDRESS
-            value: "{{ .Values.cluster.zookeeperAddress }}"
+{{- if .Values.externalZookeeperAddress }}
+            value: "{{ .Values.externalZookeeperAddress }}"
+{{- else }}
+            value: "{{ .Release.Name }}-zookeeper"
+{{- end }}
           - name: HBASE_HOST
-            value: "{{ .Values.hbase.host }}"
+{{- if .Values.externalHbaseAddress }}
+            value: "{{ .Values.externalHbaseAddress }}"
+{{- else }}
+            value: "{{ .Release.Name }}-hbase-master"
+{{- end }}
           - name: HBASE_PORT
-            value: "{{ .Values.hbase.host }}"
-          - name: SPRING_PROFILES
-            value: "{{ .Values.profiles }}"
+            value: "{{ .Values.hbase.port }}"
           - name: FLINK_CLUSTER_ENABLE
             value: "{{ .Values.flink.enable }}"
+          - name: SPRING_PROFILES
+            value: "{{ .Values.profiles }}"
           - name: FLINK_CLUSTER_ZOOKEEPER_ADDRESS
             value: "{{ .Values.flink.zookeeperAddress }}"
           - name: JAVA_OPTS
-            value: -Dspring.profiles.active=${SPRING_PROFILES}
+            value: "-Dspring.profiles.active={{ .Values.profiles }}"
           - name: DEBUG_LEVEL
             value: "{{ .Values.debugLevel }}"
           ports:
diff --git a/install/kubernetes/helm/pinpoint/charts/pinpoint-collector/values.yaml b/install/kubernetes/helm/pinpoint/charts/pinpoint-collector/values.yaml
index 4e214cf..8b0269f 100644
--- a/install/kubernetes/helm/pinpoint/charts/pinpoint-collector/values.yaml
+++ b/install/kubernetes/helm/pinpoint/charts/pinpoint-collector/values.yaml
@@ -7,12 +7,16 @@ rollingMaxUnavailable: 1
 tolerations: []
 resources: {}
 image: pinpointdocker/pinpoint-collector:2.0.4
+profiles: release
+
+externalZookeeperAddress:
+externalHbaseAddress:
 
 cluster:
   enable: true
-
+  
 hbase:
-  host: "localhost:1234"
+  port: "2181"
 
 flink:
   enable: false
\ No newline at end of file
diff --git a/install/kubernetes/helm/pinpoint/requirements.yaml b/install/kubernetes/helm/pinpoint/requirements.yaml
new file mode 100644
index 0000000..17970f2
--- /dev/null
+++ b/install/kubernetes/helm/pinpoint/requirements.yaml
@@ -0,0 +1,5 @@
+dependencies:
+- name: hbase
+  version: 0.1.3
+  repository: https://gradiant.github.io/charts
+  condition: hbase.enabled
\ No newline at end of file
diff --git a/install/kubernetes/helm/pinpoint/values.yaml b/install/kubernetes/helm/pinpoint/values.yaml
index 55bc16d..a186ca4 100644
--- a/install/kubernetes/helm/pinpoint/values.yaml
+++ b/install/kubernetes/helm/pinpoint/values.yaml
@@ -3,5 +3,16 @@
 # Declare variables to be passed into your templates.
 pinpoint-collector:
   replicaCount: 1
+
+###################################
+# Zookeeper - External Zookeeper
+###################################
+  externalZookeeperAddress: 
+
+###################################
+# Hbase - External Hbase
+###################################
+  externalHbaseAddress:
+
 hbase:
   enabled: false
\ No newline at end of file