Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Ensure get_password is accessing a file that exists. #48351

Merged
merged 1 commit into from
Jul 1, 2017
Merged

Ensure get_password is accessing a file that exists. #48351

merged 1 commit into from
Jul 1, 2017

Conversation

ktsakalozos
Copy link
Contributor

What this PR does / why we need it: get_password will throw an exception instead of returning None in case the basic_auth.csv file is missing but /root/cdk/ is there in a juju deployment.

Which issue this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close that issue when PR gets merged): fixes https://github.com/juju-solutions/bundle-canonical-kubernetes/issues/324

Special notes for your reviewer:

Release note:

Fix race condition where /root/cdk is not yet initialised in kubernetes-master setup by Juju

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jun 30, 2017
@k8s-ci-robot
Copy link
Contributor

Hi @ktsakalozos. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

I understand the commands that are listed here.

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.

@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jun 30, 2017
@k8s-github-robot k8s-github-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Jun 30, 2017
@spiffxp
Copy link
Member

spiffxp commented Jun 30, 2017

/ok-to-test

@k8s-ci-robot k8s-ci-robot removed the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jun 30, 2017
Cynerva
Cynerva reviewed Jun 30, 2017
View reviewed changes
cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py
tokens_fname = os.path.join(root_cdk, csv_fname)
if not os.path.isfile(tokens_fname):
return None
Copy link
Contributor

Choose a reason for hiding this comment

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

This looks good 👍 thanks @ktsakalozos

@Cynerva
Copy link
Contributor

Cynerva commented Jun 30, 2017

/approve no-issue

@k8s-github-robot k8s-github-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 30, 2017
@Cynerva
Copy link
Contributor

Cynerva commented Jun 30, 2017

/assign @Cynerva

@Cynerva
Copy link
Contributor

Cynerva commented Jun 30, 2017

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 30, 2017
@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Cynerva, ktsakalozos

Associated issue requirement bypassed by: Cynerva

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@Cynerva
Copy link
Contributor

Cynerva commented Jun 30, 2017

/retest

@k8s-github-robot
Copy link

Automatic merge from submit-queue (batch tested with PRs 48317, 48313, 48351, 48357, 48115)

@k8s-github-robot k8s-github-robot merged commit dc59729 into kubernetes:master Jul 1, 2017
@Cynerva Cynerva deleted the bug/get-pass branch July 3, 2017 12:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Cynerva Cynerva Cynerva left review comments

Assignees

@marcoceppi marcoceppi

@j3ffml j3ffml

@Cynerva Cynerva

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Install hook fails if '/root/cdk/basic_auth.csv' is not in place
7 participants
@ktsakalozos @k8s-ci-robot @spiffxp @Cynerva @k8s-github-robot @marcoceppi @j3ffml