This is an automated email from the ASF dual-hosted git repository.
zhongxjian pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-kubernetes.git
The following commit(s) were added to refs/heads/master by this push:
new acd551a1 [operator] Fixing known bugs
acd551a1 is described below
commit acd551a14e068fac5e87887fe4047eb874262bb0
Author: mfordjody <[email protected]>
AuthorDate: Wed Dec 11 11:04:48 2024 +0800
[operator] Fixing known bugs
---
pkg/kube/client.go | 17 ++++++++++++++---
pkg/laziness/laziness.go | 3 ++-
2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/pkg/kube/client.go b/pkg/kube/client.go
index 20dcdf26..ef0955eb 100644
--- a/pkg/kube/client.go
+++ b/pkg/kube/client.go
@@ -9,13 +9,16 @@ import (
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/client-go/dynamic"
kubescheme "k8s.io/client-go/kubernetes/scheme"
+ "k8s.io/client-go/rest"
"k8s.io/client-go/tools/clientcmd"
)
type client struct {
- dynamic dynamic.Interface
- revision string
- factory *clientFactory
+ dynamic dynamic.Interface
+ config *rest.Config
+ revision string
+ factory *clientFactory
+ restClient *rest.RESTClient
}
type Client interface {
@@ -36,6 +39,14 @@ func newInternalClient(factory *clientFactory, opts
...ClientOption) (CLIClient,
var c client
var err error
c.factory = factory
+ c.config, err = factory.ToRestConfig()
+ if err != nil {
+ return nil, err
+ }
+ for _, opt := range opts {
+ opt(&c)
+ }
+ return nil, err
}
var (
diff --git a/pkg/laziness/laziness.go b/pkg/laziness/laziness.go
index f49f62c5..9a1d2479 100644
--- a/pkg/laziness/laziness.go
+++ b/pkg/laziness/laziness.go
@@ -35,8 +35,9 @@ func NewWithRetry[T any](f func() (T, error)) Laziness[T] {
func (l *lazinessImpl[T]) Get() (T, error) {
if atomic.LoadUint32(&l.done) == 0 {
+ return l.doSlow()
}
- return nil, nil
+ return l.res, l.err
}
func (l *lazinessImpl[T]) doSlow() (T, error) {
