From 930a72667023cb1b060d7c4f07887a168367e9ac Mon Sep 17 00:00:00 2001
From: Zexi Li <zexi.li@qq.com>
Date: Tue, 1 Sep 2020 15:27:56 +0800
Subject: [PATCH] climc: k8s cluster grafana componet support subpath

---
 pkg/mcclient/options/k8s/cluster.go | 30 +++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/pkg/mcclient/options/k8s/cluster.go b/pkg/mcclient/options/k8s/cluster.go
index d693e5bc27..d9db496e69 100644
--- a/pkg/mcclient/options/k8s/cluster.go
+++ b/pkg/mcclient/options/k8s/cluster.go
@@ -292,10 +292,18 @@ type ClusterComponentMonitorStorage struct {
 	ClassName string `help:"Storage class name" json:"storageClassName"`
 }
 
+type ClusterComponentMonitorGrafanaTlsOpt struct {
+	CertificateFile string `help:"TLS certificate file" json:"-"`
+	KeyFile         string `help:"TLS key file" json:"-"`
+}
+
 type ClusterComponentMonitorGrafana struct {
-	AdminUser     string                         `help:"Grafana admin user" default:"admin" json:"adminUser"`
-	AdminPassword string                         `help:"Grafana admin user password" json:"adminPassword"`
-	Storage       ClusterComponentMonitorStorage `help:"Storage setting"`
+	AdminUser     string                               `help:"Grafana admin user" default:"admin" json:"adminUser"`
+	AdminPassword string                               `help:"Grafana admin user password" json:"adminPassword"`
+	Storage       ClusterComponentMonitorStorage       `help:"Storage setting"`
+	PublicAddress string                               `help:"Grafana expose public IP address or domain hostname" json:"publicAddress"`
+	Host          string                               `help:"Grafana ingress host domain name" json:"host"`
+	Tls           ClusterComponentMonitorGrafanaTlsOpt `help:"TLS setting"`
 }
 
 type ClusterComponentMonitorLoki struct {
@@ -321,10 +329,24 @@ type ClusterEnableComponentMonitorOpt struct {
 	ClusterComponentMonitorSetting
 }
 
-func (o ClusterEnableComponentMonitorOpt) Params() (*jsonutils.JSONDict, error) {
+func (o ClusterEnableComponentMonitorOpt) Params() (jsonutils.JSONObject, error) {
 	params := o.ClusterComponentOptions.Params("monitor")
 	setting := jsonutils.Marshal(o.ClusterComponentMonitorSetting)
 	params.Add(setting, "monitor")
+	certFile := o.Grafana.Tls.CertificateFile
+	keyFile := o.Grafana.Tls.KeyFile
+	if certFile != "" {
+		cert, err := ioutil.ReadFile(certFile)
+		if err != nil {
+			return nil, errors.Wrap(err, "read grafana tls certFile")
+		}
+		key, err := ioutil.ReadFile(keyFile)
+		if err != nil {
+			return nil, errors.Wrap(err, "read grafana tls keyFile")
+		}
+		params.Add(jsonutils.NewString(string(cert)), "monitor", "grafana", "tlsKeyPair", "certificate")
+		params.Add(jsonutils.NewString(string(key)), "monitor", "grafana", "tlsKeyPair", "key")
+	}
 	return params, nil
 }