-
Notifications
You must be signed in to change notification settings - Fork 752
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
Add patch for UnitedDeployment #1266
Conversation
@@ -18,7 +18,11 @@ | |||
|
|||
import ( | |||
"context" | |||
"encoding/json" | |||
"fmt" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
goimports: File is not goimports
-ed
❗❗ 2 similar findings have been found in this PR
🔎 Expand here to view all instances of this finding
File Path | Line Number |
---|---|
pkg/controller/uniteddeployment/adapter/cloneset_adapter.go | 6 |
pkg/controller/uniteddeployment/adapter/deployment_adapter.go | 22 |
Visit the Lift Web Console to find more details in your report.
ℹ️ Expand to see all @sonatype-lift commands
You can reply with the following commands. For example, reply with @sonatype-lift ignoreall to leave out all findings.
Command | Usage |
---|---|
@sonatype-lift ignore |
Leave out the above finding from this PR |
@sonatype-lift ignoreall |
Leave out all the existing findings from this PR |
@sonatype-lift exclude <file|issue|path|tool> |
Exclude specified file|issue|path|tool from Lift findings by updating your config.toml file |
Note: When talking to LiftBot, you need to refresh the page to see its response.
Click here to add LiftBot to another repo.
@@ -18,7 +18,10 @@ | |||
|
|||
import ( | |||
"context" | |||
"encoding/json" | |||
"fmt" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
goimports: File is not goimports
-ed
ℹ️ Expand to see all @sonatype-lift commands
You can reply with the following commands. For example, reply with @sonatype-lift ignoreall to leave out all findings.
Command | Usage |
---|---|
@sonatype-lift ignore |
Leave out the above finding from this PR |
@sonatype-lift ignoreall |
Leave out all the existing findings from this PR |
@sonatype-lift exclude <file|issue|path|tool> |
Exclude specified file|issue|path|tool from Lift findings by updating your config.toml file |
Note: When talking to LiftBot, you need to refresh the page to see its response.
Click here to add LiftBot to another repo.
Codecov Report
❗ Your organization is not using the GitHub App Integration. As a result you may experience degraded service beginning May 15th. Please install the Github App Integration for your organization. Read more. @@ Coverage Diff @@
## master #1266 +/- ##
==========================================
- Coverage 48.60% 48.44% -0.16%
==========================================
Files 151 151
Lines 21005 21113 +108
==========================================
+ Hits 10210 10229 +19
- Misses 9680 9769 +89
Partials 1115 1115
Flags with carried forward coverage won't be shown. Click here to find out more.
📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
This comment was marked as duplicate.
This comment was marked as duplicate.
@@ -146,6 +150,27 @@ func (a *DeploymentAdapter) ApplySubsetTemplate(ud *alpha1.UnitedDeployment, sub | |||
attachNodeAffinity(&set.Spec.Template.Spec, subSetConfig) | |||
attachTolerations(&set.Spec.Template.Spec, subSetConfig) | |||
|
|||
if subSetConfig.Patch.Raw != nil { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
plz add ut that contain patches
1cb6a08
to
ac236cc
Compare
Signed-off-by: chengleqi <chengleqi5g@hotmail.com> generate manifests and fix goimports Signed-off-by: chengleqi <chengleqi5g@hotmail.com> fix goimports Signed-off-by: chengleqi <chengleqi5g@hotmail.com> patch to PodTemplateSpec Signed-off-by: chengleqi <chengleqi5g@hotmail.com> add ut for uniteddeployment patch Signed-off-by: chengleqi <chengleqi5g@hotmail.com>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/lgtm
/approve |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: zmberg The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
generate manifests and fix goimports fix goimports patch to PodTemplateSpec add ut for uniteddeployment patch Signed-off-by: chengleqi <chengleqi5g@hotmail.com>
generate manifests and fix goimports fix goimports patch to PodTemplateSpec add ut for uniteddeployment patch Signed-off-by: chengleqi <chengleqi5g@hotmail.com>
generate manifests and fix goimports fix goimports patch to PodTemplateSpec add ut for uniteddeployment patch
Ⅰ. Describe what this PR does
Add logic related to StrategicMergePatch in
ApplySubsetTemplate
method in eachAdapter (AdvancedStatefulSetAdapter | CloneSetAdapter | DeploymentAdapter | StatefulSetAdapter)
.Ⅱ. Does this pull request fix one issue?
#1265
Ⅲ. Describe how to verify it
Use following sample:
Ⅳ. Special notes for reviews