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

Autoset OpenAPI version w/o SecurityDefinitions #66411

Merged
merged 1 commit into from Jul 24, 2018

Conversation

@DirectXMan12
Copy link
Contributor

DirectXMan12 commented Jul 19, 2018

There's code to automatically populate OpenAPI info based on existing
generic apiserver config, but it only fires if securitydefinitions are
present. This doesn't make much sense, since this info is both required
and independent of security definitions, and there's no easy, generic
way to generate security definitions for an aggregated API server.

Release note:

Properly autopopulate OpenAPI version field without needing other OpenAPI fields present in generic API server code.
@DirectXMan12

This comment has been minimized.

@DirectXMan12

This comment has been minimized.

Copy link
Contributor Author

DirectXMan12 commented Jul 19, 2018

I'm assuming this wasn't intentional -- it doesn't seem like it should be the case.

@@ -387,7 +387,8 @@ func (c *Config) Complete(informers informers.SharedInformerFactory) CompletedCo
},
}
}

}
if c.OpenAPIConfig != nil {

This comment has been minimized.

@sttts

sttts Jul 20, 2018

Contributor

sgtm. It would maybe clearer to keep everything in the if c.OpenAPIConfig != nil block, but guard only the above code with c.OpenAPIConfig.SecurityDefinitions != nil.

This comment has been minimized.

@DirectXMan12

DirectXMan12 Jul 20, 2018

Author Contributor

either works for me. I went for the route of "less nested indentation", but the other way seems clearer in other regards. I'll switch.

Autoset OpenAPI version w/o SecurityDefinitions
There's code to automatically populate OpenAPI info based on existing
generic apiserver config, but it only fires if securitydefinitions are
present.  This doesn't make much sense, since this info is both required
and independent of security definitions, and there's no easy, generic
way to generate security definitions for an aggregated API server.

@DirectXMan12 DirectXMan12 force-pushed the DirectXMan12:bug/allow-setting-openapi-version-with-sec branch from 9aca723 to ef73bb6 Jul 20, 2018

@k8s-ci-robot k8s-ci-robot added size/M and removed size/XS labels Jul 20, 2018

@DirectXMan12

This comment has been minimized.

Copy link
Contributor Author

DirectXMan12 commented Jul 20, 2018

/assign @sttts

@fedebongio

This comment has been minimized.

Copy link
Contributor

fedebongio commented Jul 23, 2018

/cc @mbohlool

@k8s-ci-robot k8s-ci-robot requested a review from mbohlool Jul 23, 2018

@sttts

This comment has been minimized.

Copy link
Contributor

sttts commented Jul 24, 2018

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm label Jul 24, 2018

@k8s-ci-robot

This comment has been minimized.

Copy link
Contributor

k8s-ci-robot commented Jul 24, 2018

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: DirectXMan12, sttts

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-github-robot

This comment has been minimized.

Copy link
Contributor

k8s-github-robot commented Jul 24, 2018

/test all [submit-queue is verifying that this PR is safe to merge]

@k8s-github-robot

This comment has been minimized.

Copy link
Contributor

k8s-github-robot commented Jul 24, 2018

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions here.

@k8s-github-robot k8s-github-robot merged commit 4e5c781 into kubernetes:master Jul 24, 2018

17 of 18 checks passed

Submit Queue Required Github CI test is not green: pull-kubernetes-kubemark-e2e-gce-big
Details
cla/linuxfoundation DirectXMan12 authorized
Details
pull-kubernetes-bazel-build Job succeeded.
Details
pull-kubernetes-bazel-test Job succeeded.
Details
pull-kubernetes-cross Skipped
pull-kubernetes-e2e-gce Job succeeded.
Details
pull-kubernetes-e2e-gce-100-performance Job succeeded.
Details
pull-kubernetes-e2e-gce-device-plugin-gpu Job succeeded.
Details
pull-kubernetes-e2e-gke Skipped
pull-kubernetes-e2e-kops-aws Job succeeded.
Details
pull-kubernetes-e2e-kubeadm-gce Skipped
pull-kubernetes-integration Job succeeded.
Details
pull-kubernetes-kubemark-e2e-gce-big Job succeeded.
Details
pull-kubernetes-local-e2e Skipped
pull-kubernetes-local-e2e-containerized Skipped
pull-kubernetes-node-e2e Job succeeded.
Details
pull-kubernetes-typecheck Job succeeded.
Details
pull-kubernetes-verify Job succeeded.
Details

@DirectXMan12 DirectXMan12 deleted the DirectXMan12:bug/allow-setting-openapi-version-with-sec branch Jul 24, 2018

@mbohlool

This comment has been minimized.

Copy link
Member

mbohlool commented Jul 29, 2018

/lgtm

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.