Skip to content

Commit f0710ee

Browse files
qiujian16qiujian16
authored
Bump api to v1.0.0 (#316)
Signed-off-by: Jian Qiu <[email protected]>
1 parent 1d7029c commit f0710ee

File tree

155 files changed

+3114
-5385
lines changed

Some content is hidden

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

155 files changed

+3114
-5385
lines changed

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ require (
2222
k8s.io/component-base v0.32.2
2323
k8s.io/klog/v2 v2.130.1
2424
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
25-
open-cluster-management.io/api v0.16.0
26-
open-cluster-management.io/sdk-go v0.16.0
25+
open-cluster-management.io/api v1.0.0
26+
open-cluster-management.io/sdk-go v1.0.0
2727
sigs.k8s.io/controller-runtime v0.20.2
2828
)
2929

3030
require (
31-
cel.dev/expr v0.18.0 // indirect
31+
cel.dev/expr v0.19.1 // indirect
3232
cloud.google.com/go/compute/metadata v0.3.0 // indirect
3333
dario.cat/mergo v1.0.1 // indirect
3434
github.com/BurntSushi/toml v1.4.0 // indirect

‎go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
cel.dev/expr v0.18.0 h1:CJ6drgk+Hf96lkLikr4rFf19WrU0BOWEihyZnI2TAzo=
2-
cel.dev/expr v0.18.0/go.mod h1:MrpN08Q+lEBs+bGYdLxxHkZoUSsCp0nSKTs0nTymJgw=
1+
cel.dev/expr v0.19.1 h1:NciYrtDRIR0lNCnH1LFJegdjspNx9fI59O7TWcua/W4=
2+
cel.dev/expr v0.19.1/go.mod h1:MrpN08Q+lEBs+bGYdLxxHkZoUSsCp0nSKTs0nTymJgw=
33
cloud.google.com/go/compute/metadata v0.3.0 h1:Tz+eQXMEqDIKRsmY3cHTL6FVaynIjX2QxYC4trgAKZc=
44
cloud.google.com/go/compute/metadata v0.3.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k=
55
dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s=
@@ -444,10 +444,10 @@ k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f h1:GA7//TjRY9yWGy1poLzYYJ
444444
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f/go.mod h1:R/HEjbvWI0qdfb8viZUeVZm0X6IZnxAydC7YU42CMw4=
445445
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro=
446446
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
447-
open-cluster-management.io/api v0.16.0 h1:fToANqblBmWCn8f6JD4uRHFYJVVaN/usp9PeiRhex1s=
448-
open-cluster-management.io/api v0.16.0/go.mod h1:9erZEWEn4bEqh0nIX2wA7f/s3KCuFycQdBrPrRzi0QM=
449-
open-cluster-management.io/sdk-go v0.16.0 h1:Ui1jerkeLaNaJPu47xjOJ3lh+rJQgeJHD25ViQMzAMs=
450-
open-cluster-management.io/sdk-go v0.16.0/go.mod h1:TyOjZC5YxyM5BRNgwTmLuTbHXX6xXqzYBXllrfoVp9w=
447+
open-cluster-management.io/api v1.0.0 h1:54QllH9DTudCk6VrGt0q8CDsE3MghqJeTaTN4RHZpE0=
448+
open-cluster-management.io/api v1.0.0/go.mod h1:/OeqXycNBZQoe3WG6ghuWsMgsKGuMZrK8ZpsU6gWL0Y=
449+
open-cluster-management.io/sdk-go v1.0.0 h1:pIiAHM/hzV3rEw3LSMgZuAUiNgkBrn8hLxFvJM5frw0=
450+
open-cluster-management.io/sdk-go v1.0.0/go.mod h1:vkLwIDN9W+WBlrHgHxMl5ZoHRT+H5qOq3cXAk7U5AJc=
451451
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 h1:CPT0ExVicCzcpeN4baWEV2ko2Z/AsiZgEdwgcfwLgMo=
452452
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
453453
sigs.k8s.io/controller-runtime v0.20.2 h1:/439OZVxoEc02psi1h4QO3bHzTgu49bb347Xp4gW1pc=

‎pkg/addonmanager/cloudevents/manager.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,12 @@ import (
2222
"open-cluster-management.io/addon-framework/pkg/addonmanager"
2323
"open-cluster-management.io/addon-framework/pkg/index"
2424
workclientset "open-cluster-management.io/api/client/work/clientset/versioned"
25+
"open-cluster-management.io/sdk-go/pkg/cloudevents/clients/options"
26+
cloudeventswork "open-cluster-management.io/sdk-go/pkg/cloudevents/clients/work"
27+
"open-cluster-management.io/sdk-go/pkg/cloudevents/clients/work/source/codec"
28+
"open-cluster-management.io/sdk-go/pkg/cloudevents/clients/work/store"
2529
"open-cluster-management.io/sdk-go/pkg/cloudevents/constants"
2630
"open-cluster-management.io/sdk-go/pkg/cloudevents/generic"
27-
cloudeventswork "open-cluster-management.io/sdk-go/pkg/cloudevents/work"
28-
"open-cluster-management.io/sdk-go/pkg/cloudevents/work/source/codec"
29-
"open-cluster-management.io/sdk-go/pkg/cloudevents/work/store"
3031
)
3132

3233
// cloudeventsAddonManager is the implementation of AddonManager with
@@ -67,12 +68,11 @@ func (a *cloudeventsAddonManager) Start(ctx context.Context) error {
6768
return err
6869
}
6970

70-
clientHolder, err := cloudeventswork.NewClientHolderBuilder(clientConfig).
71-
WithClientID(a.options.CloudEventsClientID).
71+
clientOptions := options.NewGenericClientOptions(
72+
clientConfig, codec.NewManifestBundleCodec(), a.options.CloudEventsClientID).
7273
WithSourceID(a.options.SourceID).
73-
WithCodec(codec.NewManifestBundleCodec()).
74-
WithWorkClientWatcherStore(watcherStore).
75-
NewSourceClientHolder(ctx)
74+
WithClientWatcherStore(watcherStore)
75+
clientHolder, err := cloudeventswork.NewSourceClientHolder(ctx, clientOptions)
7676
if err != nil {
7777
return err
7878
}

‎test/integration/cloudevents/agent_deploy_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"context"
55
"encoding/json"
66
"fmt"
7-
"open-cluster-management.io/sdk-go/pkg/cloudevents/work"
7+
"open-cluster-management.io/sdk-go/pkg/cloudevents/clients/work"
88
"time"
99

1010
jsonpatch "github.com/evanphx/json-patch"

‎test/integration/cloudevents/agent_hook_deploy_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"context"
55
"encoding/json"
66
"fmt"
7-
"open-cluster-management.io/sdk-go/pkg/cloudevents/work"
7+
"open-cluster-management.io/sdk-go/pkg/cloudevents/clients/work"
88
"time"
99

1010
jsonpatch "github.com/evanphx/json-patch"

‎test/integration/cloudevents/agent_hosting_deploy_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"context"
55
"encoding/json"
66
"fmt"
7-
"open-cluster-management.io/sdk-go/pkg/cloudevents/work"
7+
"open-cluster-management.io/sdk-go/pkg/cloudevents/clients/work"
88
"time"
99

1010
jsonpatch "github.com/evanphx/json-patch"

‎test/integration/cloudevents/agent_hosting_hook_deploy_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"context"
55
"encoding/json"
66
"fmt"
7-
"open-cluster-management.io/sdk-go/pkg/cloudevents/work"
7+
"open-cluster-management.io/sdk-go/pkg/cloudevents/clients/work"
88
"time"
99

1010
jsonpatch "github.com/evanphx/json-patch"

‎test/integration/cloudevents/suite_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package cloudevents
33
import (
44
"context"
55
"fmt"
6+
"open-cluster-management.io/sdk-go/pkg/cloudevents/clients/options"
67
"os"
78
"path"
89
"path/filepath"
@@ -16,10 +17,10 @@ import (
1617
"github.com/onsi/gomega"
1718
"gopkg.in/yaml.v2"
1819
"open-cluster-management.io/addon-framework/pkg/addonmanager/constants"
20+
"open-cluster-management.io/sdk-go/pkg/cloudevents/clients/work"
21+
"open-cluster-management.io/sdk-go/pkg/cloudevents/clients/work/agent/codec"
1922
"open-cluster-management.io/sdk-go/pkg/cloudevents/generic/options/mqtt"
2023
"open-cluster-management.io/sdk-go/pkg/cloudevents/generic/types"
21-
"open-cluster-management.io/sdk-go/pkg/cloudevents/work"
22-
"open-cluster-management.io/sdk-go/pkg/cloudevents/work/agent/codec"
2324

2425
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2526
"k8s.io/apimachinery/pkg/runtime"
@@ -37,7 +38,7 @@ import (
3738
workinformers "open-cluster-management.io/api/client/work/informers/externalversions"
3839
workv1informers "open-cluster-management.io/api/client/work/informers/externalversions/work/v1"
3940
clusterv1 "open-cluster-management.io/api/cluster/v1"
40-
"open-cluster-management.io/sdk-go/pkg/cloudevents/work/store"
41+
"open-cluster-management.io/sdk-go/pkg/cloudevents/clients/work/store"
4142
)
4243

4344
const (
@@ -277,12 +278,11 @@ func startWorkAgent(ctx context.Context, clusterName string) (*work.ClientHolder
277278
}
278279
watcherStore := store.NewAgentInformerWatcherStore()
279280

280-
clientHolder, err := work.NewClientHolderBuilder(config).
281-
WithClientID(clusterName).
281+
clientOptions := options.NewGenericClientOptions(
282+
config, codec.NewManifestBundleCodec(), clusterName).
282283
WithClusterName(clusterName).
283-
WithCodec(codec.NewManifestBundleCodec()).
284-
WithWorkClientWatcherStore(watcherStore).
285-
NewAgentClientHolder(ctx)
284+
WithClientWatcherStore(watcherStore)
285+
clientHolder, err := work.NewAgentClientHolder(ctx, clientOptions)
286286
if err != nil {
287287
return nil, nil, err
288288
}

‎test/integration/kube/agent_deploy_test.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -996,6 +996,7 @@ var _ = ginkgo.Describe("Agent deploy", func() {
996996
},
997997
},
998998
},
999+
Conditions: []metav1.Condition{},
9991000
},
10001001
},
10011002
}

‎vendor/modules.txt‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# cel.dev/expr v0.18.0
1+
# cel.dev/expr v0.19.1
22
## explicit; go 1.21.1
33
cel.dev/expr
44
# cloud.google.com/go/compute/metadata v0.3.0
@@ -1409,8 +1409,8 @@ k8s.io/utils/path
14091409
k8s.io/utils/pointer
14101410
k8s.io/utils/ptr
14111411
k8s.io/utils/trace
1412-
# open-cluster-management.io/api v0.16.0
1413-
## explicit; go 1.22.0
1412+
# open-cluster-management.io/api v1.0.0
1413+
## explicit; go 1.23.6
14141414
open-cluster-management.io/api/addon/v1alpha1
14151415
open-cluster-management.io/api/client/addon/clientset/versioned
14161416
open-cluster-management.io/api/client/addon/clientset/versioned/fake
@@ -1465,13 +1465,27 @@ open-cluster-management.io/api/cluster/v1beta2
14651465
open-cluster-management.io/api/utils/work/v1/workapplier
14661466
open-cluster-management.io/api/work/v1
14671467
open-cluster-management.io/api/work/v1alpha1
1468-
# open-cluster-management.io/sdk-go v0.16.0
1469-
## explicit; go 1.22.0
1468+
# open-cluster-management.io/sdk-go v1.0.0
1469+
## explicit; go 1.23.6
14701470
open-cluster-management.io/sdk-go/pkg/apis/work/v1/applier
14711471
open-cluster-management.io/sdk-go/pkg/apis/work/v1/builder
14721472
open-cluster-management.io/sdk-go/pkg/apis/work/v1/validator
14731473
open-cluster-management.io/sdk-go/pkg/basecontroller/events
14741474
open-cluster-management.io/sdk-go/pkg/basecontroller/factory
1475+
open-cluster-management.io/sdk-go/pkg/cloudevents/clients/common
1476+
open-cluster-management.io/sdk-go/pkg/cloudevents/clients/errors
1477+
open-cluster-management.io/sdk-go/pkg/cloudevents/clients/options
1478+
open-cluster-management.io/sdk-go/pkg/cloudevents/clients/statushash
1479+
open-cluster-management.io/sdk-go/pkg/cloudevents/clients/store
1480+
open-cluster-management.io/sdk-go/pkg/cloudevents/clients/utils
1481+
open-cluster-management.io/sdk-go/pkg/cloudevents/clients/work
1482+
open-cluster-management.io/sdk-go/pkg/cloudevents/clients/work/agent/client
1483+
open-cluster-management.io/sdk-go/pkg/cloudevents/clients/work/agent/codec
1484+
open-cluster-management.io/sdk-go/pkg/cloudevents/clients/work/internal
1485+
open-cluster-management.io/sdk-go/pkg/cloudevents/clients/work/payload
1486+
open-cluster-management.io/sdk-go/pkg/cloudevents/clients/work/source/client
1487+
open-cluster-management.io/sdk-go/pkg/cloudevents/clients/work/source/codec
1488+
open-cluster-management.io/sdk-go/pkg/cloudevents/clients/work/store
14751489
open-cluster-management.io/sdk-go/pkg/cloudevents/constants
14761490
open-cluster-management.io/sdk-go/pkg/cloudevents/generic
14771491
open-cluster-management.io/sdk-go/pkg/cloudevents/generic/options
@@ -1483,20 +1497,6 @@ open-cluster-management.io/sdk-go/pkg/cloudevents/generic/options/kafka
14831497
open-cluster-management.io/sdk-go/pkg/cloudevents/generic/options/mqtt
14841498
open-cluster-management.io/sdk-go/pkg/cloudevents/generic/payload
14851499
open-cluster-management.io/sdk-go/pkg/cloudevents/generic/types
1486-
open-cluster-management.io/sdk-go/pkg/cloudevents/work
1487-
open-cluster-management.io/sdk-go/pkg/cloudevents/work/agent/client
1488-
open-cluster-management.io/sdk-go/pkg/cloudevents/work/agent/codec
1489-
open-cluster-management.io/sdk-go/pkg/cloudevents/work/agent/lister
1490-
open-cluster-management.io/sdk-go/pkg/cloudevents/work/common
1491-
open-cluster-management.io/sdk-go/pkg/cloudevents/work/errors
1492-
open-cluster-management.io/sdk-go/pkg/cloudevents/work/internal
1493-
open-cluster-management.io/sdk-go/pkg/cloudevents/work/payload
1494-
open-cluster-management.io/sdk-go/pkg/cloudevents/work/source/client
1495-
open-cluster-management.io/sdk-go/pkg/cloudevents/work/source/codec
1496-
open-cluster-management.io/sdk-go/pkg/cloudevents/work/source/lister
1497-
open-cluster-management.io/sdk-go/pkg/cloudevents/work/statushash
1498-
open-cluster-management.io/sdk-go/pkg/cloudevents/work/store
1499-
open-cluster-management.io/sdk-go/pkg/cloudevents/work/utils
15001500
open-cluster-management.io/sdk-go/pkg/patcher
15011501
# sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0
15021502
## explicit; go 1.21

0 commit comments

Comments
 (0)