Skip to content

Commit 6c5b611

Browse files
qiujian16qiujian16
committed
Bump to use ocm v1.0.0
Signed-off-by: Jian Qiu <[email protected]>
1 parent ffdcc06 commit 6c5b611

File tree

193 files changed

+19202
-14153
lines changed

Some content is hidden

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

193 files changed

+19202
-14153
lines changed

‎go.mod‎

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,23 @@ require (
1616
github.com/pkg/errors v0.9.1
1717
github.com/spf13/cobra v1.8.1
1818
github.com/spf13/pflag v1.0.5
19-
google.golang.org/grpc v1.67.0
19+
google.golang.org/grpc v1.68.1
2020
gopkg.in/yaml.v2 v2.4.0
2121
helm.sh/helm/v3 v3.17.3
22-
k8s.io/api v0.32.3
22+
k8s.io/api v0.32.4
2323
k8s.io/apiextensions-apiserver v0.32.2
24-
k8s.io/apimachinery v0.32.3
24+
k8s.io/apimachinery v0.32.4
2525
k8s.io/cli-runtime v0.32.2
26-
k8s.io/client-go v0.32.3
27-
k8s.io/component-base v0.32.3
26+
k8s.io/client-go v0.32.4
27+
k8s.io/component-base v0.32.4
2828
k8s.io/klog/v2 v2.130.1
2929
k8s.io/kubectl v0.32.2
3030
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
31-
open-cluster-management.io/api v0.16.2-0.20250422072120-cadf714c3055
31+
open-cluster-management.io/api v1.0.0
3232
open-cluster-management.io/cluster-proxy v0.7.0
3333
open-cluster-management.io/managed-serviceaccount v0.8.0
34-
open-cluster-management.io/ocm v0.16.1-0.20250422150056-f4b6dcb15929
35-
open-cluster-management.io/sdk-go v0.16.1-0.20250411154302-3a424961ead4
34+
open-cluster-management.io/ocm v1.0.0
35+
open-cluster-management.io/sdk-go v1.0.0
3636
sigs.k8s.io/apiserver-network-proxy v0.29.0
3737
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0
3838
sigs.k8s.io/controller-runtime v0.20.2
@@ -87,13 +87,13 @@ require (
8787
github.com/gogo/protobuf v1.3.2 // indirect
8888
github.com/golang/protobuf v1.5.4 // indirect
8989
github.com/google/btree v1.1.3 // indirect
90-
github.com/google/gnostic-models v0.6.8 // indirect
90+
github.com/google/gnostic-models v0.6.9 // indirect
9191
github.com/google/go-cmp v0.7.0 // indirect
9292
github.com/google/gofuzz v1.2.0 // indirect
9393
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
9494
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
9595
github.com/gorilla/mux v1.8.1 // indirect
96-
github.com/gorilla/websocket v1.5.1 // indirect
96+
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
9797
github.com/gosuri/uitable v0.0.4 // indirect
9898
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
9999
github.com/hashicorp/errwrap v1.1.0 // indirect
@@ -141,32 +141,34 @@ require (
141141
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
142142
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
143143
github.com/xlab/treeprint v1.2.0 // indirect
144-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
145-
go.opentelemetry.io/otel v1.28.0 // indirect
146-
go.opentelemetry.io/otel/metric v1.28.0 // indirect
147-
go.opentelemetry.io/otel/trace v1.28.0 // indirect
144+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
145+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
146+
go.opentelemetry.io/otel v1.33.0 // indirect
147+
go.opentelemetry.io/otel/metric v1.33.0 // indirect
148+
go.opentelemetry.io/otel/trace v1.33.0 // indirect
148149
go.uber.org/automaxprocs v1.6.0 // indirect
149-
golang.org/x/crypto v0.36.0 // indirect
150-
golang.org/x/net v0.37.0 // indirect
150+
golang.org/x/crypto v0.37.0 // indirect
151+
golang.org/x/net v0.38.0 // indirect
151152
golang.org/x/oauth2 v0.28.0 // indirect
152-
golang.org/x/sync v0.12.0 // indirect
153+
golang.org/x/sync v0.13.0 // indirect
153154
golang.org/x/sys v0.32.0 // indirect
154-
golang.org/x/term v0.30.0 // indirect
155-
golang.org/x/text v0.23.0 // indirect
156-
golang.org/x/time v0.7.0 // indirect
155+
golang.org/x/term v0.31.0 // indirect
156+
golang.org/x/text v0.24.0 // indirect
157+
golang.org/x/time v0.9.0 // indirect
157158
golang.org/x/tools v0.31.0 // indirect
158-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
159+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
159160
google.golang.org/protobuf v1.36.5 // indirect
160161
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
161162
gopkg.in/inf.v0 v0.9.1 // indirect
162163
gopkg.in/yaml.v3 v3.0.1 // indirect
163164
k8s.io/apiserver v0.32.3 // indirect
164165
k8s.io/kube-aggregator v0.32.1 // indirect
165-
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
166+
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
166167
oras.land/oras-go v1.2.5 // indirect
167168
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
168169
sigs.k8s.io/kube-storage-version-migrator v0.0.6-0.20230721195810-5c8923c5ff96 // indirect
169170
sigs.k8s.io/kustomize/api v0.18.0 // indirect
170-
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
171+
sigs.k8s.io/randfill v1.0.0 // indirect
172+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
171173
sigs.k8s.io/yaml v1.4.0 // indirect
172174
)

‎go.sum‎

Lines changed: 53 additions & 48 deletions
Large diffs are not rendered by default.

‎pkg/version/version.go‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ type VersionBundle struct {
4545
MulticlusterControlplane string `json:"multicluster_controlplane"`
4646
}
4747

48-
var defaultBundleVersion = "0.16.1"
48+
var defaultBundleVersion = "1.0.0"
4949

5050
func GetDefaultBundleVersion() string {
5151
return defaultBundleVersion
@@ -85,13 +85,6 @@ func getVersionBundle(version string) (VersionBundle, error) {
8585

8686
// predefined bundle version
8787
// TODO: automated version tracking
88-
versionBundleList["0.14.0"] = VersionBundle{
89-
OCM: "v0.14.0",
90-
AppAddon: "v0.14.0",
91-
PolicyAddon: "v0.14.0",
92-
MulticlusterControlplane: "v0.5.0",
93-
}
94-
9588
versionBundleList["0.15.0"] = VersionBundle{
9689
OCM: "v0.15.0",
9790
AppAddon: "v0.15.0",
@@ -113,8 +106,8 @@ func getVersionBundle(version string) (VersionBundle, error) {
113106
MulticlusterControlplane: "v0.7.0",
114107
}
115108

116-
versionBundleList["0.16.1"] = VersionBundle{
117-
OCM: "v0.16.1",
109+
versionBundleList["1.0.0"] = VersionBundle{
110+
OCM: "v1.0.0",
118111
AppAddon: "v0.16.0",
119112
PolicyAddon: "v0.16.0",
120113
MulticlusterControlplane: "v0.7.0",

‎pkg/version/version_test.go‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,13 @@ func TestGetVersionBundle(t *testing.T) {
2222
wantErr bool
2323
}{
2424
{
25-
name: "default",
26-
version: "default",
27-
versionBundleFile: "",
28-
expectedVersionBundle: func() VersionBundle { return expectedVersionBundle },
25+
name: "default",
26+
version: "default",
27+
versionBundleFile: "",
28+
expectedVersionBundle: func() VersionBundle {
29+
versionBundle, _ := getVersionBundle("default")
30+
return versionBundle
31+
},
2932
},
3033
{
3134
name: "specific version",

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

Lines changed: 0 additions & 180 deletions
This file was deleted.

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

Lines changed: 0 additions & 62 deletions
This file was deleted.

0 commit comments

Comments
 (0)