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

Make OnFailure as default restartPolicy for BroadcastJob #1149

Merged

Conversation

Shubhamurkade
Copy link
Contributor

@Shubhamurkade Shubhamurkade commented Dec 20, 2022

Ⅰ. Describe what this PR does

Creation of a BroadcastJob without specifying restartPolicy fails with the following error:

Error from server: error when creating "broadcastjob_kruise.yaml": admission webhook "vbroadcastjob.kb.io" denied the request: spec.template.spec.restartPolicy: Invalid value: "Always": pod restartPolicy can only be Never or OnFailure

Root Cause:
restartPolicy is present under spec.template.spec block. This block is defined with PodSpec structure and the restartPolicy element in it has a default value of Always.

Solution:
For BroadcastJob changed the default value to OnFailure in /Users/surkade/Documents/dev/kruise/pkg/webhook/broadcastjob/validating/broadcastjob_create_update_handler.go file

Ⅱ. Does this pull request fix one issue?

No

Ⅲ. Describe how to verify it

Create a sample BroadcastJob with the following template (Do not specify restartPolicy under spec.template.spec:

apiVersion: apps.kruise.io/v1alpha1
kind: BroadcastJob
metadata:
    labels:
        app: <name>
    name: <name>
spec:
    template:
        metadata:
            labels:
                app: <name>
        spec:
            containers:
            - image: <image>
              imagePullPolicy: <policy>
              name: <name>
              ports:
              - containerPort: <port>

The previously mentioned error can be seen

Ⅳ. Special notes for reviews

I have kept the new default for restartPolicy as OnFailure. Please let me know if Never would make more sense as a default.

@kruise-bot
Copy link

Welcome @Shubhamurkade! It looks like this is your first PR to openkruise/kruise 🎉

@kruise-bot kruise-bot added the size/XS size/XS: 0-9 label Dec 20, 2022
@veophi
Copy link
Member

veophi commented Dec 20, 2022

@Shubhamurkade Maybe, you should modify this function instead of event handler :)

func SetDefaultsBroadcastJob(obj *v1alpha1.BroadcastJob, injectTemplateDefaults bool) {
.

@Shubhamurkade
Copy link
Contributor Author

@Shubhamurkade Maybe, you should modify this function instead of event handler :)

func SetDefaultsBroadcastJob(obj *v1alpha1.BroadcastJob, injectTemplateDefaults bool) {

.

@veophi Thanks for the suggestion. Will do!

@Shubhamurkade
Copy link
Contributor Author

@veophi Please let me know if the latest changes look fine.

@zmberg zmberg added this to In progress in Roadmap via automation Jan 5, 2023
@zmberg
Copy link
Member

zmberg commented Feb 16, 2023

@Shubhamurkade It's good, and you should git commit -s and push again.

@zmberg zmberg added this to the 1.15 milestone Feb 16, 2023
@codecov-commenter
Copy link

Codecov Report

Merging #1149 (83049b8) into master (53fb7e1) will increase coverage by 0.31%.
The diff coverage is 16.08%.

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

@@            Coverage Diff             @@
##           master    #1149      +/-   ##
==========================================
+ Coverage   49.73%   50.04%   +0.31%     
==========================================
  Files         137      143       +6     
  Lines       19331    19843     +512     
==========================================
+ Hits         9614     9931     +317     
- Misses       8667     8826     +159     
- Partials     1050     1086      +36     
Flag Coverage Δ
unittests 50.04% <16.08%> (+0.31%) ⬆️

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

Impacted Files Coverage Δ
pkg/control/pubcontrol/pub_control.go 25.00% <0.00%> (-1.22%) ⬇️
pkg/control/pubcontrol/pub_control_utils.go 50.99% <0.00%> (-1.04%) ⬇️
...tentpodstate/persistent_pod_state_event_handler.go 0.00% <0.00%> (ø)
...availablebudget/podunavailablebudget_controller.go 45.48% <0.00%> (+6.26%) ⬆️
...ller/podunavailablebudget/pub_pod_event_handler.go 26.78% <0.00%> (+0.31%) ⬆️
...g/webhook/pod/validating/pod_unavailable_budget.go 68.83% <ø> (+5.73%) ⬆️
...sistentpodstate/persistent_pod_state_controller.go 31.18% <18.18%> (-1.68%) ⬇️
pkg/webhook/pod/mutating/persistent_pod_state.go 64.21% <20.00%> (-1.73%) ⬇️
...ate/validating/persistent_create_update_handler.go 59.77% <71.42%> (+1.23%) ⬆️
...ablebudget/validating/pub_create_update_handler.go 62.09% <100.00%> (+1.59%) ⬆️
... and 31 more

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@Shubhamurkade Shubhamurkade force-pushed the broadcastjob_restartpolicy_default branch from 83049b8 to 1706262 Compare February 27, 2023 08:05
@zmberg
Copy link
Member

zmberg commented Feb 28, 2023

@Shubhamurkade You need git commit -s and squash the commits to one.

@Shubhamurkade Shubhamurkade force-pushed the broadcastjob_restartpolicy_default branch from 1706262 to 9836a38 Compare February 28, 2023 17:53
@zmberg
Copy link
Member

zmberg commented Mar 9, 2023

Signed-off-by: Shubham Urkade <shubhamurkade1@gmail.com>
@Shubhamurkade Shubhamurkade force-pushed the broadcastjob_restartpolicy_default branch from 9836a38 to 01cebb4 Compare March 15, 2023 06:23
@Shubhamurkade
Copy link
Contributor Author

@Shubhamurkade tks, and you must resolve the checks. https://github.com/openkruise/kruise/pull/1149/checks?check_run_id=11663449687

Please check now.

@furykerry
Copy link
Member

/lgtm

@veophi
Copy link
Member

veophi commented Mar 22, 2023

/approve

1 similar comment
@zmberg
Copy link
Member

zmberg commented Mar 22, 2023

/approve

@kruise-bot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: veophi, 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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@kruise-bot kruise-bot merged commit 99a3dae into openkruise:master Mar 22, 2023
21 checks passed
Roadmap automation moved this from In progress to Done Mar 22, 2023
kevin1689-cloud pushed a commit to kevin1689-cloud/kruise that referenced this pull request Mar 31, 2023
…1149)

Signed-off-by: Shubham Urkade <shubhamurkade1@gmail.com>
Co-authored-by: Shubham Urkade <surkade@surkade3MD6M.vmware.com>
diannaowa pushed a commit to diannaowa/kruise that referenced this pull request Jun 2, 2023
…1149)

Signed-off-by: Shubham Urkade <shubhamurkade1@gmail.com>
Co-authored-by: Shubham Urkade <surkade@surkade3MD6M.vmware.com>
diannaowa pushed a commit to diannaowa/kruise that referenced this pull request Jun 2, 2023
…1149)

Signed-off-by: Shubham Urkade <shubhamurkade1@gmail.com>
Co-authored-by: Shubham Urkade <surkade@surkade3MD6M.vmware.com>
ppbits pushed a commit to ppbits/kruise that referenced this pull request Apr 4, 2024
…1149)

Co-authored-by: Shubham Urkade <surkade@surkade3MD6M.vmware.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
Roadmap
  
Done
Development

Successfully merging this pull request may close these issues.

None yet

6 participants