add cluster name env in dashboard

Author: davidqhr

api/go.mod

@@ -11,6 +11,7 @@ require (
 	github.com/gorilla/websocket v1.4.2
 	github.com/joho/godotenv v1.3.0
 	github.com/kalmhq/kalm/controller v0.0.0-20200722131031-2336d7eaf4c9
+	github.com/kalmhq/kalm/operator v0.0.0-20210302081042-e6a4c5b51613 // indirect
 	github.com/labstack/echo/v4 v4.1.17
 	github.com/labstack/gommon v0.3.0
 	github.com/mattn/go-sqlite3 v2.0.3+incompatible

api/go.sum

@@ -511,6 +511,9 @@ github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
+github.com/kalmhq/kalm v0.2.0 h1:hoNGJr+Af3hvtYUmNvZnfoRvccsQ+Siog4kF2IFK2wo=
+github.com/kalmhq/kalm/operator v0.0.0-20210302081042-e6a4c5b51613 h1:H299jV80FUAKNTQ+2yuFP1A5wZv2zLNsNqn8pS+Z3+A=
+github.com/kalmhq/kalm/operator v0.0.0-20210302081042-e6a4c5b51613/go.mod h1:8f1Ile/g18s0oHaa12t/eHbyOtzocmu9bz0kcICEjXk=
 github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4=
 github.com/karrick/godirwalk v1.10.3/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA=
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
@@ -693,6 +696,7 @@ github.com/prometheus/procfs v0.0.11/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4
 github.com/prometheus/procfs v0.1.3 h1:F0+tqvhOksq22sc6iCHF5WGlWjdwj92p0udFh1VFBS8=
 github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
 github.com/prometheus/prom2json v1.1.0/go.mod h1:v7OY1795b9fEUZgq4UU2+15YjRv0LfpxKejIQCy3L7o=
+github.com/prometheus/prometheus v1.8.2/go.mod h1:oAIUtOny2rjMX0OWN5vPR5/q/twIROJvdqnQKDdil/s=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
 github.com/quasilyte/go-consistent v0.0.0-20190521200055-c6f3937de18c/go.mod h1:5STLWrekHfjyYwxBRVRXNOSewLJ3PWfDJd1VyTS21fI=
 github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=

api/handler/cluster.go

@@ -2,6 +2,7 @@ package handler
 
 import (
 	"fmt"
+	"os"
 	"strconv"
 	"strings"
 	"sync"
@@ -33,6 +34,7 @@ type ClusterInfo struct {
 	CanBeInitialized  bool          `json:"canBeInitialized"`
 	KubernetesVersion *version.Info `json:"kubernetesVersion"`
 	KalmVersion       *version.Info `json:"kalmVersion"`
+	ClusterName       string        `json:"clusterName"`
 }
 
 var KubernetesVersion *version.Info
@@ -98,6 +100,8 @@ func (h *ApiHandler) getClusterInfo(c echo.Context) *ClusterInfo {
 		}
 	}
 
+	info.ClusterName = os.Getenv("KALM_CLUSTER_NAME")
+
 	var certNotFound, routeNotFound, ssoNotFound bool
 
 	wg := sync.WaitGroup{}

controller/api/v1alpha1/const.go

@@ -54,6 +54,8 @@ const (
 
 	ENV_EXTERNAL_DNS_SERVER_IP = "EXTERNAL_DNS_SERVER_IP"
 
+	ENV_KALM_CLUSTER_NAME = "KALM_CLUSTER_NAME"
+
 	// auth-proxy
 	ENV_NEED_EXTRA_OAUTH_SCOPE = "NEED_EXTRA_OAUTH_SCOPE"
 )

operator/api/v1alpha1/kalmoperatorconfig_types.go

@@ -81,6 +81,8 @@ type BYOCModeConfig struct {
 	// like: foobar.byoc-clusters.kalm-dns.com
 	BaseDNSDomain string `json:"baseDNSDomain,omitempty"`
 
+	ClusterName string `json:"clusterName,omitempty"`
+
 	OIDCIssuer *OIDCIssuerConfig `json:"oidcIssuer,omitempty"`
 }
 

operator/config/crd/bases/install.kalm.dev_kalmoperatorconfigs.yaml

@@ -47,6 +47,8 @@ spec:
                 baseDashboardDomain:
                   description: 'like: foobar.byoc.kalm.dev'
                   type: string
+                clusterName:
+                  type: string
                 clusterUUID:
                   type: string
                 kalmSaaSDomain:

operator/controllers/dashboard.go

@@ -72,6 +72,7 @@ func getKalmDashboardCommand(configSpec installv1alpha1.KalmOperatorConfigSpec)
 
 func getKalmDashboardEnvs(configSpec installv1alpha1.KalmOperatorConfigSpec) []corev1alpha1.EnvVar {
 	var envs []corev1alpha1.EnvVar
+
 	if configSpec.Dashboard != nil {
 		for _, nv := range configSpec.Dashboard.Envs {
 			envs = append(envs, corev1alpha1.EnvVar{
@@ -83,8 +84,18 @@ func getKalmDashboardEnvs(configSpec installv1alpha1.KalmOperatorConfigSpec) []c
 	}
 
 	var baseAppDomain string
-	if configSpec.BYOCModeConfig != nil && configSpec.BYOCModeConfig.BaseAppDomain != "" {
-		baseAppDomain = configSpec.BYOCModeConfig.BaseAppDomain
+	if configSpec.BYOCModeConfig != nil {
+		if configSpec.BYOCModeConfig.BaseAppDomain != "" {
+			baseAppDomain = configSpec.BYOCModeConfig.BaseAppDomain
+		}
+
+		if configSpec.BYOCModeConfig.ClusterName != "" {
+			envs = append(envs, corev1alpha1.EnvVar{
+				Name:  v1alpha1.ENV_KALM_CLUSTER_NAME,
+				Value: configSpec.BYOCModeConfig.ClusterName,
+				Type:  corev1alpha1.EnvVarTypeStatic,
+			})
+		}
 	}
 
 	// BaseAppDomain