Skip to content

Commit 524631b

Browse files
qiujian16qiujian16
committed
Bump api/sdk-go/addon-framework to v0.16
Signed-off-by: Jian Qiu <[email protected]>
1 parent edec4fd commit 524631b

35 files changed

+488
-814
lines changed

‎go.mod

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ require (
3535
k8s.io/klog/v2 v2.130.1
3636
k8s.io/kube-aggregator v0.31.4
3737
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6
38-
open-cluster-management.io/addon-framework v0.11.1-0.20250303151103-b2865de5c39b
39-
open-cluster-management.io/api v0.15.1-0.20250226073118-8c9793267c9e
40-
open-cluster-management.io/sdk-go v0.15.1-0.20241125015855-1536c3970f8f
38+
open-cluster-management.io/addon-framework v0.12.0
39+
open-cluster-management.io/api v0.16.1
40+
open-cluster-management.io/sdk-go v0.16.0
4141
sigs.k8s.io/cluster-inventory-api v0.0.0-20240730014211-ef0154379848
4242
sigs.k8s.io/controller-runtime v0.19.3
4343
sigs.k8s.io/kube-storage-version-migrator v0.0.6-0.20230721195810-5c8923c5ff96

‎go.sum

+6-6
Original file line numberDiff line numberDiff line change
@@ -487,12 +487,12 @@ k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7F
487487
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98=
488488
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6 h1:MDF6h2H/h4tbzmtIKTuctcwZmY0tY9mD9fNT47QO6HI=
489489
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
490-
open-cluster-management.io/addon-framework v0.11.1-0.20250303151103-b2865de5c39b h1:vEemE32F9iiVvKfFsFEdiyGdDnSb9Cp9Dch2Jkc4Nfg=
491-
open-cluster-management.io/addon-framework v0.11.1-0.20250303151103-b2865de5c39b/go.mod h1:3+UAkReHIEyqsDuq0Iv5w+ZRgZr254iehYV/JR2j038=
492-
open-cluster-management.io/api v0.15.1-0.20250226073118-8c9793267c9e h1:4iQneGfxartfFSR+IHZRrjEuwtRpiHyKQ15Kd33YCVk=
493-
open-cluster-management.io/api v0.15.1-0.20250226073118-8c9793267c9e/go.mod h1:9erZEWEn4bEqh0nIX2wA7f/s3KCuFycQdBrPrRzi0QM=
494-
open-cluster-management.io/sdk-go v0.15.1-0.20241125015855-1536c3970f8f h1:zeC7QrFNarfK2zY6jGtd+mX+yDrQQmnH/J8A7n5Nh38=
495-
open-cluster-management.io/sdk-go v0.15.1-0.20241125015855-1536c3970f8f/go.mod h1:fi5WBsbC5K3txKb8eRLuP0Sim/Oqz/PHX18skAEyjiA=
490+
open-cluster-management.io/addon-framework v0.12.0 h1:5j7mpyk2ij0SLUZkwWk0KkNTWtsid2w7BIHmhm0Ecok=
491+
open-cluster-management.io/addon-framework v0.12.0/go.mod h1:eReMWXrEHqtilwz5wzEpUrWw9Vfz0HJCH9pi3gOTZns=
492+
open-cluster-management.io/api v0.16.1 h1:mS+4UGxHLPQd7CRM0gdFQdVaz139Lo2bkLfqSE0CDNU=
493+
open-cluster-management.io/api v0.16.1/go.mod h1:9erZEWEn4bEqh0nIX2wA7f/s3KCuFycQdBrPrRzi0QM=
494+
open-cluster-management.io/sdk-go v0.16.0 h1:Ui1jerkeLaNaJPu47xjOJ3lh+rJQgeJHD25ViQMzAMs=
495+
open-cluster-management.io/sdk-go v0.16.0/go.mod h1:TyOjZC5YxyM5BRNgwTmLuTbHXX6xXqzYBXllrfoVp9w=
496496
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 h1:2770sDpzrjjsAtVhSeUFseziht227YAWYHLGNM8QPwY=
497497
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
498498
sigs.k8s.io/cluster-inventory-api v0.0.0-20240730014211-ef0154379848 h1:WYPi2PdQyZwZkHG648v2jQl6deyCgyjJ0fkLYgUJ618=

‎pkg/work/hub/manager.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ func (c *WorkHubManagerConfig) RunWorkHubManager(ctx context.Context, controller
9999
clientHolder, err := work.NewClientHolderBuilder(config).
100100
WithClientID(c.workOptions.CloudEventsClientID).
101101
WithSourceID(sourceID).
102-
WithCodecs(codec.NewManifestBundleCodec()).
102+
WithCodec(codec.NewManifestBundleCodec()).
103103
WithWorkClientWatcherStore(watcherStore).
104104
NewSourceClientHolder(ctx)
105105
if err != nil {

‎pkg/work/spoke/options.go

-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ import (
77
)
88

99
const (
10-
manifestBundleCodecName = "manifestbundle"
11-
manifestCodecName = "manifest"
12-
1310
defaultUserAgent = "work-agent"
1411
)
1512

‎pkg/work/spoke/spokeagent.go

+1-16
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import (
1818
workinformers "open-cluster-management.io/api/client/work/informers/externalversions"
1919
workv1informers "open-cluster-management.io/api/client/work/informers/externalversions/work/v1"
2020
ocmfeature "open-cluster-management.io/api/feature"
21-
workv1 "open-cluster-management.io/api/work/v1"
2221
"open-cluster-management.io/sdk-go/pkg/cloudevents/generic"
2322
cloudeventswork "open-cluster-management.io/sdk-go/pkg/cloudevents/work"
2423
"open-cluster-management.io/sdk-go/pkg/cloudevents/work/agent/codec"
@@ -194,20 +193,6 @@ func (o *WorkAgentConfig) RunWorkloadAgent(ctx context.Context, controllerContex
194193
return nil
195194
}
196195

197-
func buildCodecs(codecNames []string, restMapper meta.RESTMapper) []generic.Codec[*workv1.ManifestWork] {
198-
var codecs []generic.Codec[*workv1.ManifestWork]
199-
for _, name := range codecNames {
200-
if name == manifestBundleCodecName {
201-
codecs = append(codecs, codec.NewManifestBundleCodec())
202-
}
203-
204-
if name == manifestCodecName {
205-
codecs = append(codecs, codec.NewManifestCodec(restMapper))
206-
}
207-
}
208-
return codecs
209-
}
210-
211196
func (o *WorkAgentConfig) newWorkClientAndInformer(
212197
ctx context.Context,
213198
restMapper meta.RESTMapper,
@@ -244,7 +229,7 @@ func (o *WorkAgentConfig) newWorkClientAndInformer(
244229
clientHolder, err := cloudeventswork.NewClientHolderBuilder(config).
245230
WithClientID(o.workOptions.CloudEventsClientID).
246231
WithClusterName(o.agentOptions.SpokeClusterName).
247-
WithCodecs(buildCodecs(o.workOptions.CloudEventsClientCodecs, restMapper)...).
232+
WithCodec(codec.NewManifestBundleCodec()).
248233
WithWorkClientWatcherStore(watcherStore).
249234
NewAgentClientHolder(ctx)
250235
if err != nil {

‎test/integration/work/suite_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ var _ = ginkgo.BeforeSuite(func() {
146146
sourceClient, err := work.NewClientHolderBuilder(util.NewMQTTSourceOptions(sourceID)).
147147
WithClientID(fmt.Sprintf("%s-%s", sourceID, rand.String(5))).
148148
WithSourceID(sourceID).
149-
WithCodecs(sourcecodec.NewManifestBundleCodec()).
149+
WithCodec(sourcecodec.NewManifestBundleCodec()).
150150
WithWorkClientWatcherStore(watcherStore).
151151
NewSourceClientHolder(envCtx)
152152
gomega.Expect(err).ToNot(gomega.HaveOccurred())

‎vendor/modules.txt

+4-5
Original file line numberDiff line numberDiff line change
@@ -1692,7 +1692,7 @@ k8s.io/utils/pointer
16921692
k8s.io/utils/ptr
16931693
k8s.io/utils/strings/slices
16941694
k8s.io/utils/trace
1695-
# open-cluster-management.io/addon-framework v0.11.1-0.20250303151103-b2865de5c39b
1695+
# open-cluster-management.io/addon-framework v0.12.0
16961696
## explicit; go 1.22.0
16971697
open-cluster-management.io/addon-framework/pkg/addonfactory
16981698
open-cluster-management.io/addon-framework/pkg/addonmanager
@@ -1708,7 +1708,7 @@ open-cluster-management.io/addon-framework/pkg/agent
17081708
open-cluster-management.io/addon-framework/pkg/assets
17091709
open-cluster-management.io/addon-framework/pkg/index
17101710
open-cluster-management.io/addon-framework/pkg/utils
1711-
# open-cluster-management.io/api v0.15.1-0.20250226073118-8c9793267c9e
1711+
# open-cluster-management.io/api v0.16.1
17121712
## explicit; go 1.22.0
17131713
open-cluster-management.io/api/addon/v1alpha1
17141714
open-cluster-management.io/api/client/addon/clientset/versioned
@@ -1774,12 +1774,10 @@ open-cluster-management.io/api/cluster/v1beta2
17741774
open-cluster-management.io/api/crdsv1beta1
17751775
open-cluster-management.io/api/feature
17761776
open-cluster-management.io/api/operator/v1
1777-
open-cluster-management.io/api/utils/work/v1/utils
17781777
open-cluster-management.io/api/utils/work/v1/workapplier
1779-
open-cluster-management.io/api/utils/work/v1/workvalidator
17801778
open-cluster-management.io/api/work/v1
17811779
open-cluster-management.io/api/work/v1alpha1
1782-
# open-cluster-management.io/sdk-go v0.15.1-0.20241125015855-1536c3970f8f
1780+
# open-cluster-management.io/sdk-go v0.16.0
17831781
## explicit; go 1.22.0
17841782
open-cluster-management.io/sdk-go/pkg/apis/cluster/v1alpha1
17851783
open-cluster-management.io/sdk-go/pkg/apis/cluster/v1beta1
@@ -1812,6 +1810,7 @@ open-cluster-management.io/sdk-go/pkg/cloudevents/work/payload
18121810
open-cluster-management.io/sdk-go/pkg/cloudevents/work/source/client
18131811
open-cluster-management.io/sdk-go/pkg/cloudevents/work/source/codec
18141812
open-cluster-management.io/sdk-go/pkg/cloudevents/work/source/lister
1813+
open-cluster-management.io/sdk-go/pkg/cloudevents/work/statushash
18151814
open-cluster-management.io/sdk-go/pkg/cloudevents/work/store
18161815
open-cluster-management.io/sdk-go/pkg/cloudevents/work/utils
18171816
open-cluster-management.io/sdk-go/pkg/helpers

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

-76
This file was deleted.

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

-64
This file was deleted.

0 commit comments

Comments
 (0)