From e47b5b910e37fe83ab331291f32d22a04b7117ea Mon Sep 17 00:00:00 2001 From: jairui <32926461+jairuigou@users.noreply.github.com> Date: Thu, 21 Dec 2023 16:56:21 +0800 Subject: [PATCH] chore: bump kubeblocks version to v0.8.0-beta.15 (#132) (cherry picked from commit 02711a167ca5b39fd9abe04a1288b694ece79ceb) --- go.mod | 2 +- go.sum | 7 ++++--- pkg/testing/fake.go | 6 ++---- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index a5dd4bed2..eca523900 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/Masterminds/semver/v3 v3.2.1 github.com/StudioSol/set v1.0.0 github.com/apecloud/kubebench v0.0.0-20230807061913-16124b86637f - github.com/apecloud/kubeblocks v0.8.0-beta.0 + github.com/apecloud/kubeblocks v0.8.0-beta.15 github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 github.com/benbjohnson/clock v1.3.5 github.com/briandowns/spinner v1.23.0 diff --git a/go.sum b/go.sum index d666bf352..8fcaf6a3f 100644 --- a/go.sum +++ b/go.sum @@ -278,8 +278,8 @@ github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df h github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df/go.mod h1:pSwJ0fSY5KhvocuWSx4fz3BA8OrA1bQn+K1Eli3BRwM= github.com/apecloud/kubebench v0.0.0-20230807061913-16124b86637f h1:cQz3dMsNSlEBPl9WFxxAhPP+VAOmaWruQlEdaWwZeZY= github.com/apecloud/kubebench v0.0.0-20230807061913-16124b86637f/go.mod h1:pk7XhTJO9+AVE0mGUGb0WfU8ME9o4s3nClyuWATMQAQ= -github.com/apecloud/kubeblocks v0.8.0-beta.0 h1:PX9ogpAS4iqOQuH4DdI6XNIITq/5eiPvH45QAWw0lWc= -github.com/apecloud/kubeblocks v0.8.0-beta.0/go.mod h1:A4vBIOnpL7p1tYzPwsYC+DiLPI8wbCRUnc13WbUN7+k= +github.com/apecloud/kubeblocks v0.8.0-beta.15 h1:SntfqebYay8y2wXbOg7ineDH+RlleMEohGFT3bic6D4= +github.com/apecloud/kubeblocks v0.8.0-beta.15/go.mod h1:8WEh5JNVnLMXOqdP8PUz4sB9/MkfyMORpbsqaQKdh0E= github.com/apparentlymart/go-textseg v1.0.0/go.mod h1:z96Txxhf3xSFMPmb5X/1W05FF/Nj9VFpLOpjS5yuumk= github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod h1:ZK2fH7c4NqDTLtiYLvIkEghdlcqw7yxLeM89kiTRPUo= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= @@ -982,8 +982,9 @@ github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 h1:iQTw/8FWTuc7uia github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8= github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4= github.com/karrick/godirwalk v1.10.3/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA= -github.com/karrick/godirwalk v1.16.1 h1:DynhcF+bztK8gooS0+NDJFrdNZjJ3gzVzC545UNA9iw= github.com/karrick/godirwalk v1.16.1/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk= +github.com/karrick/godirwalk v1.17.0 h1:b4kY7nqDdioR/6qnbHQyDvmA17u5G1cZ6J+CZXwSWoI= +github.com/karrick/godirwalk v1.17.0/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk= github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4= github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= diff --git a/pkg/testing/fake.go b/pkg/testing/fake.go index 74bcdff82..3dc6759c3 100644 --- a/pkg/testing/fake.go +++ b/pkg/testing/fake.go @@ -413,15 +413,13 @@ func FakeCompDef() *appsv1alpha1.ComponentDefinition { }, }, LifecycleActions: &appsv1alpha1.ComponentLifecycleActions{ - PostStart: nil, - PreStop: nil, - RoleProbe: &appsv1alpha1.RoleProbeSpec{ + RoleProbe: &appsv1alpha1.RoleProbe{ LifecycleActionHandler: *defaultLifecycleActionHandler, FailureThreshold: 3, PeriodSeconds: 1, TimeoutSeconds: 5, }, - Switchover: &appsv1alpha1.ComponentSwitchoverSpec{ + Switchover: &appsv1alpha1.ComponentSwitchover{ WithCandidate: &appsv1alpha1.Action{ Image: commandExecutorEnvItem.Image, Env: commandExecutorEnvItem.Env,