Skip to content

Commit 4d4623e

Browse files
committed
investigating memory leak
1 parent 17e51da commit 4d4623e

File tree

2 files changed

+14
-0
lines changed

2 files changed

+14
-0
lines changed

core/clustersmngr/cluster/cluster.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@ package cluster
33
import (
44
"context"
55
"fmt"
6+
"net/http"
67
"os"
78
"time"
89

910
"github.com/weaveworks/weave-gitops/pkg/server/auth"
11+
machnet "k8s.io/apimachinery/pkg/util/net"
1012
"k8s.io/client-go/kubernetes"
1113
"k8s.io/client-go/rest"
1214
"sigs.k8s.io/cli-utils/pkg/flowcontrol"
@@ -77,6 +79,11 @@ func WithFlowControl(config *rest.Config) (*rest.Config, error) {
7779
config.QPS = ClientQPS
7880
config.Burst = ClientBurst
7981

82+
// From https://github.com/weaveworks/weave-gitops-enterprise/issues/3189
83+
// Suggested in https://github.com/kubernetes/kubernetes/issues/118703#issuecomment-1595072383
84+
// TODO: Revert or adapt when upstream fix is available
85+
config.Proxy = machnet.NewProxierWithNoProxyCIDR(http.ProxyFromEnvironment)
86+
8087
return config, nil
8188
}
8289

core/clustersmngr/cluster/single.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@ package cluster
33
import (
44
"fmt"
55
"net"
6+
"net/http"
67

78
"github.com/weaveworks/weave-gitops/pkg/kube"
89
"github.com/weaveworks/weave-gitops/pkg/server/auth"
910
apiruntime "k8s.io/apimachinery/pkg/runtime"
11+
machnet "k8s.io/apimachinery/pkg/util/net"
1012
"k8s.io/client-go/kubernetes"
1113
"k8s.io/client-go/rest"
1214
"sigs.k8s.io/controller-runtime/pkg/client"
@@ -60,6 +62,11 @@ func getClientFromConfig(config *rest.Config, scheme *apiruntime.Scheme) (client
6062
return nil, fmt.Errorf("could not create RESTMapper from config: %w", err)
6163
}
6264

65+
// From https://github.com/weaveworks/weave-gitops-enterprise/issues/3189
66+
// Suggested in https://github.com/kubernetes/kubernetes/issues/118703#issuecomment-1595072383
67+
// TODO: Revert or adapt when upstream fix is available
68+
config.Proxy = machnet.NewProxierWithNoProxyCIDR(http.ProxyFromEnvironment)
69+
6370
client, err := client.New(config, client.Options{
6471
Scheme: scheme,
6572
Mapper: mapper,

0 commit comments

Comments
 (0)