Bug 157608, Removed filename key and value #9138
Conversation
openshift-ci-robot
added
the
size/XS
|
@cevich PTAL. Is this change for 3.10 only, or should it also be applied to 3.9? Thanks! |
|
@ahardin-rh IDK 😞 I only tested 3.10, not sure when that option was removed. @sdodson ? |
|
@jianlinliu Please provide a QE review |
| @@ -1936,7 +1936,7 @@ openshift_deployment_type=origin | |||
| endif::[] | |||
|
|
|||
| # uncomment the following to enable htpasswd authentication; defaults to DenyAllPasswordIdentityProvider | |||
| #openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', 'challenge': 'true', 'kind': 'HTPasswdPasswordIdentityProvider', 'filename': '/etc/origin/master/htpasswd'}] | |||
| #openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', 'challenge': 'true', 'kind': 'HTPasswdPasswordIdentityProvider', '/etc/origin/master/htpasswd'}] | |||
|
|
|||
There was a problem hiding this comment.
This is a JSON key, so the value's gotta be clobbered as well:
#openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', 'challenge': 'true', 'kind': 'HTPasswdPasswordIdentityProvider'}]
| @@ -1936,7 +1936,7 @@ openshift_deployment_type=origin | |||
| endif::[] | |||
|
|
|||
| # uncomment the following to enable htpasswd authentication; defaults to DenyAllPasswordIdentityProvider | |||
| #openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', 'challenge': 'true', 'kind': 'HTPasswdPasswordIdentityProvider', 'filename': '/etc/origin/master/htpasswd'}] | |||
| #openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', 'challenge': 'true', 'kind': 'HTPasswdPasswordIdentityProvider', '/etc/origin/master/htpasswd'}] | |||
There was a problem hiding this comment.
Remove string '/etc/origin/master/htpasswd'
The path is hard-coded now.
There was a problem hiding this comment.
Ya, that's what I was trying to say also 😄
|
@michaelgugino off-hand, do you know when that value was hard-coded? Was it for 3.9 also? |
ahardin-rh
force-pushed
the
json-keys-update
branch
from
c0e11f2
to
2c3a5a3
Compare
openshift-ci-robot
added
size/S
|
@cevich @michaelgugino Thanks! I think I got them all now 🍻 |
|
LGTM (FWIW) |
|
Looks like this is for 3.10+ https://bugzilla.redhat.com/show_bug.cgi?id=1576088#c4 |
nvm...question answered. It's 3.10 and beyond only. |
ahardin-rh
force-pushed
the
json-keys-update
branch
from
2c3a5a3
to
86f0d74
Compare
|
QE approved in the BZ; no peer review needed |
|
/cherrypick enterprise-3.10 |
|
@ahardin-rh: new pull request created: #9212 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. |
ahardin-rh
added
peer-review-done
https://bugzilla.redhat.com/show_bug.cgi?id=1576088