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

Bug 1893977: Keep node-ca daemonset in-sync with reference version #632

Conversation

openshift-cherrypick-robot

This is an automated cherry-pick of #625

/assign dmage

@openshift-ci-robot
Copy link
Contributor

@openshift-cherrypick-robot: An error was encountered searching for bug 1850465 on the Bugzilla server at https://bugzilla.redhat.com:

code 102: You are not authorized to access bug #1850465. Most likely the bug has been restricted for internal development processes and we cannot grant access. If you are a Red Hat customer with an active subscription, please visit the Red Hat Customer Portal for assistance with your issue If you are a Fedora Project user and require assistance, please consider using one of the mailing lists we host for the Fedora Project.
Please contact an administrator to resolve this issue, then request a bug refresh with /bugzilla refresh.

In response to this:

[release-4.6] Bug 1850465: Keep node-ca daemonset in-sync with reference version

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.

@dmage
Copy link
Member

dmage commented Nov 3, 2020

/retitle Bug 1893977: Keep node-ca daemonset in-sync with reference version

@openshift-ci-robot openshift-ci-robot changed the title [release-4.6] Bug 1850465: Keep node-ca daemonset in-sync with reference version Bug 1893977: Keep node-ca daemonset in-sync with reference version Nov 3, 2020
@openshift-ci-robot
Copy link
Contributor

@openshift-cherrypick-robot: An error was encountered searching for dependent bug 1850465 for bug 1893977 on the Bugzilla server at https://bugzilla.redhat.com:

code 102: You are not authorized to access bug #1850465. Most likely the bug has been restricted for internal development processes and we cannot grant access. If you are a Red Hat customer with an active subscription, please visit the Red Hat Customer Portal for assistance with your issue If you are a Fedora Project user and require assistance, please consider using one of the mailing lists we host for the Fedora Project.
Please contact an administrator to resolve this issue, then request a bug refresh with /bugzilla refresh.

In response to this:

Bug 1893977: Keep node-ca daemonset in-sync with reference version

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.

@dmage
Copy link
Member

dmage commented Nov 3, 2020

/bugzilla refresh

@openshift-ci-robot openshift-ci-robot added bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. labels Nov 3, 2020
@openshift-ci-robot
Copy link
Contributor

@dmage: This pull request references Bugzilla bug 1893977, 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.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.6.z) matches configured target release for branch (4.6.z)
  • bug is in the state NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
  • dependent bug Bugzilla bug 1850465 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA))
  • dependent Bugzilla bug 1850465 targets the "4.7.0" release, which is one of the valid target releases: 4.7.0
  • bug has dependents

In response to this:

/bugzilla refresh

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.

@dmage
Copy link
Member

dmage commented Nov 3, 2020

/lgtm

@openshift-ci-robot openshift-ci-robot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Nov 3, 2020
@dmage
Copy link
Member

dmage commented Nov 4, 2020

/cherrypick release-4.4

@openshift-cherrypick-robot
Copy link
Author

@dmage: once the present PR merges, I will cherry-pick it on top of release-4.4 in a new PR and assign it to you.

In response to this:

/cherrypick release-4.4

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.

@dmage
Copy link
Member

dmage commented Nov 4, 2020

/cherrypick release-4.5

@openshift-cherrypick-robot
Copy link
Author

@dmage: once the present PR merges, I will cherry-pick it on top of release-4.5 in a new PR and assign it to you.

In response to this:

/cherrypick release-4.5

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.

@dmage
Copy link
Member

dmage commented Nov 11, 2020

/bugzilla cc-qa

@openshift-ci-robot
Copy link
Contributor

@dmage: This pull request references Bugzilla bug 1893977, which is valid.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.6.z) matches configured target release for branch (4.6.z)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
  • dependent bug Bugzilla bug 1850465 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA))
  • dependent Bugzilla bug 1850465 targets the "4.7.0" release, which is one of the valid target releases: 4.7.0
  • bug has dependents

Requesting review from QA contact:
/cc @wzheng1

In response to this:

/bugzilla cc-qa

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.

@wzheng1
Copy link

wzheng1 commented Nov 12, 2020

  1. Use below command to build an image with this PR:
    build Bug 1893977: Keep node-ca daemonset in-sync with reference version #632
    https://storage.googleapis.com/origin-ci-test/logs/release-openshift-origin-installer-launch-gcp/1326783705376624640/build-log.txt
  2. Launch a 4.5 cluster
  3. Add taint: $ oc adm taint nodes <worker5.example.com> app=batch:NoSchedule
  4. Upgrade to the built image - succeed
    /lgtm

@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

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

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

@mfojtik mfojtik added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Nov 25, 2020
@openshift-bot
Copy link
Contributor

/retest

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

2 similar comments
@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

4 similar comments
@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-merge-robot openshift-merge-robot merged commit be99ea0 into openshift:release-4.6 Nov 26, 2020
@openshift-ci-robot
Copy link
Contributor

@openshift-cherrypick-robot: All pull requests linked via external trackers have merged:

Bugzilla bug 1893977 has been moved to the MODIFIED state.

In response to this:

Bug 1893977: Keep node-ca daemonset in-sync with reference version

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-cherrypick-robot
Copy link
Author

@dmage: #632 failed to apply on top of branch "release-4.4":

Applying: Stomp changes that are made for node-ca
Using index info to reconstruct a base tree...
A	pkg/client/operatorclient.go
A	pkg/operator/nodecadaemon.go
M	pkg/resource/nodecadaemon.go
M	pkg/resource/nodecadaemon_test.go
A	test/e2e/nodecadaemon_test.go
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): test/e2e/nodecadaemon_test.go deleted in HEAD and modified in Stomp changes that are made for node-ca. Version Stomp changes that are made for node-ca of test/e2e/nodecadaemon_test.go left in tree.
Auto-merging pkg/resource/nodecadaemon_test.go
CONFLICT (content): Merge conflict in pkg/resource/nodecadaemon_test.go
Auto-merging pkg/resource/nodecadaemon.go
CONFLICT (content): Merge conflict in pkg/resource/nodecadaemon.go
CONFLICT (modify/delete): pkg/operator/nodecadaemon.go deleted in HEAD and modified in Stomp changes that are made for node-ca. Version Stomp changes that are made for node-ca of pkg/operator/nodecadaemon.go left in tree.
CONFLICT (modify/delete): pkg/client/operatorclient.go deleted in HEAD and modified in Stomp changes that are made for node-ca. Version Stomp changes that are made for node-ca of pkg/client/operatorclient.go left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Stomp changes that are made for node-ca
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-4.4

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-cherrypick-robot
Copy link
Author

@dmage: #632 failed to apply on top of branch "release-4.5":

Applying: Stomp changes that are made for node-ca
Using index info to reconstruct a base tree...
M	pkg/client/operatorclient.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/client/operatorclient.go
CONFLICT (content): Merge conflict in pkg/client/operatorclient.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Stomp changes that are made for node-ca
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-4.5

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
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants