From 8cad856adb95bacf3b12482c9d724cfd485056e3 Mon Sep 17 00:00:00 2001 From: askuy Date: Fri, 28 Jun 2024 12:11:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0k8s=20enable=E5=BC=80?= =?UTF-8?q?=E5=85=B3=EF=BC=8C=E9=BB=98=E8=AE=A4enable=E5=BC=80=E5=90=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- component.go | 10 ++++++++++ config.go | 5 +++-- container.go | 1 - options.go | 6 ------ 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/component.go b/component.go index e8e80fa..b2165bc 100644 --- a/component.go +++ b/component.go @@ -41,6 +41,16 @@ type KubernetesEvent struct { // New ... func newComponent(name string, config *Config, logger *elog.Component) *Component { + // 如果没有开启,那么返回一个nil的k8s client,这个时候,认为业务方不会使用这个组件。 + // 这个目的是为了docker-compose这类业务,虽然使用了同样代码,enable=false,让业务不panic + if !config.Enable { + return &Component{ + name: name, + config: config, + logger: logger, + Clientset: nil, + } + } client, err := kubernetes.NewForConfig(config.toRestConfig()) if err != nil { logger.Panic("new component err", elog.FieldErr(err)) diff --git a/config.go b/config.go index ee854f3..c337d55 100644 --- a/config.go +++ b/config.go @@ -13,8 +13,8 @@ import ( type Config struct { // Addr k8s API Server 地址 Addr string - // Debug 是否开启debug模式 - Debug bool + // 是否开启,默认开启 + Enable bool // Token k8s API Server 请求token Token string // Token k8s API Server 请求token file @@ -33,6 +33,7 @@ type Config struct { func DefaultConfig() *Config { return &Config{ Addr: inClusterAddr(), + Enable: true, Token: inClusterToken(), Namespaces: []string{inClusterNamespace()}, TLSClientConfigInsecure: true, diff --git a/container.go b/container.go index c932117..8d3300a 100644 --- a/container.go +++ b/container.go @@ -24,7 +24,6 @@ func Load(key string) *Container { c.logger.Panic("parse config error", elog.FieldErr(err), elog.FieldKey(key)) return c } - c.logger.Debug("config info", elog.String("name", c.name), elog.Any("config", c.config)) c.logger = c.logger.With(elog.FieldComponentName(key)) c.name = key return c diff --git a/options.go b/options.go index dae9907..6ecb8ab 100644 --- a/options.go +++ b/options.go @@ -9,12 +9,6 @@ func WithAddr(addr string) Option { } } -func WithDebug(debug bool) Option { - return func(c *Container) { - c.config.Debug = debug - } -} - func WithToken(token string) Option { return func(c *Container) { c.config.Token = token