Skip to content

upgrade ocm to reduce agent log size #278

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
clyang82 merged 1 commit into from
Mar 18, 2025
Merged

upgrade ocm to reduce agent log size #278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions examples/manifestworkclient/client-a/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ func main() {
},
})

grpcOptions := grpc.NewGRPCOptions()
grpcOptions.URL = *grpcServerAddr
grpcOptions := &grpc.GRPCOptions{Dialer: &grpc.GRPCDialer{}}
grpcOptions.Dialer.URL = *grpcServerAddr

workClient, err := grpcsource.NewMaestroGRPCSourceWorkClient(
ctx,
Expand Down
4 changes: 2 additions & 2 deletions examples/manifestworkclient/client-b/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ func main() {
},
})

grpcOptions := grpc.NewGRPCOptions()
grpcOptions.URL = *grpcServerAddr
grpcOptions := &grpc.GRPCOptions{Dialer: &grpc.GRPCDialer{}}
grpcOptions.Dialer.URL = *grpcServerAddr

workClient, err := grpcsource.NewMaestroGRPCSourceWorkClient(
ctx,
Expand Down
25 changes: 14 additions & 11 deletions examples/manifestworkclient/client/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import (
"github.com/openshift-online/maestro/pkg/client/cloudevents/grpcsource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
workv1 "open-cluster-management.io/api/work/v1"
"open-cluster-management.io/sdk-go/pkg/cloudevents/generic/options/cert"
"open-cluster-management.io/sdk-go/pkg/cloudevents/generic/options/grpc"
)

Expand Down Expand Up @@ -65,19 +66,21 @@ func main() {
},
})

grpcOptions := grpc.NewGRPCOptions()
grpcOptions.URL = *grpcServerAddr
if *grpcServerCAFile != "" {
grpcOptions.CAFile = *grpcServerCAFile
}
if *grpcClientCertFile != "" {
grpcOptions.ClientCertFile = *grpcClientCertFile
}
if *grpcClientKeyFile != "" {
grpcOptions.ClientKeyFile = *grpcClientKeyFile
grpcOptions := &grpc.GRPCOptions{Dialer: &grpc.GRPCDialer{}}
grpcOptions.Dialer.URL = *grpcServerAddr
if *grpcServerCAFile != "" && *grpcClientCertFile != "" && *grpcClientKeyFile != "" {
tlsConfig, err := cert.AutoLoadTLSConfig(
*grpcServerCAFile,
*grpcClientCertFile,
*grpcClientKeyFile,
grpcOptions.Dialer)
if err != nil {
log.Fatal(err)
}
grpcOptions.Dialer.TLSConfig = tlsConfig
}
if *grpcClientTokenFile != "" {
grpcOptions.TokenFile = *grpcClientTokenFile
grpcOptions.Dialer.TokenFile = *grpcClientTokenFile
}

workClient, err := grpcsource.NewMaestroGRPCSourceWorkClient(
Expand Down
24 changes: 14 additions & 10 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ require (
github.com/spf13/viper v1.19.0
github.com/yaacov/tree-search-language v0.0.0-20190923184055-1c2dad2e354b
go.uber.org/zap v1.27.0
golang.org/x/oauth2 v0.21.0
google.golang.org/grpc v1.65.0
golang.org/x/oauth2 v0.22.0
google.golang.org/grpc v1.67.0
google.golang.org/protobuf v1.36.1
gopkg.in/resty.v1 v1.12.0
gorm.io/datatypes v1.2.0
Expand All @@ -54,14 +54,14 @@ require (
k8s.io/client-go v0.31.4
k8s.io/component-base v0.31.4
k8s.io/klog/v2 v2.130.1
open-cluster-management.io/api v0.15.1-0.20250116010516-3a595d6a4e40
open-cluster-management.io/ocm v0.15.1-0.20250108154653-2397c4e91119
open-cluster-management.io/sdk-go v0.15.1-0.20250217031345-04acb74ee5ae
open-cluster-management.io/api v0.16.1
open-cluster-management.io/ocm v0.16.1-0.20250314011908-73150dea199d
open-cluster-management.io/sdk-go v0.16.1-0.20250310140105-b3879d722d37
sigs.k8s.io/yaml v1.4.0
)

require (
cloud.google.com/go/compute/metadata v0.3.0 // indirect
cloud.google.com/go/compute/metadata v0.5.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/internal v1.9.0 // indirect
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
github.com/NYTimes/gziphandler v1.1.1 // indirect
Expand All @@ -76,10 +76,12 @@ require (
github.com/cloudevents/sdk-go/protocol/kafka_confluent/v2 v2.0.0-20240413090539-7fef29478991 // indirect
github.com/cloudevents/sdk-go/protocol/mqtt_paho/v2 v2.0.0-20241008145627-6bcc075b5b6c // indirect
github.com/confluentinc/confluent-kafka-go/v2 v2.3.0 // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/coreos/go-semver v0.3.1 // indirect
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
github.com/distribution/reference v0.6.0 // indirect
github.com/eclipse/paho.golang v0.21.0 // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/felixge/fgprof v0.9.4 // indirect
Expand Down Expand Up @@ -112,7 +114,7 @@ require (
github.com/jinzhu/now v1.1.5 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.17.9 // indirect
github.com/klauspost/compress v1.17.11 // indirect
github.com/kylelemons/godebug v1.1.0 // indirect
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
Expand All @@ -121,6 +123,8 @@ require (
github.com/mattn/go-sqlite3 v1.14.22 // indirect
github.com/microcosm-cc/bluemonday v1.0.23 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/moby/patternmatcher v0.6.0 // indirect
github.com/moby/sys/sequential v0.6.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
Expand Down Expand Up @@ -157,16 +161,16 @@ require (
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.32.0 // indirect
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 // indirect
golang.org/x/net v0.34.0 // indirect
golang.org/x/sync v0.10.0 // indirect
golang.org/x/sys v0.29.0 // indirect
golang.org/x/term v0.28.0 // indirect
golang.org/x/text v0.21.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.28.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
Expand Down
Loading