Skip to content

[release-4.3] Bug 1782819: Inject kube-controller-manager pods trust stores with trusted ca bundle#328

Merged
openshift-merge-robot merged 2 commits intoopenshift:release-4.3from
openshift-cherrypick-robot:cherry-pick-325-to-release-4.3
Dec 13, 2019
Merged

[release-4.3] Bug 1782819: Inject kube-controller-manager pods trust stores with trusted ca bundle#328
openshift-merge-robot merged 2 commits intoopenshift:release-4.3from
openshift-cherrypick-robot:cherry-pick-325-to-release-4.3

Conversation

@openshift-cherrypick-robot

This is an automated cherry-pick of #325

/assign soltysh

@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 Dec 13, 2019
@openshift-ci-robot
Copy link

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

  • expected the bug to target the "4.3.0" 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 1772756 to depend on a bug in one of the following states: MODIFIED, ON_QA, 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.3] Bug 1772756: Inject kube-controller-manager pods trust stores with trusted ca bundle

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 size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Dec 13, 2019
@soltysh soltysh changed the title [release-4.3] Bug 1772756: Inject kube-controller-manager pods trust stores with trusted ca bundle [release-4.3] Bug 1782819: Inject kube-controller-manager pods trust stores with trusted ca bundle Dec 13, 2019
@openshift-ci-robot openshift-ci-robot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Dec 13, 2019
@openshift-ci-robot
Copy link

@openshift-cherrypick-robot: This pull request references Bugzilla bug 1782819, 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:

[release-4.3] Bug 1782819: Inject kube-controller-manager pods trust stores with trusted ca bundle

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 removed the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Dec 13, 2019
Copy link
Contributor

@soltysh soltysh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm
/approve

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Dec 13, 2019
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

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

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 Dec 13, 2019
@openshift-merge-robot openshift-merge-robot merged commit 912c28e into openshift:release-4.3 Dec 13, 2019
@openshift-ci-robot
Copy link

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

Details

In response to this:

[release-4.3] Bug 1782819: Inject kube-controller-manager pods trust stores with trusted ca bundle

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.

@sferich888
Copy link

/cherry-pick release-4.2

@openshift-cherrypick-robot
Copy link
Author

@sferich888: #328 failed to apply on top of branch "release-4.2":

Applying: Append log and tls flags based on new semantics
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	pkg/operator/targetconfigcontroller/targetconfigcontroller.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/operator/targetconfigcontroller/targetconfigcontroller.go
CONFLICT (content): Merge conflict in pkg/operator/targetconfigcontroller/targetconfigcontroller.go
Patch failed at 0002 Append log and tls flags based on new semantics

Details

In response to this:

/cherry-pick release-4.2

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/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. 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.

5 participants