Bug 2026860: ocp provider: don't fail client creation if oauth-server cert is not present #238
Conversation
…present Newer oauth-proxy versions can be used in older clusters where the oauth-server certificate is not present. We should not fail client creation in those cases.
openshift-ci
bot
added
the
bugzilla/severity-high
|
@stlaz: This pull request references Bugzilla bug 2026860, 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. 3 validation(s) were run on this bug
Requesting review from QA contact: In response to this:
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
bot
added
the
bugzilla/valid-bug
openshift-ci
bot
added
the
approved
|
/test unit |
|
@stlaz: all tests passed! Full PR test history. Your PR dashboard. 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. |
| @@ -157,12 +158,16 @@ func (p *OpenShiftProvider) newOpenShiftClient() (*http.Client, error) { | |||
| return nil, err | |||
| } | |||
|
|
|||
| cachedKey := metadataHash | |||
There was a problem hiding this comment.
nit: I appreciate the copying of data before mutation, but it is not necessary anymore.
| if ok := pool.AppendCertsFromPEM([]byte(oauthServerCert.Data["ca-bundle.crt"])); !ok { | ||
| log.Println("failed to add the oauth-server certificate to the OpenShift client CA bundle") | ||
| if oauthServerCert != nil { | ||
| if ok := pool.AppendCertsFromPEM([]byte(oauthServerCert.Data["ca-bundle.crt"])); !ok { |
There was a problem hiding this comment.
nit: "ca-bundle.crt" should be a const.
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: ibihim, stlaz 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 |
|
@stlaz: All pull requests linked via external trackers have merged: Bugzilla bug 2026860 has been moved to the MODIFIED state. In response to this:
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. |
|
[ART PR BUILD NOTIFIER] This PR has been included in build golang-github-openshift-oauth-proxy-container-v4.10.0-202305011254.p0.g799d414.assembly.stream for distgit golang-github-openshift-oauth-proxy. |
Newer oauth-proxy versions can be used in older clusters where
the oauth-server certificate is not present. We should not fail
client creation in those cases.
/assign @s-urbaniak
/cc @openshift/openshift-team-multi-cluster-maintainers