Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: refactor parameters partI: add parameters group and api #8582

Merged
merged 10 commits into from
Feb 14, 2025

Conversation

sophon-zt
Copy link
Contributor

No description provided.

@sophon-zt sophon-zt requested review from a team, leon-inf and Y-Rookie as code owners December 4, 2024 10:29
@github-actions github-actions bot added the size/XXL Denotes a PR that changes 1000+ lines. label Dec 4, 2024
@sophon-zt sophon-zt force-pushed the support/improvement-parameters-api-part1 branch from 03253e6 to 6297fee Compare December 4, 2024 10:32
Copy link

codecov bot commented Dec 4, 2024

Codecov Report

Attention: Patch coverage is 53.79877% with 225 lines in your changes missing coverage. Please review.

Project coverage is 60.47%. Comparing base (d60b44d) to head (96c9448).
Report is 1 commits behind head on main.

Files with missing lines Patch % Lines
pkg/controllerutil/parameter_schema.go 0.00% 95 Missing ⚠️
pkg/controllerutil/config_util.go 0.00% 43 Missing ⚠️
...lers/parameters/parametersdefinition_controller.go 64.51% 24 Missing and 9 partials ⚠️
pkg/controller/configuration/parameter_utils.go 82.10% 12 Missing and 5 partials ⚠️
controllers/parameters/config_reconcile_wrapper.go 27.77% 13 Missing ⚠️
pkg/controller/configuration/resource_wrapper.go 0.00% 12 Missing ⚠️
...llers/parameters/paramconfigrenderer_controller.go 89.02% 6 Missing and 3 partials ⚠️
.../controller/builder/builder_component_parameter.go 85.00% 3 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #8582      +/-   ##
==========================================
+ Coverage   60.28%   60.47%   +0.19%     
==========================================
  Files         383      389       +6     
  Lines       46603    47084     +481     
==========================================
+ Hits        28093    28476     +383     
- Misses      15815    15890      +75     
- Partials     2695     2718      +23     
Flag Coverage Δ
unittests 60.47% <53.79%> (+0.19%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@sophon-zt sophon-zt force-pushed the support/improvement-parameters-api-part1 branch from de53cf4 to 2fca37e Compare December 11, 2024 06:59
@sophon-zt sophon-zt force-pushed the support/improvement-parameters-api-part1 branch from 9bca90e to 4f6ba57 Compare December 25, 2024 04:14
@shanshanying shanshanying added this to the Release 1.0.0 milestone Jan 3, 2025
@github-actions github-actions bot modified the milestones: Release 1.0.0, Release 0.9.3 Jan 14, 2025
@sophon-zt sophon-zt force-pushed the support/improvement-parameters-api-part1 branch from 4f6ba57 to 6e7f44d Compare February 14, 2025 07:00
@@ -195,14 +195,14 @@ var _ = BeforeSuite(func() {
}).SetupWithManager(k8sManager, nil)
Expect(err).ToNot(HaveOccurred())

err = (&configuration.ConfigConstraintReconciler{
err = (&parameters.ConfigConstraintReconciler{
Copy link
Contributor

@leon-inf leon-inf Feb 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remember to clean up these controllers and resources from the apps package finally.

@apecloud-bot apecloud-bot added approved PR Approved Test and removed approved PR Approved Test labels Feb 14, 2025
@sophon-zt sophon-zt force-pushed the support/improvement-parameters-api-part1 branch from bb402b5 to 96c9448 Compare February 14, 2025 08:41
@sophon-zt
Copy link
Contributor Author

/approve for test

@apecloud-bot apecloud-bot added the approved PR Approved Test label Feb 14, 2025
@sophon-zt sophon-zt merged commit fd29cfe into main Feb 14, 2025
35 checks passed
@sophon-zt sophon-zt deleted the support/improvement-parameters-api-part1 branch February 14, 2025 09:04
@sophon-zt
Copy link
Contributor Author

/cherry-pick release-1.0-beta

@apecloud-bot
Copy link
Collaborator

🤖 says: Error cherry-picking.

Auto-merging cmd/manager/main.go
Auto-merging controllers/apps/component/suite_test.go
Auto-merging controllers/apps/componentdefinition_controller.go
Auto-merging controllers/apps/sidecardefinition_controller.go
Auto-merging controllers/operations/suite_test.go
Auto-merging controllers/parameters/combine_upgrade_policy.go
Auto-merging controllers/parameters/combine_upgrade_policy_test.go
Auto-merging controllers/parameters/config_annotation.go
Auto-merging controllers/parameters/config_reconcile_wrapper.go
CONFLICT (content): Merge conflict in controllers/parameters/config_reconcile_wrapper.go
Auto-merging controllers/parameters/config_related_helper.go
Auto-merging controllers/parameters/config_util.go
Auto-merging controllers/parameters/config_util_test.go
Auto-merging controllers/parameters/configconstraint_controller.go
Auto-merging controllers/parameters/configconstraint_controller_test.go
Auto-merging controllers/parameters/configuration_controller.go
Auto-merging controllers/parameters/configuration_controller_test.go
Auto-merging controllers/parameters/configuration_test.go
Auto-merging controllers/parameters/parallel_upgrade_policy.go
Auto-merging controllers/parameters/parallel_upgrade_policy_test.go
Auto-merging controllers/parameters/policy_util.go
Auto-merging controllers/parameters/policy_util_test.go
Auto-merging controllers/parameters/reconcile_task.go
Auto-merging controllers/parameters/reconfigure_controller.go
Auto-merging controllers/parameters/reconfigure_controller_test.go
Auto-merging controllers/parameters/reconfigure_policy.go
Auto-merging controllers/parameters/relatedresource.go
Auto-merging controllers/parameters/revision.go
Auto-merging controllers/parameters/revision_test.go
Auto-merging controllers/parameters/rolling_upgrade_policy.go
Auto-merging controllers/parameters/simple_policy.go
Auto-merging controllers/parameters/simple_policy_test.go
Auto-merging controllers/parameters/suite_test.go
Auto-merging controllers/parameters/sync_upgrade_policy.go
Auto-merging controllers/parameters/sync_upgrade_policy_test.go
Auto-merging controllers/parameters/types.go
Auto-merging controllers/parameters/utils.go
Auto-merging controllers/trace/reconciler_tree.go
Auto-merging hack/client-sdk-gen.sh
Auto-merging pkg/client/clientset/versioned/clientset.go
Auto-merging pkg/client/clientset/versioned/fake/clientset_generated.go
Auto-merging pkg/client/clientset/versioned/fake/register.go
Auto-merging pkg/client/clientset/versioned/scheme/register.go
Auto-merging pkg/client/informers/externalversions/factory.go
Auto-merging pkg/client/informers/externalversions/generic.go
Auto-merging pkg/controller/configuration/resource_wrapper.go
Auto-merging pkg/controllerutil/config_util.go
Auto-merging pkg/generics/slices.go
Auto-merging pkg/generics/type.go
error: could not apply fd29cfe... chore: refactor parameters partI: add parameters group and api (#8582)
hint: After resolving the conflicts, mark them with
hint: "git add/rm ", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config advice.mergeConflict false"

@apecloud-bot
Copy link
Collaborator

🤖 says: ‼️ cherry pick action failed.
See: https://github.com/apecloud/kubeblocks/actions/runs/13325978655

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved PR Approved Test size/XXL Denotes a PR that changes 1000+ lines.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants