Skip to content

Conversation

@bparees
Copy link
Contributor

@bparees bparees commented Dec 7, 2018

Reverts #29

@openshift-ci-robot openshift-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Dec 7, 2018
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bparees

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 7, 2018
@bparees bparees added the lgtm Indicates that a PR is ready to be merged. label Dec 7, 2018
err = CopyDirIfExists(runtimeCASrc, runtimeCertRoot)
newServiceCASrc := fmt.Sprintf("%s/service-ca.crt", builder.ConfigMapCertsMountPath)
newServiceCADst := fmt.Sprintf("%s/openshift-service.crt", tlsCertRoot)
err = CopyIfExists(newServiceCASrc, newServiceCADst)
Copy link
Contributor

Choose a reason for hiding this comment

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

@bparees I think this restores copying the service-serving CA to the TLS root (the one injected by the controller)

@bparees bparees merged commit a6be0d9 into master Dec 7, 2018
@bparees
Copy link
Contributor Author

bparees commented Dec 7, 2018

Manually merging to unblock origin.

adambkaplan added a commit to adambkaplan/builder that referenced this pull request Dec 7, 2018
adambkaplan added a commit to adambkaplan/builder that referenced this pull request Dec 7, 2018
@openshift-ci-robot
Copy link
Contributor

@bparees: The following test failed, say /retest to rerun them all:

Test name Commit Details Rerun command
ci/prow/e2e-gcp 09b5c65 link /test e2e-gcp

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Details

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. I understand the commands that are listed here.

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/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants