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 1807471: add controller for node-ca daemonset #489

Merged
merged 1 commit into from Mar 11, 2020

Conversation

dmage
Copy link
Member

@dmage dmage commented Mar 10, 2020

No description provided.

@openshift-ci-robot openshift-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Mar 10, 2020
@dmage dmage changed the title [WIP] Add controller for node-ca daemonset Add controller for node-ca daemonset Mar 11, 2020
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 11, 2020
@dmage
Copy link
Member Author

dmage commented Mar 11, 2020

/assign @ricardomaraschini @adambkaplan

@ricardomaraschini
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Mar 11, 2020
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dmage, ricardomaraschini

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

@openshift-merge-robot openshift-merge-robot merged commit 28be264 into openshift:master Mar 11, 2020
@dmage dmage changed the title Add controller for node-ca daemonset Bug 1807471: add controller for node-ca daemonset Mar 11, 2020
@openshift-ci-robot
Copy link
Contributor

@dmage: All pull requests linked via external trackers have merged. Bugzilla bug 1807471 has been moved to the MODIFIED state.

In response to this:

Bug 1807471: add controller for node-ca daemonset

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 Author

dmage commented Mar 11, 2020

/cherrypick release-4.4

@openshift-cherrypick-robot

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

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	pkg/operator/controller.go
M	pkg/resource/generator.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/resource/generator.go
CONFLICT (content): Merge conflict in pkg/resource/generator.go
Auto-merging pkg/operator/controller.go
Patch failed at 0001 Add controller for node-ca daemonset

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.

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. lgtm Indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants