make language config file to configmap

build/cube/Dockerfile

@@ -26,7 +26,6 @@ COPY pkg/ pkg/
 COPY docs/ docs/
 COPY vendor/ vendor/
 COPY Makefile Makefile
-COPY i18n/ i18n/
 
 # Build
 RUN make build-cube
@@ -36,6 +35,5 @@ RUN make build-cube
 FROM alpine:3.13.4
 WORKDIR /
 COPY --from=builder /workspace/cube .
-COPY --from=builder /workspace/i18n i18n
 
 ENTRYPOINT ["/cube"]

cmd/cube/app/cube.go

@@ -24,6 +24,7 @@ import (
 	"github.com/kubecube-io/kubecube/pkg/clog"
 	"github.com/kubecube-io/kubecube/pkg/ctrlmgr"
 	"github.com/kubecube-io/kubecube/pkg/cube"
+	"github.com/kubecube-io/kubecube/pkg/utils/international"
 	"github.com/urfave/cli/v2"
 	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	"k8s.io/sample-controller/pkg/signals"
@@ -62,12 +63,18 @@ func run(s *options.CubeOptions, stop <-chan struct{}) {
 	// initialize cube client set
 	clients.InitCubeClientSetWithOpts(s.ClientMgrOpts)
 
-	c := cube.New(s.GenericCubeOpts)
+	// initialize language managers
+	m, err := international.InitGi18nManagers()
+	if err != nil {
+		clog.Fatal("cube initialized gi18n managers failed: %v", err)
+	}
+	s.APIServerOpts.Gi18nManagers = m
 
+	c := cube.New(s.GenericCubeOpts)
 	c.IntegrateWith("cube-controller-manager", ctrlmgr.NewCtrlMgrWithOpts(s.CtrlMgrOpts))
 	c.IntegrateWith("cube-apiserver", apiserver.NewAPIServerWithOpts(s.APIServerOpts))
 
-	err := c.Initialize()
+	err = c.Initialize()
 	if err != nil {
 		clog.Fatal("cube initialized failed: %v", err)
 	}

deploy/template/languageConfig.yaml

+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: kubecube-language-config
+  namespace: kubecube-system
+data:
+  languages: "zh,en"
+  en.toml: |
+    # method
+    POST = "create"
+    PUT = "update"
+    DELETE = "delete"
+
+    # resourceType
+    deployments = "Deployment"
+    namespaces = "Namespace"
+    jobs = "Job"
+    cronjobs = "Cronjob"
+    persistentvolumeclaims = "Persistentvolumeclaim"
+    customresourcedefinitions = "Customresourcedefinition"
+    horizontalpodautoscalers = "Horizontalpodautoscaler"
+    networkpolicies = "Networkpolicie"
+    statefulsets = "Statefulset"
+    replicasets = "Replicaset"
+    pods = "Pod"
+    secrets = "Secret"
+    ingresses = "Ingress"
+    services = "Service"
+    configmaps = "Configmap"
+    user = "User"
+    key = "Key"
+
+    # description
+    createUser = "createUser"
+    updateUser = "updateUser"
+    deleteKey = "deleteKey"
+
+  zh.toml: |
+    # method
+    POST = "创建"
+    PUT = "更新"
+    DELETE = "删除"
+
+    # resourceType
+    deployments = "无状态负载"
+    namespaces = "namespace"
+    jobs = "任务"
+    cronjobs = "定时任务"
+    persistentvolumeclaims = "存储声明"
+    customresourcedefinitions = "自定义资源"
+    horizontalpodautoscalers = "自动伸缩(HPA)"
+    networkpolicies = "网络策略"
+    statefulsets = "有状态负载"
+    replicasets = "副本集"
+    pods = "副本"
+    secret = "secret"
+    ingresses = "ingress"
+    services = "service"
+    configmaps = "configmap"
+    user = "user"
+    key = "key"
+
+    # description
+    createUser = "创建用户"
+    updateUser = "更新用户"
+    deleteKey = "删除密钥"
\ No newline at end of file

pkg/apiserver/apiserver.go

@@ -62,7 +62,7 @@ func registerCubeAPI(cfg *Config) http.Handler {
 	apisOutsideMiddlewares(router)
 
 	// set middlewares for apis below
-	middlewares.SetUpMiddlewares(router)
+	middlewares.SetUpMiddlewares(router, cfg.Gi18nManagers)
 
 	// clusters apis handler
 	cluster.NewHandler().AddApisTo(router)

pkg/apiserver/config.go

@@ -18,6 +18,7 @@ package apiserver
 
 import (
 	"github.com/kubecube-io/kubecube/pkg/authentication"
+	"github.com/kubecube-io/kubecube/pkg/utils/international"
 )
 
 type Config struct {
@@ -25,6 +26,7 @@ type Config struct {
 	authentication.LdapConfig
 	authentication.JwtConfig
 	authentication.GenericConfig
+	Gi18nManagers *international.Gi18nManagers
 }
 
 type HttpConfig struct {

pkg/apiserver/cubeapi/key/handle.go

@@ -118,6 +118,7 @@ func CreateKey(c *gin.Context) {
 // @Router /api/v1/cube/key  [delete]
 func DeleteKey(c *gin.Context) {
 	accessKey := c.Query("accessKey")
+	c = audit.SetAuditInfo(c, audit.DeleteKey, accessKey)
 	// get user info
 	userInfo, err := token.GetUserFromReq(c.Request)
 	if err != nil {
@@ -147,7 +148,6 @@ func DeleteKey(c *gin.Context) {
 		return
 	}
 
-	c = audit.SetAuditInfo(c, audit.DeleteKey, accessKey)
 	response.SuccessReturn(c, nil)
 }
 

pkg/apiserver/middlewares/audit/audit.go

@@ -29,7 +29,6 @@ import (
 	"time"
 
 	"github.com/gin-gonic/gin"
-	"github.com/gogf/gf/v2/i18n/gi18n"
 	"github.com/google/uuid"
 	jsoniter "github.com/json-iterator/go"
 
@@ -39,21 +38,23 @@ import (
 	"github.com/kubecube-io/kubecube/pkg/utils/audit"
 	"github.com/kubecube-io/kubecube/pkg/utils/constants"
 	"github.com/kubecube-io/kubecube/pkg/utils/env"
-	"github.com/kubecube-io/kubecube/pkg/utils/international/en"
-	"github.com/kubecube-io/kubecube/pkg/utils/international/zh"
+	"github.com/kubecube-io/kubecube/pkg/utils/international"
 )
 
-var json = jsoniter.ConfigCompatibleWithStandardLibrary
-
-const eventRespBody = "responseBody"
-
 var (
+	json           = jsoniter.ConfigCompatibleWithStandardLibrary
 	auditWhiteList = map[string]string{
 		constants.ApiPathRoot + "/audit": "POST",
 	}
 	auditSvc env.AuditSvcApi
 )
 
+const eventRespBody = "responseBody"
+
+type Handler struct {
+	Managers *international.Gi18nManagers
+}
+
 func init() {
 	auditSvc = env.AuditSVC()
 }
@@ -69,7 +70,7 @@ func withinWhiteList(url *url.URL, method string, whiteList map[string]string) b
 	return false
 }
 
-func Audit() gin.HandlerFunc {
+func (h *Handler) Audit() gin.HandlerFunc {
 	return func(c *gin.Context) {
 
 		w := &responseBodyWriter{body: &bytes.Buffer{}, ResponseWriter: c.Writer}
@@ -107,11 +108,9 @@ func Audit() gin.HandlerFunc {
 			}
 
 			// get event name and description
-			t := &gi18n.Manager{}
-			if env.AuditLanguage() == "zh" {
-				t = zh.GetZhManager()
-			} else {
-				t = en.GetEnManager()
+			t := h.Managers.GetInstants(env.AuditLanguage())
+			if t == nil {
+				t = h.Managers.GetInstants("en")
 			}
 			ctx := context.Background()
 			eventName, isExist := c.Get(constants.EventName)
@@ -123,7 +122,7 @@ func Audit() gin.HandlerFunc {
 					ResourceName: c.GetString(audit.EventResourceName),
 				}}
 			} else {
-				e = handleProxyApi(ctx, c, *e, t)
+				e = h.handleProxyApi(ctx, c, *e)
 			}
 
 			go sendEvent(e)
@@ -171,7 +170,7 @@ func sendEvent(e *Event) {
 }
 
 // get event name and description
-func handleProxyApi(ctx context.Context, c *gin.Context, e Event, t *gi18n.Manager) *Event {
+func (h *Handler) handleProxyApi(ctx context.Context, c *gin.Context, e Event) *Event {
 	var (
 		objectType string
 		objectName string
@@ -214,8 +213,12 @@ func handleProxyApi(ctx context.Context, c *gin.Context, e Event, t *gi18n.Manag
 	}
 
 	method := c.Request.Method
-	enT := en.GetEnManager()
+	enT := h.Managers.GetInstants("en")
 	e.EventName = enT.Translate(ctx, method) + strings.Title(objectType[:len(objectType)-1])
+	t := h.Managers.GetInstants(env.AuditLanguage())
+	if t == nil {
+		t = h.Managers.GetInstants("en")
+	}
 	e.Description = t.Translate(ctx, method) + t.Translate(ctx, objectType)
 	e.ResourceReports = []Resource{{
 		ResourceType: objectType[:len(objectType)-1],

pkg/apiserver/middlewares/audit/audit_test.go

@@ -18,6 +18,7 @@ package audit
 
 import (
 	"bytes"
+	"context"
 	"fmt"
 	"io/ioutil"
 	"net/http"
@@ -26,10 +27,13 @@ import (
 	"time"
 
 	"github.com/gin-gonic/gin"
+	"github.com/gogf/gf/v2/i18n/gi18n"
 	"github.com/google/uuid"
-	"github.com/kubecube-io/kubecube/pkg/utils/constants"
+	"github.com/kubecube-io/kubecube/pkg/utils/international"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	"github.com/kubecube-io/kubecube/pkg/utils/constants"
 )
 
 type header struct {
@@ -69,35 +73,37 @@ func TestSendEvent(t *testing.T) {
 
 func TestGetEventName(t *testing.T) {
 	e := &Event{}
-	router := gin.New()
-
-	// check get method
-	router.GET("/api/v1/cube/proxy/clusters/:cluster/apis/apps/v1/namespaces/:namespace/statefulsets/:name", func(c *gin.Context) {
-		e = handleProxyApi(c, *e)
-		return
-	})
-	_ = performRequest(router, http.MethodGet, "/api/v1/cube/proxy/clusters/pivot-cluster/apis/apps/v1/namespaces/dev/statefulsets/stsA", []byte(""))
-	if e.EventName != "[KubeCube] query statefulsets" {
-		t.Fail()
+	ctx := context.Background()
+	enInstance := gi18n.Instance()
+	enInstance.SetPath("/Users/zhaojiahui/code/go/kubecube/KubeCube/i18n")
+	enInstance.SetLanguage("en")
+	h := Handler{
+		Managers: &international.Gi18nManagers{
+			Managers: map[string]*gi18n.Manager{
+				"en": enInstance,
+			},
+		},
 	}
 
 	// check post method
-	router.POST("/api/v1/cube/proxy/clusters/:cluster/api/v1/namespaces/:namespace/services", func(c *gin.Context) {
-		e = handleProxyApi(c, *e)
+	router1 := gin.New()
+	router1.POST("/api/v1/cube/proxy/clusters/:cluster/api/v1/namespaces/:namespace/services", func(c *gin.Context) {
+		e = h.handleProxyApi(ctx, c, *e)
 		return
 	})
-	_ = performRequest(router, http.MethodPost, "/api/v1/cube/proxy/clusters/pivot-cluster/api/v1/namespaces/dev/services", []byte(""))
-	if e.EventName != "[KubeCube] create services" {
+	_ = performRequest(router1, http.MethodPost, "/api/v1/cube/proxy/clusters/pivot-cluster/api/v1/namespaces/dev/services", []byte(""))
+	if e.EventName != "createService" {
 		t.Fail()
 	}
 
 	// check put method
-	router.PUT("/api/v1/cube/proxy/clusters/:cluster/api/v1/namespaces/:namespace/secrets/:name", func(c *gin.Context) {
-		e = handleProxyApi(c, *e)
+	router2 := gin.New()
+	router2.PUT("/api/v1/cube/proxy/clusters/:cluster/api/v1/namespaces/:namespace/secrets/:name", func(c *gin.Context) {
+		e = h.handleProxyApi(ctx, c, *e)
 		return
 	})
-	_ = performRequest(router, http.MethodPut, "/api/v1/cube/proxy/clusters/pivot-cluster/api/v1/namespaces/dev/secrets/secretA", []byte(""))
-	if e.EventName != "[KubeCube] update secrets" {
+	_ = performRequest(router2, http.MethodPut, "/api/v1/cube/proxy/clusters/pivot-cluster/api/v1/namespaces/dev/secrets/secretA", []byte(""))
+	if e.EventName != "updateSecret" {
 		t.Fail()
 	}
 }

pkg/apiserver/middlewares/middlewares.go

@@ -23,16 +23,20 @@ import (
 	"github.com/kubecube-io/kubecube/pkg/apiserver/middlewares/precheck"
 	"github.com/kubecube-io/kubecube/pkg/apiserver/middlewares/recovery"
 	"github.com/kubecube-io/kubecube/pkg/utils/env"
+	"github.com/kubecube-io/kubecube/pkg/utils/international"
 )
 
-func SetUpMiddlewares(router *gin.Engine) {
+func SetUpMiddlewares(router *gin.Engine, managers *international.Gi18nManagers) {
 	if router == nil {
 		return
 	}
 	router.Use(precheck.PreCheck())
 	router.Use(auth.Auth())
 	if env.AuditIsEnable() {
-		router.Use(audit.Audit())
+		h := audit.Handler{
+			Managers: managers,
+		}
+		router.Use(h.Audit())
 	}
 	router.Use(recovery.Recovery())
 }

pkg/utils/international/en/en.go

-/*
-Copyright 2021 KubeCube Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-package en
-
-import (
-	"github.com/gogf/gf/v2/i18n/gi18n"
-)
-
-var enManager *gi18n.Manager
-
-func GetEnManager() *gi18n.Manager {
-	return enManager
-}
-
-func InitEnManager() {
-	t := gi18n.New()
-	t.SetLanguage("en")
-	enManager = t
-}

pkg/utils/international/manager.go

@@ -16,11 +16,72 @@ limitations under the License.
 package international
 
 import (
-	"github.com/kubecube-io/kubecube/pkg/utils/international/en"
-	"github.com/kubecube-io/kubecube/pkg/utils/international/zh"
+	"context"
+	"errors"
+	"strings"
+	"sync"
+
+	"github.com/gogf/gf/v2/i18n/gi18n"
+	"github.com/kubecube-io/kubecube/pkg/clients"
+	"github.com/kubecube-io/kubecube/pkg/clog"
+	"github.com/kubecube-io/kubecube/pkg/utils/constants"
+	v1 "k8s.io/api/core/v1"
+	ioerrors "k8s.io/apimachinery/pkg/api/errors"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
-func init() {
-	en.InitEnManager()
-	zh.InitEnManager()
+var defaultOptions = []string{"zh,en"}
+
+type Gi18nManagers struct {
+	Managers map[string]*gi18n.Manager
+	lock     sync.RWMutex
+}
+
+type Config struct {
+	Languages map[string]string
+}
+
+func InitGi18nManagers() (*Gi18nManagers, error) {
+	// read kubecube-language-config
+	kClient := clients.Interface().Kubernetes(constants.PivotCluster).Direct()
+	if kClient == nil {
+		return nil, errors.New("get pivot cluster client is nil")
+	}
+	cm := &v1.ConfigMap{}
+	err := kClient.Get(context.Background(), client.ObjectKey{Name: "kubecube-language-config", Namespace: constants.CubeNamespace}, cm)
+	if err != nil && !ioerrors.IsNotFound(err) {
+		clog.Error("get configmap kubecube-language-config from K8s err: %v", err)
+		return nil, err
+	}
+	var languages []string
+	if ioerrors.IsNotFound(err) {
+		languages = defaultOptions
+	} else {
+		languages = strings.Split(cm.Data["languages"], ",")
+	}
+
+	m := &Gi18nManagers{
+		Managers: make(map[string]*gi18n.Manager),
+	}
+	m.lock.Lock()
+	defer m.lock.Unlock()
+	for _, l := range languages {
+		inst := gi18n.Instance(l)
+		inst.SetLanguage(l)
+		m.Managers[l] = inst
+	}
+	return m, nil
+}
+
+func (g *Gi18nManagers) GetInstants(language string) *gi18n.Manager {
+	g.lock.RLock()
+	defer g.lock.RUnlock()
+	return g.Managers[language]
+}
+
+func (g *Gi18nManagers) Translate(ctx context.Context, language string, content string) string {
+	m := g.Managers[language]
+	g.lock.RLock()
+	defer g.lock.RUnlock()
+	return m.Translate(ctx, content)
 }

pkg/utils/international/zh/zh.go

-/*
-Copyright 2021 KubeCube Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package zh
-
-import (
-	"github.com/gogf/gf/v2/i18n/gi18n"
-)
-
-var zhManager *gi18n.Manager
-
-func GetZhManager() *gi18n.Manager {
-	return zhManager
-}
-
-func InitEnManager() {
-	t := gi18n.New()
-	t.SetLanguage("zh")
-	zhManager = t
-}