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

Use NodeAuthorizer config options instead of soely hard-codes #7211

Merged
merged 2 commits into from
Jul 10, 2019

Conversation

jacksontj
Copy link
Contributor

Without this patch the timeout is 5m and the interval is 10m --
hard-coded with no mechanism to change, even though the config struct
already had a timeout option (which was completely unused)

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

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

@k8s-ci-robot k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jul 2, 2019
@k8s-ci-robot k8s-ci-robot requested review from geojaz and mikesplain July 2, 2019 23:23
@rifelpet
Copy link
Member

rifelpet commented Jul 3, 2019

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jul 3, 2019
Copy link
Contributor

@KashifSaadat KashifSaadat left a comment

Choose a reason for hiding this comment

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

@jacksontj thank you for the PR! There's a few small updates that will need doing before this can move through:

  1. Please can you additionally update the files pkg/apis/kops/v1alpha1/cluster.go and pkg/apis/kops/v1alpha2/cluster.go with the Interval inclusion
  2. Run make apimachinery

cc @gambol99

@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jul 3, 2019
@jacksontj
Copy link
Contributor Author

@KashifSaadat thanks, I have updated the PR -- hopefully it all passes :)

@jacksontj
Copy link
Contributor Author

Unfortunately all the e2e tests are still blocked on kubernetes/kubernetes#79305 -- it made an error fatal which every test run hits (details in slack )

@KashifSaadat
Copy link
Contributor

Tests should be sorted now, although there's a few conflicts, once they're sorted I'll LG and we can get this merged :)

jacksontj added 2 commits July 9, 2019 09:48
Without this patch the timeout is 5m and the interval is 10m --
hard-coded with no mechanism to change, even though the config struct
already had a timeout option (which was completely unused)
@jacksontj jacksontj force-pushed the node_authorizer_options branch from 2f2b71a to 0a4b18e Compare July 9, 2019 16:48
@jacksontj
Copy link
Contributor Author

jacksontj commented Jul 9, 2019

@KashifSaadat all set (rebased and tests are passing)!

@@ -189,6 +189,8 @@ type NodeAuthorizerSpec struct {
NodeURL string `json:"nodeURL,omitempty"`
// Port is the port the service is running on the master
Port int `json:"port,omitempty"`
// Interval the time between retires for authorization request
Copy link
Member

Choose a reason for hiding this comment

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

Nit: typo - retries

@@ -188,6 +188,8 @@ type NodeAuthorizerSpec struct {
NodeURL string `json:"nodeURL,omitempty"`
// Port is the port the service is running on the master
Port int `json:"port,omitempty"`
// Interval the time between retires for authorization request
Copy link
Member

Choose a reason for hiding this comment

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

copy-paste of retires typo

@@ -189,6 +189,8 @@ type NodeAuthorizerSpec struct {
NodeURL string `json:"nodeURL,omitempty"`
// Port is the port the service is running on the master
Port int `json:"port,omitempty"`
// Interval the time between retires for authorization request
Copy link
Member

Choose a reason for hiding this comment

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

nit: retires

timeout := 5 * time.Minute
if na.Timeout != nil {
Copy link
Member

Choose a reason for hiding this comment

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

Ah - you're right - it looks like we simply weren't using it! Thanks for fixing!

@justinsb
Copy link
Member

Minor typo (retires instead of retries) but I'm inclined to merge it and we can fix it later.

/approve
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 10, 2019
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jacksontj, 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 added a commit that referenced this pull request Jul 12, 2019
…1-upstream-release-1.12

Automated cherry pick of #7211: Use NodeAuthorizer config options instead of soely
k8s-ci-robot added a commit that referenced this pull request Jul 12, 2019
…1-upstream-release-1.14

Automated cherry pick of #7211: Use NodeAuthorizer config options instead of soely
k8s-ci-robot added a commit that referenced this pull request Jul 12, 2019
…1-upstream-release-1.13

Automated cherry pick of #7211: Use NodeAuthorizer config options instead of soely
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. 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.

5 participants