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: apply application should not use strategic merge patch #165

Conversation

Somefive
Copy link
Contributor

@Somefive Somefive commented May 22, 2023

Description of your changes

Fixes kubevela/kubevela#5966

Related PR: kubevela/pkg#85

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: Yin Da <yd219913@alibaba-inc.com>
@Somefive Somefive force-pushed the fix/apply-application-should-not-use-strategic-merge branch from 9abc49a to 2a313fc Compare May 22, 2023 08:54
@codecov
Copy link

codecov bot commented May 22, 2023

Codecov Report

Patch coverage has no change and project coverage change: +0.08 🎉

Comparison is base (687ba32) 66.76% compared to head (37e3495) 66.85%.

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #165      +/-   ##
==========================================
+ Coverage   66.76%   66.85%   +0.08%     
==========================================
  Files          50       50              
  Lines        4553     4547       -6     
==========================================
  Hits         3040     3040              
+ Misses       1108     1102       -6     
  Partials      405      405              
Flag Coverage Δ
e2etests 22.17% <ø> (+0.03%) ⬆️
unit-test 64.27% <ø> (ø)

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

see 1 file with indirect coverage changes

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

Signed-off-by: Yin Da <yd219913@alibaba-inc.com>
@FogDong FogDong merged commit 34c6911 into kubevela:main May 23, 2023
17 checks passed
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.

In workflowrun, the status of apply-app step is failed, but app status in vela cli shows ready
3 participants