Skip to content

Bug 1792005: lib/resourcemerge/core: Clear livenessProbe and readinessProbe if nil in required #300

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.

Sign up for GitHub

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

Jump to bottom
Merged
openshift-merge-robot merged 1 commit into from
Feb 20, 2020
Merged

Bug 1792005: lib/resourcemerge/core: Clear livenessProbe and readinessProbe if nil in required #300

openshift-merge-robot merged 1 commit into from
Feb 20, 2020

Conversation

@openshift-cherrypick-robot
Copy link

@openshift-cherrypick-robot openshift-cherrypick-robot commented Jan 17, 2020

This is an automated cherry-pick of #298

/assign wking

@wking
lib/resourcemerge/core: Clear livenessProbe and readinessProbe if nil…
e24b40a 
… in required

We claimed:

  if we have no required, then we don't care what someone else has set

since this code landed in d9f6718 (lib: add lib for applying
objects, 2018-08-14, openshift#7).  But we do care in situations like [1],
where a 4.3 -> 4.2 downgrade leaves 4.3 readiness probes in place for
a 4.2 operator which has no /readyz.

With this commit we still have a few other types where we claim to not
care:

  $ git grep -hB1 'someone else has set' | grep func
  func ensureSecurityContextPtr(modified *bool, existing **corev1.SecurityContext, required *corev1.SecurityContext) {
  func ensureCapabilitiesPtr(modified *bool, existing **corev1.Capabilities, required *corev1.Capabilities) {
  func ensureAffinityPtr(modified *bool, existing **corev1.Affinity, required *corev1.Affinity) {
  func ensurePodSecurityContextPtr(modified *bool, existing **corev1.PodSecurityContext, required *corev1.PodSecurityContext) {
  func ensureSELinuxOptionsPtr(modified *bool, existing **corev1.SELinuxOptions, required *corev1.SELinuxOptions) {
  func setBoolPtr(modified *bool, existing **bool, required *bool) {
  func setInt64Ptr(modified *bool, existing **int64, required *int64) {

but I'm leaving them alone until we have a clearer picture about
whether we care about those specific properties or not.

[1]: https://bugzilla.redhat.com/show_bug.cgi?id=1791863#c1
@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Jan 17, 2020
Merged
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Jan 17, 2020

@openshift-cherrypick-robot: This pull request references Bugzilla bug 1791863, which is invalid:

  • expected the bug to target the "4.2.z" release, but it targets "4.4.0" instead
  • expected the bug to be in one of the following states: NEW, ASSIGNED, ON_DEV, POST, POST, but it is MODIFIED instead
  • expected Bugzilla bug 1791863 to depend on a bug in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but no dependents were found

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

[release-4.2] Bug 1791863: lib/resourcemerge/core: Clear livenessProbe and readinessProbe if nil in required

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-ci-robot openshift-ci-robot added the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Jan 17, 2020
@openshift-ci-robot openshift-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jan 17, 2020
@wking
Copy link
Member

wking commented Jan 18, 2020

/retitle Bug 1792005: lib/resourcemerge/core: Clear livenessProbe and readinessProbe if nil in required
/retest

@openshift-ci-robot openshift-ci-robot changed the title [release-4.2] Bug 1791863: lib/resourcemerge/core: Clear livenessProbe and readinessProbe if nil in required Bug 1792005: lib/resourcemerge/core: Clear livenessProbe and readinessProbe if nil in required Jan 18, 2020
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Jan 18, 2020

@openshift-cherrypick-robot: This pull request references Bugzilla bug 1792005, which is invalid:

  • expected dependent Bugzilla bug 1792004 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but it is NEW instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

Bug 1792005: lib/resourcemerge/core: Clear livenessProbe and readinessProbe if nil in required

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@wking
Copy link
Member

wking commented Feb 19, 2020

/bugzilla refresh
/lgtm

@openshift-ci-robot openshift-ci-robot added lgtm Indicates that a PR is ready to be merged. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. and removed bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Feb 19, 2020
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Feb 19, 2020

@wking: This pull request references Bugzilla bug 1792005, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

/bugzilla refresh
/lgtm

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Feb 19, 2020

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: openshift-cherrypick-robot, wking

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details 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

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 19, 2020
@bparees bparees added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Feb 19, 2020
@openshift-bot
Copy link
Contributor

openshift-bot commented Feb 19, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

1 similar comment
@openshift-bot
Copy link
Contributor

openshift-bot commented Feb 19, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit ccbed39 into openshift:release-4.2 Feb 20, 2020
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Feb 20, 2020

@openshift-cherrypick-robot: All pull requests linked via external trackers have merged. Bugzilla bug 1792005 has been moved to the MODIFIED state.

Details

In response to this:

Bug 1792005: lib/resourcemerge/core: Clear livenessProbe and readinessProbe if nil in required

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@wking wking mentioned this pull request Feb 24, 2020
Merged
@wking
Copy link
Member

wking commented Feb 24, 2020

/cherrypick release-4.1

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Feb 24, 2020
Closed
@openshift-cherrypick-robot
Copy link
Author

openshift-cherrypick-robot commented Feb 24, 2020

@wking: new pull request created: #330

Details

In response to this:

/cherrypick release-4.1

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@crawford crawford Awaiting requested review from crawford

@smarterclayton smarterclayton Awaiting requested review from smarterclayton

Assignees

@wking wking

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. lgtm Indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@openshift-cherrypick-robot @openshift-ci-robot @wking @openshift-bot @bparees @openshift-merge-robot