Skip to content

Commit 28fccba

Browse files
committed
Fix object hash calculation bug for ocm addon
Signed-off-by: Tamal Saha <tamal@appscode.com>
1 parent 4bb1a51 commit 28fccba

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+3856
-1167
lines changed

go.mod

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@ module go.bytebuilders.dev/license-proxyserver
22

33
go 1.22.0
44

5-
replace open-cluster-management.io/addon-framework => github.com/kluster-manager/addon-framework v0.9.1-0.20240225065513-dbdc1604459c
5+
replace open-cluster-management.io/addon-framework => github.com/kluster-manager/addon-framework v0.9.1-0.20240311172228-479bd0233527
66

77
require (
8-
github.com/fsnotify/fsnotify v1.7.0
98
github.com/google/gofuzz v1.2.0
109
github.com/pkg/errors v0.9.1
1110
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.71.2
@@ -29,7 +28,7 @@ require (
2928
kmodules.xyz/client-go v0.29.10
3029
open-cluster-management.io/addon-framework v0.9.0
3130
open-cluster-management.io/api v0.13.0
32-
sigs.k8s.io/controller-runtime v0.17.0
31+
sigs.k8s.io/controller-runtime v0.17.2
3332
sigs.k8s.io/yaml v1.4.0
3433
)
3534

@@ -57,6 +56,7 @@ require (
5756
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
5857
github.com/fatih/structs v1.1.0 // indirect
5958
github.com/felixge/httpsnoop v1.0.4 // indirect
59+
github.com/fsnotify/fsnotify v1.7.0 // indirect
6060
github.com/go-errors/errors v1.4.2 // indirect
6161
github.com/go-logr/logr v1.4.1 // indirect
6262
github.com/go-logr/stdr v1.2.2 // indirect
@@ -66,7 +66,7 @@ require (
6666
github.com/gobwas/glob v0.2.3 // indirect
6767
github.com/gogo/protobuf v1.3.2 // indirect
6868
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
69-
github.com/golang/protobuf v1.5.3 // indirect
69+
github.com/golang/protobuf v1.5.4 // indirect
7070
github.com/google/btree v1.1.2 // indirect
7171
github.com/google/cel-go v0.17.7 // indirect
7272
github.com/google/gnostic-models v0.6.8 // indirect
@@ -157,7 +157,7 @@ require (
157157
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
158158
google.golang.org/genproto/googleapis/rpc v0.0.0-20230911183012-2d3300fd4832 // indirect
159159
google.golang.org/grpc v1.59.0 // indirect
160-
google.golang.org/protobuf v1.31.0 // indirect
160+
google.golang.org/protobuf v1.33.0 // indirect
161161
gopkg.in/inf.v0 v0.9.1 // indirect
162162
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
163163
gopkg.in/yaml.v2 v2.4.0 // indirect

go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -367,8 +367,8 @@ github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw
367367
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
368368
github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM=
369369
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
370-
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
371-
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
370+
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
371+
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
372372
github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
373373
github.com/gomodules/sprig/v3 v3.2.3-0.20220405051441-0a8a99bac1b8 h1:rWzwdmHqkXrISyacSZcK9oLZIu5nIxesPwp9f8LpTvc=
374374
github.com/gomodules/sprig/v3 v3.2.3-0.20220405051441-0a8a99bac1b8/go.mod h1:70huEoC6heWUvVNiFAnIRaEmvzAECK551RuYBCkT13w=
@@ -554,8 +554,8 @@ github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYs
554554
github.com/klauspost/compress v1.15.1/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
555555
github.com/klauspost/cpuid/v2 v2.0.9 h1:lgaqFMSdTdQYdZ04uHyN2d/eKdOMyi2YLSvlQIBFYa4=
556556
github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
557-
github.com/kluster-manager/addon-framework v0.9.1-0.20240225065513-dbdc1604459c h1:wZTeuAIHwgHS/4c0R5Mj7vzHYdyxnyJ66GQ4r2y+wLc=
558-
github.com/kluster-manager/addon-framework v0.9.1-0.20240225065513-dbdc1604459c/go.mod h1:ZZvGRA/zmIjIww0reatmOxcXy0Eoghnat/Opszgo2NA=
557+
github.com/kluster-manager/addon-framework v0.9.1-0.20240311172228-479bd0233527 h1:8ypmznHQOO3l2vLU3Q+zS2VTvLFG6stAmu+z+swTCdA=
558+
github.com/kluster-manager/addon-framework v0.9.1-0.20240311172228-479bd0233527/go.mod h1:nQMHHshMfMNj4qdwg/4oMqRf42FQU6EYy68o2HsLgn4=
559559
github.com/kmodules/apiserver v0.29.1-0.20240104121741-1fb217d4a573 h1:6v7bTFGH/Ha1idq1sLX9px2KJhcx6cpuMowuYRyCht4=
560560
github.com/kmodules/apiserver v0.29.1-0.20240104121741-1fb217d4a573/go.mod h1:31n78PsRKPmfpee7/l9NYEv67u6hOL6AfcE761HapDM=
561561
github.com/kmodules/controller-runtime v0.17.2-0.20240213085617-b6aac9684c00 h1:+2add9izgyGZb+ZOkMwPH/fswvgfIxWilUatbp2nPo8=
@@ -1381,8 +1381,8 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0
13811381
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
13821382
google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
13831383
google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
1384-
google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
1385-
google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
1384+
google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
1385+
google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
13861386
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
13871387
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
13881388
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

vendor/github.com/golang/protobuf/jsonpb/decode.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/golang/protobuf/jsonpb/encode.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/golang/protobuf/ptypes/any.go

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/google.golang.org/protobuf/encoding/protojson/decode.go

Lines changed: 29 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/google.golang.org/protobuf/encoding/protojson/doc.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/google.golang.org/protobuf/encoding/protojson/encode.go

Lines changed: 34 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/google.golang.org/protobuf/encoding/protojson/well_known_types.go

Lines changed: 20 additions & 39 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)