Skip to content

Commit cf85135

Browse files
qiujian16qiujian16
committed
Bump ocm api and sdk-go to v0.16.0
Signed-off-by: Jian Qiu <[email protected]>
1 parent b2865de commit cf85135

File tree

38 files changed

+803
-894
lines changed

38 files changed

+803
-894
lines changed

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ require (
2222
k8s.io/component-base v0.30.2
2323
k8s.io/klog/v2 v2.120.1
2424
k8s.io/utils v0.0.0-20240310230437-4693a0247e57
25-
open-cluster-management.io/api v0.15.1-0.20250109024121-1a5e25a78a43
26-
open-cluster-management.io/sdk-go v0.15.0
25+
open-cluster-management.io/api v0.16.0
26+
open-cluster-management.io/sdk-go v0.16.0
2727
sigs.k8s.io/controller-runtime v0.18.4
2828
)
2929

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -474,10 +474,10 @@ k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7F
474474
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98=
475475
k8s.io/utils v0.0.0-20240310230437-4693a0247e57 h1:gbqbevonBh57eILzModw6mrkbwM0gQBEuevE/AaBsHY=
476476
k8s.io/utils v0.0.0-20240310230437-4693a0247e57/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
477-
open-cluster-management.io/api v0.15.1-0.20250109024121-1a5e25a78a43 h1:9kgKRQQHMGNM1t+J+OrmF7hgZmND9kRwyRVnHIULzqw=
478-
open-cluster-management.io/api v0.15.1-0.20250109024121-1a5e25a78a43/go.mod h1:9erZEWEn4bEqh0nIX2wA7f/s3KCuFycQdBrPrRzi0QM=
479-
open-cluster-management.io/sdk-go v0.15.0 h1:2IAJnPfUoY6rPC5w7LhqAnvIlgekPoVW03LdZO1unIM=
480-
open-cluster-management.io/sdk-go v0.15.0/go.mod h1:fi5WBsbC5K3txKb8eRLuP0Sim/Oqz/PHX18skAEyjiA=
477+
open-cluster-management.io/api v0.16.0 h1:fToANqblBmWCn8f6JD4uRHFYJVVaN/usp9PeiRhex1s=
478+
open-cluster-management.io/api v0.16.0/go.mod h1:9erZEWEn4bEqh0nIX2wA7f/s3KCuFycQdBrPrRzi0QM=
479+
open-cluster-management.io/sdk-go v0.16.0 h1:Ui1jerkeLaNaJPu47xjOJ3lh+rJQgeJHD25ViQMzAMs=
480+
open-cluster-management.io/sdk-go v0.16.0/go.mod h1:TyOjZC5YxyM5BRNgwTmLuTbHXX6xXqzYBXllrfoVp9w=
481481
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 h1:/U5vjBbQn3RChhv7P11uhYvCSm5G2GaIi5AIGBS6r4c=
482482
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0/go.mod h1:z7+wmGM2dfIiLRfrC6jb5kV2Mq/sK1ZP303cxzkV5Y4=
483483
sigs.k8s.io/controller-runtime v0.18.4 h1:87+guW1zhvuPLh1PHybKdYFLU0YJp4FhJRmiHvm5BZw=

‎pkg/addonmanager/cloudevents/manager.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ func (a *cloudeventsAddonManager) Start(ctx context.Context) error {
7070
clientHolder, err := cloudeventswork.NewClientHolderBuilder(clientConfig).
7171
WithClientID(a.options.CloudEventsClientID).
7272
WithSourceID(a.options.SourceID).
73-
WithCodecs(codec.NewManifestBundleCodec()).
73+
WithCodec(codec.NewManifestBundleCodec()).
7474
WithWorkClientWatcherStore(watcherStore).
7575
NewSourceClientHolder(ctx)
7676
if err != nil {
@@ -143,7 +143,7 @@ func (a *cloudeventsAddonManager) Start(ctx context.Context) error {
143143

144144
// For cloudevents work client, we use the informer store as the client store
145145
if watcherStore != nil {
146-
watcherStore.SetStore(workInformers.Informer().GetStore())
146+
watcherStore.SetInformer(workInformers.Informer())
147147
}
148148

149149
// addonDeployController

‎test/e2e/helloworld_helm_test.go‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -145,20 +145,6 @@ var _ = ginkgo.Describe("install/uninstall helloworld helm addons", func() {
145145
})
146146

147147
ginkgo.It("addon should be available", func() {
148-
ginkgo.By("Make sure cma annotation managed by addon-manager is added")
149-
gomega.Eventually(func() error {
150-
cma, err := hubAddOnClient.AddonV1alpha1().ClusterManagementAddOns().Get(context.Background(), helloWorldHelmAddonName, metav1.GetOptions{})
151-
if err != nil {
152-
return err
153-
}
154-
155-
if cma.Annotations[addonapiv1alpha1.AddonLifecycleAnnotationKey] != addonapiv1alpha1.AddonLifecycleAddonManagerAnnotationValue {
156-
return fmt.Errorf("addon should have annotation, but get %v", cma.Annotations)
157-
}
158-
159-
return nil
160-
}, eventuallyTimeout, eventuallyInterval).ShouldNot(gomega.HaveOccurred())
161-
162148
ginkgo.By("Make sure addon is available and has pre-delete finalizer")
163149
gomega.Eventually(func() error {
164150
addon, err := hubAddOnClient.AddonV1alpha1().ManagedClusterAddOns(managedClusterName).Get(context.Background(), helloWorldHelmAddonName, metav1.GetOptions{})

‎test/e2e/helloworld_test.go‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -103,20 +103,6 @@ var _ = ginkgo.Describe("install/uninstall helloworld addons", func() {
103103
})
104104

105105
ginkgo.It("addon should be worked", func() {
106-
ginkgo.By("Make sure cma annotation managed by addon-manager is added")
107-
gomega.Eventually(func() error {
108-
cma, err := hubAddOnClient.AddonV1alpha1().ClusterManagementAddOns().Get(context.Background(), addonName, metav1.GetOptions{})
109-
if err != nil {
110-
return err
111-
}
112-
113-
if cma.Annotations[addonapiv1alpha1.AddonLifecycleAnnotationKey] != addonapiv1alpha1.AddonLifecycleAddonManagerAnnotationValue {
114-
return fmt.Errorf("addon should have annotation, but get %v", cma.Annotations)
115-
}
116-
117-
return nil
118-
}, eventuallyTimeout, eventuallyInterval).ShouldNot(gomega.HaveOccurred())
119-
120106
ginkgo.By("Make sure addon is available")
121107
gomega.Eventually(func() error {
122108
addon, err := hubAddOnClient.AddonV1alpha1().ManagedClusterAddOns(managedClusterName).Get(context.Background(), addonName, metav1.GetOptions{})

‎test/integration/cloudevents/suite_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ func startWorkAgent(ctx context.Context, clusterName string) (*work.ClientHolder
277277
clientHolder, err := work.NewClientHolderBuilder(config).
278278
WithClientID(clusterName).
279279
WithClusterName(clusterName).
280-
WithCodecs(codec.NewManifestBundleCodec()).
280+
WithCodec(codec.NewManifestBundleCodec()).
281281
WithWorkClientWatcherStore(watcherStore).
282282
NewAgentClientHolder(ctx)
283283
if err != nil {
@@ -291,7 +291,7 @@ func startWorkAgent(ctx context.Context, clusterName string) (*work.ClientHolder
291291

292292
// For cloudevents work client, we use the informer store as the client store
293293
if watcherStore != nil {
294-
watcherStore.SetStore(workInformers.Informer().GetStore())
294+
watcherStore.SetInformer(workInformers.Informer())
295295
}
296296

297297
go workInformers.Informer().Run(ctx.Done())

‎vendor/modules.txt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1372,7 +1372,7 @@ k8s.io/utils/pointer
13721372
k8s.io/utils/ptr
13731373
k8s.io/utils/strings/slices
13741374
k8s.io/utils/trace
1375-
# open-cluster-management.io/api v0.15.1-0.20250109024121-1a5e25a78a43
1375+
# open-cluster-management.io/api v0.16.0
13761376
## explicit; go 1.22.0
13771377
open-cluster-management.io/api/addon/v1alpha1
13781378
open-cluster-management.io/api/client/addon/clientset/versioned
@@ -1425,12 +1425,10 @@ open-cluster-management.io/api/cluster/v1
14251425
open-cluster-management.io/api/cluster/v1alpha1
14261426
open-cluster-management.io/api/cluster/v1beta1
14271427
open-cluster-management.io/api/cluster/v1beta2
1428-
open-cluster-management.io/api/utils/work/v1/utils
14291428
open-cluster-management.io/api/utils/work/v1/workapplier
1430-
open-cluster-management.io/api/utils/work/v1/workvalidator
14311429
open-cluster-management.io/api/work/v1
14321430
open-cluster-management.io/api/work/v1alpha1
1433-
# open-cluster-management.io/sdk-go v0.15.0
1431+
# open-cluster-management.io/sdk-go v0.16.0
14341432
## explicit; go 1.22.0
14351433
open-cluster-management.io/sdk-go/pkg/apis/work/v1/applier
14361434
open-cluster-management.io/sdk-go/pkg/apis/work/v1/builder
@@ -1459,6 +1457,7 @@ open-cluster-management.io/sdk-go/pkg/cloudevents/work/payload
14591457
open-cluster-management.io/sdk-go/pkg/cloudevents/work/source/client
14601458
open-cluster-management.io/sdk-go/pkg/cloudevents/work/source/codec
14611459
open-cluster-management.io/sdk-go/pkg/cloudevents/work/source/lister
1460+
open-cluster-management.io/sdk-go/pkg/cloudevents/work/statushash
14621461
open-cluster-management.io/sdk-go/pkg/cloudevents/work/store
14631462
open-cluster-management.io/sdk-go/pkg/cloudevents/work/utils
14641463
open-cluster-management.io/sdk-go/pkg/patcher

‎vendor/open-cluster-management.io/api/utils/work/v1/utils/utils.go‎

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

‎vendor/open-cluster-management.io/api/utils/work/v1/workvalidator/validator.go‎

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

0 commit comments

Comments
 (0)