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.

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

fix(apiserver): allow multiple service-account-key-file #7781

Merged

Conversation

@hatappi
Copy link
Contributor

hatappi commented Oct 14, 2019

What this PR does / why we need it:
Currently, an error occurs when multiple service-account-key-file are specified for kube-apiserver.
This PR will fix it.

Which issue(s) this PR fixes:
fixed #7645

Special notes for your reviewer:

@k8s-ci-robot

This comment has been minimized.

Copy link
Contributor

k8s-ci-robot commented Oct 14, 2019

Welcome @hatappi!

It looks like this is your first PR to kubernetes/kops 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes/kops has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot

This comment has been minimized.

Copy link
Contributor

k8s-ci-robot commented Oct 14, 2019

Thanks for your pull request. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please follow instructions at https://git.k8s.io/community/CLA.md#the-contributor-license-agreement to sign the CLA.

It may take a couple minutes for the CLA signature to be fully registered; after that, please reply here with a new comment and we'll verify. Thanks.


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

This comment has been minimized.

Copy link
Contributor

k8s-ci-robot commented Oct 14, 2019

Hi @hatappi. 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.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

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.

@hatappi

This comment has been minimized.

Copy link
Contributor Author

hatappi commented Oct 14, 2019

/check-cla

@hatappi

This comment has been minimized.

Copy link
Contributor Author

hatappi commented Oct 14, 2019

/assign @chrislovecnm

@rifelpet

This comment has been minimized.

Copy link
Member

rifelpet commented Oct 14, 2019

/ok-to-test

I confirmed the new test fails without the fix in place:

--- FAIL: Test_KubeAPIServer_BuildFlags (0.00s)
    ./nodeup/pkg/model/kube_apiserver_test.go:116: flags did not match.  actual="--insecure-port=0 --secure-port=0 --service-account-key-file=/srv/kubernetes/server.key,/srv/kubernetes/service-account.key" expected="--insecure-port=0 --secure-port=0 --service-account-key-file=/srv/kubernetes/server.key --service-account-key-file=/srv/kubernetes/service-account.key"
FAIL
exit status 1

and that the test's expected output is what kube-apiserver requires for the flag. Thanks @hatappi !
/lgtm

@justinsb

This comment has been minimized.

Copy link
Member

justinsb commented Oct 15, 2019

Thanks @hatappi

/approve
/lgtm

@k8s-ci-robot

This comment has been minimized.

Copy link
Contributor

k8s-ci-robot commented Oct 15, 2019

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hatappi, justinsb

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot merged commit 39cbb2b into kubernetes:master Oct 15, 2019
12 of 13 checks passed
12 of 13 checks passed
tide Not mergeable. Needs approved label.
Details
cla/linuxfoundation hatappi authorized
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
pull-kops-bazel-build Job succeeded.
Details
pull-kops-bazel-test Job succeeded.
Details
pull-kops-e2e-kubernetes-aws Job succeeded.
Details
pull-kops-verify-bazel Job succeeded.
Details
pull-kops-verify-boilerplate Job succeeded.
Details
pull-kops-verify-generated Job succeeded.
Details
pull-kops-verify-gofmt Job succeeded.
Details
pull-kops-verify-gomod Job succeeded.
Details
pull-kops-verify-govet Job succeeded.
Details
pull-kops-verify-packages Job succeeded.
Details
k8s-ci-robot added a commit that referenced this pull request Oct 15, 2019
…-origin-release-1.15

Automated cherry pick of #7781: fix(apiserver): allow multiple service-account-key-file
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.