Skip to content

bug 1633137 request header changes #12998

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

Merged
merged 1 commit into from
Dec 3, 2018

Conversation

kalexand-rh
Copy link
Contributor

From https://bugzilla.redhat.com/show_bug.cgi?id=1633137

@vrutkovs, will you PTAL? The bug mentions the insecure option. Does #12631 cover what you were thinking?

@kalexand-rh kalexand-rh added this to the Next Release milestone Nov 30, 2018
@kalexand-rh kalexand-rh self-assigned this Nov 30, 2018
@openshift-ci-robot openshift-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Nov 30, 2018
@openshift-docs-preview-bot

The preview will be availble shortly at:

----
<1> If you specify your CA certificate location in the
`openshift_master_identity_providers` parameter, do not specify a certificate
value in the `openshift_master_ldap_ca` parameter or path in the
`openshift_master_ldap_ca_file` parameter.
<2> If you specify a file on the host you run the playbook on, its contents are
copied to the *_/etc/origin/master/<identity_provider_name>_ca.crt_* file. The
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
copied to the *_/etc/origin/master/<identity_provider_name>_ca.crt_* file. The
copied to the *_/etc/origin/master/<identity_provider_name>_<identity_provider_type>_ca.crt_* file. The

----
<1> If you specify your CA certificate location in the
`openshift_master_identity_providers` parameter, do not specify a certificate
value in the `openshift_master_ldap_ca` parameter or path in the
`openshift_master_ldap_ca_file` parameter.
<2> If you specify a file on the host you run the playbook on, its contents are
copied to the *_/etc/origin/master/<identity_provider_name>_ca.crt_* file. The
identity provider name is `ldap`, `openid`, or `request_header` to match the
Copy link
Member

@vrutkovs vrutkovs Nov 30, 2018

Choose a reason for hiding this comment

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

Suggested change
identity provider name is `ldap`, `openid`, or `request_header` to match the
identity provider name is name of the item in `openshift_master_identity_providers` list and identity provider type is `ldap`, `openid`, or `request_header` to match the

In openshift_master_identity_providers two or more identity providers can be specified:

openshift_master_identity_providers:
- name: foo
  provider:
    kind: OpenIDIdentityProvider
- name: bar
  provider:
    kind: OpenIDIdentityProvider
- name: baz
  provider:
    kind: RequestHeaderIdentityProvider

This config would require the following files:

  • /etc/origin/master/foo_openid_ca.crt
  • /etc/origin/master/bar_openid_ca.crt
  • /etc/origin/master/baz_requestheader_ca.crt

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@enj, are you ready for us to tell people that you can use multiple identity providers?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Mo says that you've always been able to do this.

#openshift_master_request_header_ca
#openshift_master_request_header_ca_file
#openshift_master_request_header_ca_file <2>
----
<1> If you specify your CA certificate location in the
Copy link
Member

Choose a reason for hiding this comment

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

This is no longer correct, CA certificate location in openshift_master_identity_providers parameter is now ignored

identity provider name is `ldap`, `openid`, or `request_header` to match the
identity provider that you configure. If you do not
specify the CA text or the path to the local CA file, you must place the CA
cert in this location. You cannot change this location.
Copy link
Member

@vrutkovs vrutkovs Nov 30, 2018

Choose a reason for hiding this comment

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

In LDAP insecure option would allow omitting openshift_master_ldap_ca or openshift_master_ldap_ca_file, this doesn't affect other identity providers

@openshift-ci-robot openshift-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Nov 30, 2018
@kalexand-rh
Copy link
Contributor Author

@vrutkovs, I made some updates. Please let me know if you see any other changes.

@xltian, will you please suggest the correct QE reviewer?

@vrutkovs
Copy link
Member

Looks good, one last change would be removing 'ca' param in openshift_master_identity_providers - its being ignored now and filled in automatically

@kalexand-rh
Copy link
Contributor Author

@vrutkovs, I've pulled it. Thanks!

Copy link
Member

@vrutkovs vrutkovs left a comment

Choose a reason for hiding this comment

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

LGTM

@xltian
Copy link

xltian commented Nov 30, 2018

@stuartchuan Will review from QE.

@stuartchuan
Copy link

The changes are OK.

@kalexand-rh
Copy link
Contributor Author

Thank you both! I'll squash and merge after I get a peer review. :)

@kalexand-rh kalexand-rh added the peer-review-needed Signifies that the peer review team needs to review this PR label Dec 3, 2018
@kalexand-rh
Copy link
Contributor Author

@openshift/team-documentation PTAL

@ahardin-rh
Copy link
Contributor

@kalexand-rh LGTM!

@ahardin-rh ahardin-rh added peer-review-done Signifies that the peer review team has reviewed this PR and removed peer-review-needed Signifies that the peer review team needs to review this PR labels Dec 3, 2018
@kalexand-rh kalexand-rh merged commit 459b0ad into openshift:master Dec 3, 2018
@kalexand-rh
Copy link
Contributor Author

/cherrypick enterprise-3.11

@kalexand-rh
Copy link
Contributor Author

/cherrypick enterprise-3.10

@openshift-cherrypick-robot

@kalexand-rh: new pull request created: #13007

In response to this:

/cherrypick enterprise-3.11

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

@kalexand-rh: new pull request created: #13008

In response to this:

/cherrypick enterprise-3.10

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
branch/enterprise-3.10 branch/enterprise-3.11 peer-review-done Signifies that the peer review team has reviewed this PR 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.

8 participants