Skip to content

Commit 4e48d4e

Browse files
committed
upgrade ocm to reduce agent log size
Signed-off-by: Wei Liu <liuweixa@redhat.com>
1 parent 8e5bd4d commit 4e48d4e

File tree

12 files changed

+103
-87
lines changed

12 files changed

+103
-87
lines changed

examples/manifestworkclient/client-a/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ func main() {
6767
},
6868
})
6969

70-
grpcOptions := grpc.NewGRPCOptions()
71-
grpcOptions.URL = *grpcServerAddr
70+
grpcOptions := &grpc.GRPCOptions{Dialer: &grpc.GRPCDialer{}}
71+
grpcOptions.Dialer.URL = *grpcServerAddr
7272

7373
workClient, err := grpcsource.NewMaestroGRPCSourceWorkClient(
7474
ctx,

examples/manifestworkclient/client-b/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ func main() {
6060
},
6161
})
6262

63-
grpcOptions := grpc.NewGRPCOptions()
64-
grpcOptions.URL = *grpcServerAddr
63+
grpcOptions := &grpc.GRPCOptions{Dialer: &grpc.GRPCDialer{}}
64+
grpcOptions.Dialer.URL = *grpcServerAddr
6565

6666
workClient, err := grpcsource.NewMaestroGRPCSourceWorkClient(
6767
ctx,

examples/manifestworkclient/client/main.go

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import (
1616
"github.com/openshift-online/maestro/pkg/client/cloudevents/grpcsource"
1717
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1818
workv1 "open-cluster-management.io/api/work/v1"
19+
"open-cluster-management.io/sdk-go/pkg/cloudevents/generic/options/cert"
1920
"open-cluster-management.io/sdk-go/pkg/cloudevents/generic/options/grpc"
2021
)
2122

@@ -65,19 +66,21 @@ func main() {
6566
},
6667
})
6768

68-
grpcOptions := grpc.NewGRPCOptions()
69-
grpcOptions.URL = *grpcServerAddr
70-
if *grpcServerCAFile != "" {
71-
grpcOptions.CAFile = *grpcServerCAFile
72-
}
73-
if *grpcClientCertFile != "" {
74-
grpcOptions.ClientCertFile = *grpcClientCertFile
75-
}
76-
if *grpcClientKeyFile != "" {
77-
grpcOptions.ClientKeyFile = *grpcClientKeyFile
69+
grpcOptions := &grpc.GRPCOptions{Dialer: &grpc.GRPCDialer{}}
70+
grpcOptions.Dialer.URL = *grpcServerAddr
71+
if *grpcServerCAFile != "" && *grpcClientCertFile != "" && *grpcClientKeyFile != "" {
72+
tlsConfig, err := cert.AutoLoadTLSConfig(
73+
*grpcServerCAFile,
74+
*grpcClientCertFile,
75+
*grpcClientKeyFile,
76+
grpcOptions.Dialer)
77+
if err != nil {
78+
log.Fatal(err)
79+
}
80+
grpcOptions.Dialer.TLSConfig = tlsConfig
7881
}
7982
if *grpcClientTokenFile != "" {
80-
grpcOptions.TokenFile = *grpcClientTokenFile
83+
grpcOptions.Dialer.TokenFile = *grpcClientTokenFile
8184
}
8285

8386
workClient, err := grpcsource.NewMaestroGRPCSourceWorkClient(

go.mod

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ require (
4141
github.com/spf13/viper v1.19.0
4242
github.com/yaacov/tree-search-language v0.0.0-20190923184055-1c2dad2e354b
4343
go.uber.org/zap v1.27.0
44-
golang.org/x/oauth2 v0.21.0
45-
google.golang.org/grpc v1.65.0
44+
golang.org/x/oauth2 v0.22.0
45+
google.golang.org/grpc v1.67.0
4646
google.golang.org/protobuf v1.36.1
4747
gopkg.in/resty.v1 v1.12.0
4848
gorm.io/datatypes v1.2.0
@@ -54,14 +54,14 @@ require (
5454
k8s.io/client-go v0.31.4
5555
k8s.io/component-base v0.31.4
5656
k8s.io/klog/v2 v2.130.1
57-
open-cluster-management.io/api v0.15.1-0.20250116010516-3a595d6a4e40
58-
open-cluster-management.io/ocm v0.15.1-0.20250108154653-2397c4e91119
59-
open-cluster-management.io/sdk-go v0.15.1-0.20250217031345-04acb74ee5ae
57+
open-cluster-management.io/api v0.16.1
58+
open-cluster-management.io/ocm v0.16.1-0.20250314011908-73150dea199d
59+
open-cluster-management.io/sdk-go v0.16.1-0.20250310140105-b3879d722d37
6060
sigs.k8s.io/yaml v1.4.0
6161
)
6262

6363
require (
64-
cloud.google.com/go/compute/metadata v0.3.0 // indirect
64+
cloud.google.com/go/compute/metadata v0.5.0 // indirect
6565
github.com/Azure/azure-sdk-for-go/sdk/internal v1.9.0 // indirect
6666
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
6767
github.com/NYTimes/gziphandler v1.1.1 // indirect
@@ -76,10 +76,12 @@ require (
7676
github.com/cloudevents/sdk-go/protocol/kafka_confluent/v2 v2.0.0-20240413090539-7fef29478991 // indirect
7777
github.com/cloudevents/sdk-go/protocol/mqtt_paho/v2 v2.0.0-20241008145627-6bcc075b5b6c // indirect
7878
github.com/confluentinc/confluent-kafka-go/v2 v2.3.0 // indirect
79+
github.com/containerd/log v0.1.0 // indirect
7980
github.com/coreos/go-semver v0.3.1 // indirect
8081
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
8182
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
8283
github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
84+
github.com/distribution/reference v0.6.0 // indirect
8385
github.com/eclipse/paho.golang v0.21.0 // indirect
8486
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
8587
github.com/felixge/fgprof v0.9.4 // indirect
@@ -112,7 +114,7 @@ require (
112114
github.com/jinzhu/now v1.1.5 // indirect
113115
github.com/josharian/intern v1.0.0 // indirect
114116
github.com/json-iterator/go v1.1.12 // indirect
115-
github.com/klauspost/compress v1.17.9 // indirect
117+
github.com/klauspost/compress v1.17.11 // indirect
116118
github.com/kylelemons/godebug v1.1.0 // indirect
117119
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
118120
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
@@ -121,6 +123,8 @@ require (
121123
github.com/mattn/go-sqlite3 v1.14.22 // indirect
122124
github.com/microcosm-cc/bluemonday v1.0.23 // indirect
123125
github.com/mitchellh/mapstructure v1.5.0 // indirect
126+
github.com/moby/patternmatcher v0.6.0 // indirect
127+
github.com/moby/sys/sequential v0.6.0 // indirect
124128
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
125129
github.com/modern-go/reflect2 v1.0.2 // indirect
126130
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
@@ -157,16 +161,16 @@ require (
157161
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
158162
go.uber.org/multierr v1.11.0 // indirect
159163
golang.org/x/crypto v0.32.0 // indirect
160-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
164+
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 // indirect
161165
golang.org/x/net v0.34.0 // indirect
162166
golang.org/x/sync v0.10.0 // indirect
163167
golang.org/x/sys v0.29.0 // indirect
164168
golang.org/x/term v0.28.0 // indirect
165169
golang.org/x/text v0.21.0 // indirect
166170
golang.org/x/time v0.5.0 // indirect
167171
golang.org/x/tools v0.28.0 // indirect
168-
google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect
169-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
172+
google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 // indirect
173+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
170174
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
171175
gopkg.in/inf.v0 v0.9.1 // indirect
172176
gopkg.in/ini.v1 v1.67.0 // indirect

0 commit comments

Comments
 (0)