github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 14:07:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #81703 from RainbowMango/pr_fix_static_failure_for_staging_kube-aggregator

Browse Source 
Fix static failure from package: staging/src/k8s.io/kube-aggregator
This commit is contained in:
Kubernetes Prow Robot 2019-09-12 20:44:31 -07:00 committed by GitHub
commit 16cde44e24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hack/.staticcheck_failures
View File

@ -218,10 +218,6 @@ vendor/k8s.io/code-generator/cmd/client-gen/generators/fake
vendor/k8s.io/code-generator/cmd/client-gen/generators/util vendor/k8s.io/code-generator/cmd/client-gen/generators/util
vendor/k8s.io/code-generator/cmd/go-to-protobuf/protobuf vendor/k8s.io/code-generator/cmd/go-to-protobuf/protobuf
vendor/k8s.io/component-base/metrics vendor/k8s.io/component-base/metrics
vendor/k8s.io/kube-aggregator/pkg/apis/apiregistration
vendor/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1/helper
vendor/k8s.io/kube-aggregator/pkg/controllers/autoregister
vendor/k8s.io/kube-aggregator/pkg/controllers/openapi/aggregator
vendor/k8s.io/kubectl/pkg/cmd/annotate vendor/k8s.io/kubectl/pkg/cmd/annotate
vendor/k8s.io/kubectl/pkg/cmd/certificates vendor/k8s.io/kubectl/pkg/cmd/certificates
vendor/k8s.io/kubectl/pkg/cmd/config vendor/k8s.io/kubectl/pkg/cmd/config

1
staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/helpers_test.go
View File

@ -24,7 +24,6 @@ import (
var ( var (
a APIServiceConditionType = "A" a APIServiceConditionType = "A"
b APIServiceConditionType = "B" b APIServiceConditionType = "B"
c APIServiceConditionType = "C"
) )
func TestGetAPIServiceConditionByType(t *testing.T) { func TestGetAPIServiceConditionByType(t *testing.T) {

1
staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1/helper/helpers_test.go
View File

@ -26,7 +26,6 @@ import (
var ( var (
a v1.APIServiceConditionType = "A" a v1.APIServiceConditionType = "A"
b v1.APIServiceConditionType = "B" b v1.APIServiceConditionType = "B"
c v1.APIServiceConditionType = "C"
) )
func TestIsAPIServiceConditionTrue(t *testing.T) { func TestIsAPIServiceConditionTrue(t *testing.T) {

9
staging/src/k8s.io/kube-aggregator/pkg/controllers/autoregister/autoregister_controller_test.go
View File

@ -51,15 +51,6 @@ func newAutoRegisterManagedModifiedAPIService(name string) *apiregistrationv1.AP
} }
} }
func newAutoRegisterManagedOnStartModifiedAPIService(name string) *apiregistrationv1.APIService {
return &apiregistrationv1.APIService{
ObjectMeta: metav1.ObjectMeta{Name: name, Labels: map[string]string{AutoRegisterManagedLabel: string("onstart")}},
Spec: apiregistrationv1.APIServiceSpec{
Group: "something",
},
}
}
func newAPIService(name string) *apiregistrationv1.APIService { func newAPIService(name string) *apiregistrationv1.APIService {
return &apiregistrationv1.APIService{ return &apiregistrationv1.APIService{
ObjectMeta: metav1.ObjectMeta{Name: name}, ObjectMeta: metav1.ObjectMeta{Name: name},

7
staging/src/k8s.io/kube-aggregator/pkg/controllers/openapi/aggregator/aggregator.go
View File

@ -120,8 +120,11 @@ func BuildAndRegisterAggregator(downloader *Downloader, delegationTarget server.
} }
// Install handler // Install handler
s.openAPIVersionedService, err = handler.RegisterOpenAPIVersionedService( s.openAPIVersionedService, err = handler.NewOpenAPIService(specToServe)
specToServe, "/openapi/v2", pathHandler) if err != nil {
return nil, err
}
err = s.openAPIVersionedService.RegisterOpenAPIVersionedService("/openapi/v2", pathHandler)
if err != nil { if err != nil {
return nil, err return nil, err
} }