Skip to content

Commit b6058f1

Browse files
authored
Update deps of api and library to 0.14.0 (#532)
Signed-off-by: Jian Qiu <jqiu@redhat.com>
1 parent 41197e5 commit b6058f1

12 files changed

+20
-39
lines changed

deploy/cluster-manager/olm-catalog/latest/manifests/cluster-manager.clusterserviceversion.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ metadata:
5959
categories: Integration & Delivery,OpenShift Optional
6060
certified: "false"
6161
containerImage: quay.io/open-cluster-management/registration-operator:latest
62-
createdAt: "2024-06-19T00:22:24Z"
62+
createdAt: "2024-06-19T07:23:22Z"
6363
description: Manages the installation and upgrade of the ClusterManager.
6464
operators.operatorframework.io/builder: operator-sdk-v1.32.0
6565
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3

deploy/klusterlet/olm-catalog/latest/manifests/klusterlet.clusterserviceversion.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ metadata:
3131
categories: Integration & Delivery,OpenShift Optional
3232
certified: "false"
3333
containerImage: quay.io/open-cluster-management/registration-operator:latest
34-
createdAt: "2024-06-19T00:22:24Z"
34+
createdAt: "2024-06-19T07:23:23Z"
3535
description: Manages the installation and upgrade of the Klusterlet.
3636
operators.operatorframework.io/builder: operator-sdk-v1.32.0
3737
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3

go.mod

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ require (
3434
k8s.io/klog/v2 v2.120.1
3535
k8s.io/kube-aggregator v0.29.3
3636
k8s.io/utils v0.0.0-20240310230437-4693a0247e57
37-
open-cluster-management.io/addon-framework v0.9.1-0.20240617015910-660e21bcfd3b
38-
open-cluster-management.io/api v0.13.1-0.20240605083248-f9e7f50520fc
39-
open-cluster-management.io/sdk-go v0.13.1-0.20240618022514-b2c1dd175afd
37+
open-cluster-management.io/addon-framework v0.10.0
38+
open-cluster-management.io/api v0.14.0
39+
open-cluster-management.io/sdk-go v0.14.0
4040
sigs.k8s.io/controller-runtime v0.17.3
4141
sigs.k8s.io/kube-storage-version-migrator v0.0.6-0.20230721195810-5c8923c5ff96
4242
)

go.sum

+6-6
Original file line numberDiff line numberDiff line change
@@ -465,12 +465,12 @@ k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/A
465465
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA=
466466
k8s.io/utils v0.0.0-20240310230437-4693a0247e57 h1:gbqbevonBh57eILzModw6mrkbwM0gQBEuevE/AaBsHY=
467467
k8s.io/utils v0.0.0-20240310230437-4693a0247e57/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
468-
open-cluster-management.io/addon-framework v0.9.1-0.20240617015910-660e21bcfd3b h1:6M9IdEa71Qegl5HjaRcsuLAZvimIafweix2aUBzwot0=
469-
open-cluster-management.io/addon-framework v0.9.1-0.20240617015910-660e21bcfd3b/go.mod h1:HayKCznnlyW+0dUJQGj5sNR6i3tvylSySD3YnvZkBtY=
470-
open-cluster-management.io/api v0.13.1-0.20240605083248-f9e7f50520fc h1:tcfncubZRFphYtDXBE7ApBNlSnj1RNazhW+8F01XYYg=
471-
open-cluster-management.io/api v0.13.1-0.20240605083248-f9e7f50520fc/go.mod h1:ltijKJhDifrPH0csvCUmFt5lzaERv+BBfh6X3l83rT0=
472-
open-cluster-management.io/sdk-go v0.13.1-0.20240618022514-b2c1dd175afd h1:kTVZOR7bTdh4ID7EoliyGhPR5CItpx8GehN581IxoPA=
473-
open-cluster-management.io/sdk-go v0.13.1-0.20240618022514-b2c1dd175afd/go.mod h1:muWzHWsgK8IsopltwTnsBjf4DN9IcC9rF0G2uEq/Pjw=
468+
open-cluster-management.io/addon-framework v0.10.0 h1:bwI1XujcbkDoqlCFG1mKuwXNzoED4im/9/9BVu4xpRo=
469+
open-cluster-management.io/addon-framework v0.10.0/go.mod h1:HayKCznnlyW+0dUJQGj5sNR6i3tvylSySD3YnvZkBtY=
470+
open-cluster-management.io/api v0.14.0 h1:yjhnNeO/QudiIoEi0i/yUYmP3iElAfUgtj4pHMV+4uM=
471+
open-cluster-management.io/api v0.14.0/go.mod h1:ltijKJhDifrPH0csvCUmFt5lzaERv+BBfh6X3l83rT0=
472+
open-cluster-management.io/sdk-go v0.14.0 h1:wdnk9/qANruUKorggrMee7lavwvdP5Toks8WA6nVHlo=
473+
open-cluster-management.io/sdk-go v0.14.0/go.mod h1:muWzHWsgK8IsopltwTnsBjf4DN9IcC9rF0G2uEq/Pjw=
474474
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 h1:TgtAeesdhpm2SGwkQasmbeqDo8th5wOBA5h/AjTKA4I=
475475
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0/go.mod h1:VHVDI/KrK4fjnV61bE2g3sA7tiETLn8sooImelsCx3Y=
476476
sigs.k8s.io/controller-runtime v0.17.3 h1:65QmN7r3FWgTxDMz9fvGnO1kbf2nu+acg9p2R9oYYYk=

manifests/cluster-manager/hub/0000_01_addon.open-cluster-management.io_managedclusteraddons.crd.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,7 @@ spec:
314314
will use to create csr.
315315
maxLength: 571
316316
minLength: 5
317+
pattern: ^([a-z0-9][a-z0-9-]*[a-z0-9]\.)+[a-z]+\/[a-z0-9-\.]+$
317318
type: string
318319
subject:
319320
description: 'subject is the user subject of the addon agent

manifests/cluster-manager/hub/0000_03_addon.open-cluster-management.io_addontemplates.crd.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,7 @@ spec:
330330
agent will use to create csr.
331331
maxLength: 571
332332
minLength: 5
333+
pattern: ^([a-z0-9][a-z0-9-]*[a-z0-9]\.)+[a-z]+\/[a-z0-9-\.]+$
333334
type: string
334335
signingCA:
335336
description: 'SigningCA represents the reference of the

test/integration/registration/addon_registration_test.go

-25
Original file line numberDiff line numberDiff line change
@@ -211,17 +211,6 @@ var _ = ginkgo.Describe("Addon Registration", func() {
211211
return meta.IsStatusConditionTrue(addon.Status.Conditions, clientcert.ClusterCertificateRotatedCondition)
212212
}, eventuallyTimeout, eventuallyInterval).Should(gomega.BeTrue())
213213
}
214-
assertClientCertConditionFalse := func(clusterName, addonName string) {
215-
ginkgo.By("Check if clientcert addon status condition is false")
216-
gomega.Eventually(func() bool {
217-
addon, err := addOnClient.AddonV1alpha1().ManagedClusterAddOns(clusterName).
218-
Get(context.TODO(), addonName, metav1.GetOptions{})
219-
if err != nil {
220-
return false
221-
}
222-
return meta.IsStatusConditionFalse(addon.Status.Conditions, clientcert.ClusterCertificateRotatedCondition)
223-
}, eventuallyTimeout, eventuallyInterval).Should(gomega.BeTrue())
224-
}
225214

226215
assertHasNoAddonLabel := func(clusterName, addonName string) {
227216
ginkgo.By("Check if addon status label on managed cluster deleted")
@@ -392,20 +381,6 @@ var _ = ginkgo.Describe("Addon Registration", func() {
392381
assertSuccessAddOnBootstrap(signerName)
393382
})
394383

395-
ginkgo.It("should register addon failed with invalid custom signer", func() {
396-
assertSuccessClusterBootstrap()
397-
assertSuccessAddOnEnabling()
398-
assertAddOnSignerUpdate("addon-xxx")
399-
assertClientCertConditionFalse(managedClusterName, addOnName)
400-
401-
signerName := "example.com/signer1"
402-
assertAddOnSignerUpdate(signerName)
403-
assertSuccessCSRApproval()
404-
assertValidClientCertificate(addOnName, getSecretName(addOnName, signerName), signerName, expectedProxyURL)
405-
assertAddonLabel(managedClusterName, addOnName, "unreachable")
406-
assertClientCertCondition(managedClusterName, addOnName)
407-
})
408-
409384
ginkgo.It("should addon registraton config updated successfully", func() {
410385
assertSuccessClusterBootstrap()
411386
signerName := certificates.KubeAPIServerClientSignerName

vendor/modules.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1500,7 +1500,7 @@ k8s.io/utils/pointer
15001500
k8s.io/utils/ptr
15011501
k8s.io/utils/strings/slices
15021502
k8s.io/utils/trace
1503-
# open-cluster-management.io/addon-framework v0.9.1-0.20240617015910-660e21bcfd3b
1503+
# open-cluster-management.io/addon-framework v0.10.0
15041504
## explicit; go 1.21
15051505
open-cluster-management.io/addon-framework/pkg/addonfactory
15061506
open-cluster-management.io/addon-framework/pkg/addonmanager
@@ -1518,7 +1518,7 @@ open-cluster-management.io/addon-framework/pkg/basecontroller/events
15181518
open-cluster-management.io/addon-framework/pkg/basecontroller/factory
15191519
open-cluster-management.io/addon-framework/pkg/index
15201520
open-cluster-management.io/addon-framework/pkg/utils
1521-
# open-cluster-management.io/api v0.13.1-0.20240605083248-f9e7f50520fc
1521+
# open-cluster-management.io/api v0.14.0
15221522
## explicit; go 1.21
15231523
open-cluster-management.io/api/addon/v1alpha1
15241524
open-cluster-management.io/api/client/addon/clientset/versioned
@@ -1589,7 +1589,7 @@ open-cluster-management.io/api/utils/work/v1/workapplier
15891589
open-cluster-management.io/api/utils/work/v1/workvalidator
15901590
open-cluster-management.io/api/work/v1
15911591
open-cluster-management.io/api/work/v1alpha1
1592-
# open-cluster-management.io/sdk-go v0.13.1-0.20240618022514-b2c1dd175afd
1592+
# open-cluster-management.io/sdk-go v0.14.0
15931593
## explicit; go 1.21
15941594
open-cluster-management.io/sdk-go/pkg/apis/cluster/v1alpha1
15951595
open-cluster-management.io/sdk-go/pkg/apis/cluster/v1beta1

vendor/open-cluster-management.io/api/addon/v1alpha1/0000_01_addon.open-cluster-management.io_managedclusteraddons.crd.yaml

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/open-cluster-management.io/api/addon/v1alpha1/0000_03_addon.open-cluster-management.io_addontemplates.crd.yaml

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/open-cluster-management.io/api/addon/v1alpha1/types_addontemplate.go

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/open-cluster-management.io/api/addon/v1alpha1/types_managedclusteraddon.go

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)