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: update copyright for 2025 #8856

Merged
merged 2 commits into from
Jan 23, 2025
Merged

Conversation

ldming
Copy link
Collaborator

@ldming ldming commented Jan 23, 2025

No description provided.

Verified

This commit was signed with the committer’s verified signature. The key has expired.
sbeitzel Stephen Beitzel
@github-actions github-actions bot added the size/XXL Denotes a PR that changes 1000+ lines. label Jan 23, 2025
@apecloud-bot apecloud-bot added the approved PR Approved Test label Jan 23, 2025

Verified

This commit was signed with the committer’s verified signature. The key has expired.
sbeitzel Stephen Beitzel
@apecloud-bot apecloud-bot removed the approved PR Approved Test label Jan 23, 2025
@apecloud-bot apecloud-bot added the approved PR Approved Test label Jan 23, 2025
Copy link

codecov bot commented Jan 23, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 60.43%. Comparing base (532406f) to head (1a5f1ee).
Report is 3 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #8856      +/-   ##
==========================================
+ Coverage   60.26%   60.43%   +0.16%     
==========================================
  Files         382      382              
  Lines       46259    46259              
==========================================
+ Hits        27880    27955      +75     
+ Misses      15700    15627      -73     
+ Partials     2679     2677       -2     
Flag Coverage Δ
unittests 60.43% <ø> (+0.16%) ⬆️

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.

@ldming ldming merged commit 851f1b8 into main Jan 23, 2025
37 checks passed
@ldming ldming deleted the support/update-copyright-for-2025 branch January 23, 2025 09:39
@github-actions github-actions bot added this to the Release 0.9.3 milestone Jan 23, 2025
@JashBook
Copy link
Collaborator

/cherry-pick release-1.0-beta

@apecloud-bot
Copy link
Collaborator

🤖 says: Error cherry-picking.

Auto-merging apis/apps/v1/cluster_types.go
Auto-merging apis/apps/v1/component_types.go
Auto-merging apis/apps/v1/componentdefinition_types.go
Auto-merging apis/apps/v1/types.go
Auto-merging apis/apps/v1/zz_generated.deepcopy.go
Auto-merging apis/apps/v1alpha1/cluster_types.go
Auto-merging apis/apps/v1alpha1/zz_generated.deepcopy.go
Auto-merging apis/operations/v1alpha1/opsrequest_types.go
Auto-merging apis/operations/v1alpha1/opsrequest_validation.go
Auto-merging apis/operations/v1alpha1/zz_generated.deepcopy.go
Auto-merging apis/workloads/v1/instanceset_types.go
Auto-merging apis/workloads/v1/zz_generated.deepcopy.go
Auto-merging apis/workloads/v1alpha1/instanceset_conversion.go
Auto-merging cmd/cmd.mk
Auto-merging controllers/apps/cluster/transformer_cluster_component.go
Auto-merging controllers/apps/cluster/transformer_cluster_deletion.go
Auto-merging controllers/apps/cluster/transformer_cluster_sharding_account.go
Auto-merging controllers/apps/cluster/transformer_cluster_sharding_tls.go
Auto-merging controllers/apps/component/component_controller.go
Auto-merging controllers/apps/component/component_controller_test.go
Auto-merging controllers/apps/component/transformer_component_account.go
Auto-merging controllers/apps/component/transformer_component_configuration.go
Auto-merging controllers/apps/component/transformer_component_deletion.go
Auto-merging controllers/apps/component/transformer_component_tls.go
Auto-merging controllers/apps/component/transformer_component_tls_test.go
Auto-merging controllers/apps/component/transformer_component_workload.go
Auto-merging controllers/apps/component/utils.go
Auto-merging controllers/apps/componentdefinition_controller_test.go
Auto-merging controllers/apps/configuration/config_reconcile_wrapper.go
Auto-merging controllers/apps/configuration/config_util.go
Auto-merging controllers/apps/configuration/configuration_controller.go
Auto-merging controllers/apps/configuration/configuration_controller_test.go
Auto-merging controllers/apps/configuration/configuration_test.go
Auto-merging controllers/apps/configuration/reconcile_task.go
Auto-merging controllers/apps/configuration/reconfigure_controller.go
Auto-merging controllers/apps/configuration/reconfigure_policy.go
Auto-merging controllers/apps/configuration/relatedresource.go
Auto-merging controllers/dataprotection/backup_controller.go
Auto-merging controllers/dataprotection/backup_controller_test.go
Auto-merging controllers/dataprotection/utils.go
Auto-merging controllers/operations/opsrequest_controller_test.go
Auto-merging controllers/trace/informer_manager.go
Auto-merging controllers/trace/object_tree_root_finder.go
Auto-merging pkg/common/password.go
Auto-merging pkg/common/password_test.go
Auto-merging pkg/configuration/config_manager/builder.go
Auto-merging pkg/configuration/config_manager/builder_test.go
Auto-merging pkg/configuration/core/config_patch_test.go
Auto-merging pkg/configuration/core/config_test.go
Auto-merging pkg/controller/builder/builder_component.go
Auto-merging pkg/controller/builder/builder_configuration.go
Auto-merging pkg/controller/builder/builder_instance_set.go
Auto-merging pkg/controller/builder/builder_instance_set_test.go
Auto-merging pkg/controller/component/component.go
CONFLICT (modify/delete): pkg/controller/component/convertor.go deleted in HEAD and modified in 851f1b8 (chore: update copyright for 2025 (#8856)). Version 851f1b8 (chore: update copyright for 2025 (#8856)) of pkg/controller/component/convertor.go left in tree.
CONFLICT (modify/delete): pkg/controller/component/its_convertor.go deleted in HEAD and modified in 851f1b8 (chore: update copyright for 2025 (#8856)). Version 851f1b8 (chore: update copyright for 2025 (#8856)) of pkg/controller/component/its_convertor.go left in tree.
Auto-merging pkg/controller/component/kbagent.go
Auto-merging pkg/controller/component/kbagent_test.go
Auto-merging pkg/controller/component/replicas.go
Auto-merging pkg/controller/component/synthesize_component.go
Auto-merging pkg/controller/component/synthesize_component_test.go
Auto-merging pkg/controller/component/type.go
Auto-merging pkg/controller/component/utils.go
Auto-merging pkg/controller/component/vars.go
Auto-merging pkg/controller/configuration/builtin_env.go
Auto-merging pkg/controller/configuration/builtin_env_test.go
Auto-merging pkg/controller/configuration/builtin_functions.go
Auto-merging pkg/controller/configuration/builtin_objects.go
Auto-merging pkg/controller/configuration/config_template_test.go
Auto-merging pkg/controller/configuration/configuration_test.go
Auto-merging pkg/controller/configuration/envfrom_utils.go
Auto-merging pkg/controller/configuration/operator.go
Auto-merging pkg/controller/configuration/operator_test.go
Auto-merging pkg/controller/configuration/pipeline.go
Auto-merging pkg/controller/configuration/pipeline_test.go
Auto-merging pkg/controller/configuration/resource_wrapper.go
Auto-merging pkg/controller/configuration/resource_wrapper_test.go
Auto-merging pkg/controller/configuration/template_merger.go
Auto-merging pkg/controller/configuration/template_merger_test.go
Auto-merging pkg/controller/configuration/template_wrapper.go
Auto-merging pkg/controller/configuration/tool_image_builder.go
Auto-merging pkg/controller/configuration/tool_image_builder_test.go
Auto-merging pkg/controller/factory/builder.go
Auto-merging pkg/controller/factory/builder_test.go
Auto-merging pkg/controller/instanceset/instance_util.go
Auto-merging pkg/controller/instanceset/instance_util_test.go
Auto-merging pkg/controller/instanceset/object_builder_test.go
Auto-merging pkg/controller/instanceset/pod_role_event_handler.go
Auto-merging pkg/controller/instanceset/pod_role_event_handler_test.go
Auto-merging pkg/controller/instanceset/reconciler_status.go
Auto-merging pkg/controller/instanceset/reconciler_status_test.go
Auto-merging pkg/controller/instanceset/reconciler_update.go
Auto-merging pkg/controller/instanceset/reconciler_update_test.go
Auto-merging pkg/controller/instanceset/suite_test.go
Auto-merging pkg/controller/instanceset/update_plan.go
Auto-merging pkg/controller/instanceset/update_plan_test.go
Auto-merging pkg/controller/instanceset/utils.go
Auto-merging pkg/controller/lifecycle/errors.go
Auto-merging pkg/controller/lifecycle/kbagent.go
Auto-merging pkg/controller/lifecycle/lfa_udf.go
Auto-merging pkg/controller/lifecycle/lifecycle.go
Auto-merging pkg/controller/plan/prepare.go
Auto-merging pkg/controller/plan/prepare_test.go
Auto-merging pkg/controller/plan/restore.go
Auto-merging pkg/controller/plan/tls.go
Auto-merging pkg/controller/plan/tls_test.go
CONFLICT (modify/delete): pkg/controller/render/suite_test.go deleted in HEAD and modified in 851f1b8 (chore: update copyright for 2025 (#8856)). Version 851f1b8 (chore: update copyright for 2025 (#8856)) of pkg/controller/render/suite_test.go left in tree.
CONFLICT (modify/delete): pkg/controller/render/template_render.go deleted in HEAD and modified in 851f1b8 (chore: update copyright for 2025 (#8856)). Version 851f1b8 (chore: update copyright for 2025 (#8856)) of pkg/controller/render/template_render.go left in tree.
CONFLICT (modify/delete): pkg/controller/render/types.go deleted in HEAD and modified in 851f1b8 (chore: update copyright for 2025 (#8856)). Version 851f1b8 (chore: update copyright for 2025 (#8856)) of pkg/controller/render/types.go left in tree.
Auto-merging pkg/controllerutil/volume_util.go
Auto-merging pkg/dataprotection/backup/scheduler.go
Auto-merging pkg/dataprotection/restore/utils.go
CONFLICT (modify/delete): pkg/kbagent/client/portforward_client.go deleted in HEAD and modified in 851f1b8 (chore: update copyright for 2025 (#8856)). Version 851f1b8 (chore: update copyright for 2025 (#8856)) of pkg/kbagent/client/portforward_client.go left in tree.
Auto-merging pkg/kbagent/proto/errors.go
Auto-merging pkg/kbagent/server/streaming_server.go
Auto-merging pkg/kbagent/service/action.go
Auto-merging pkg/operations/expose.go
Auto-merging pkg/operations/reconfigure.go
Auto-merging pkg/operations/reconfigure_pipeline.go
Auto-merging pkg/operations/restore.go
Auto-merging pkg/operations/restore_test.go
Auto-merging pkg/operations/switchover.go
Auto-merging pkg/operations/volume_expansion.go
Auto-merging pkg/testutil/apps/cluster_factory.go
Auto-merging pkg/testutil/apps/cluster_util.go
Auto-merging pkg/testutil/apps/component_factory.go
Auto-merging pkg/testutil/apps/constant.go
Auto-merging pkg/testutil/apps/instance_set_factoy.go
error: could not apply 851f1b8... chore: update copyright for 2025 (#8856)
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/13536211392

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.

None yet

6 participants