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

Fix: Backport #5275 to release-1.6 #5559

Merged
merged 5 commits into from
Mar 3, 2023
Merged

Fix: Backport #5275 to release-1.6 #5559

merged 5 commits into from
Mar 3, 2023

Conversation

suwliang3
Copy link
Contributor

Description of your changes

Update pkg dependency, refer to kubevela/pkg#28 #5275

Fixes #5556

I have:

  • Read and followed KubeVela's contribution process.
  • Related Docs updated properly. In a new feature or configuration option, an update to the documentation is necessary.
  • Run make reviewable to ensure this PR is ready for review.
  • Added backport release-x.y labels to auto-backport this PR if necessary.

How has this code been tested

Special notes for your reviewer

Signed-off-by: suwanliang_yewu <suwanliang_yewu@cmss.chinamobile.com>
@codecov
Copy link

codecov bot commented Feb 23, 2023

Codecov Report

Patch coverage has no change and project coverage change: -4.52 ⚠️

Comparison is base (6553a90) 61.60% compared to head (7c6a596) 57.09%.

Additional details and impacted files
@@               Coverage Diff               @@
##           release-1.6    #5559      +/-   ##
===============================================
- Coverage        61.60%   57.09%   -4.52%     
===============================================
  Files              304      304              
  Lines            33409    33409              
===============================================
- Hits             20582    19075    -1507     
- Misses           10041    11765    +1724     
+ Partials          2786     2569     -217     
Flag Coverage Δ
apiserver-e2etests 35.77% <ø> (+0.07%) ⬆️
apiserver-unittests ?
core-unittests 55.28% <ø> (+0.03%) ⬆️
e2e-multicluster-test 18.84% <ø> (+0.04%) ⬆️
e2e-rollout-tests 20.22% <ø> (-0.04%) ⬇️
e2etests 25.86% <ø> (ø)

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

Impacted Files Coverage Δ
pkg/apiserver/domain/service/tags.go 0.00% <0.00%> (-100.00%) ⬇️
pkg/apiserver/utils/dex.go 0.00% <0.00%> (-75.00%) ⬇️
pkg/apiserver/domain/service/webhook.go 4.16% <0.00%> (-66.32%) ⬇️
pkg/apiserver/domain/service/cloudshell.go 0.97% <0.00%> (-61.96%) ⬇️
pkg/apiserver/domain/service/helm.go 3.03% <0.00%> (-60.61%) ⬇️
pkg/apiserver/event/collect/system_info_collect.go 4.67% <0.00%> (-60.24%) ⬇️
...server/infrastructure/datastore/mongodb/mongodb.go 0.00% <0.00%> (-60.14%) ⬇️
pkg/apiserver/domain/repository/workflow.go 42.81% <0.00%> (-40.81%) ⬇️
pkg/apiserver/domain/service/util.go 50.00% <0.00%> (-34.62%) ⬇️
pkg/apiserver/domain/service/image.go 0.92% <0.00%> (-28.71%) ⬇️
... and 44 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

@suwliang3
Copy link
Contributor Author

@wonderflow @chivalryq There will be some conflicts in unit tests. Is it okay to resolve these conflicts?Will it affect its original function?

@chivalryq
Copy link
Member

@suwliang3 Good job. You can try to solve the conflicts. I guess most of them won't affect the function. They are just API incompatibility caused by version bumping.

@chivalryq chivalryq changed the title Fix: modify the version of github.com/kubevela/pkg Backport #5275 to release-1.6 Feb 24, 2023
Signed-off-by: suwanliang_yewu <suwanliang_yewu@cmss.chinamobile.com>
@suwliang3 suwliang3 changed the title Backport #5275 to release-1.6 Fix: Backport #5275 to release-1.6 Feb 24, 2023
Signed-off-by: suwanliang_yewu <suwanliang_yewu@cmss.chinamobile.com>
@chivalryq
Copy link
Member

Check-diff job failed because the controller-gen version in CI is bumped. Please run make reviewable to include the differences. @suwliang3

Signed-off-by: suwanliang_yewu <suwanliang_yewu@cmss.chinamobile.com>
Copy link
Collaborator

@wonderflow wonderflow left a comment

Choose a reason for hiding this comment

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

why there're so many changes while #5275 only changes 6 lines.

@suwliang3
Copy link
Contributor Author

why there're so many changes while #5275 only changes 6 lines.

It should be the reason for the package version dependency. @chivalryq

go.mod Show resolved Hide resolved
Copy link
Member

@chivalryq chivalryq left a comment

Choose a reason for hiding this comment

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

LGTM. cc @wonderflow I checked the changes and most of them is introduced by bumping version of tools like controller-gen and dependency in pkg repo. It's OK to merge this.

Signed-off-by: suwanliang_yewu <suwanliang_yewu@cmss.chinamobile.com>
@chivalryq
Copy link
Member

ping @wonderflow

@wonderflow wonderflow merged commit 4bc847b into kubevela:release-1.6 Mar 3, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants