Skip to content

Commit 9b34fb0

Browse files
committed
Fix static failure from package: vendor/k8s.io/kube-aggregator
1 parent 7a81ecd commit 9b34fb0

File tree

5 files changed

+5
-17
lines changed

5 files changed

+5
-17
lines changed

hack/.staticcheck_failures

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -274,10 +274,6 @@ vendor/k8s.io/code-generator/cmd/client-gen/generators/fake
274274
vendor/k8s.io/code-generator/cmd/client-gen/generators/util
275275
vendor/k8s.io/code-generator/cmd/go-to-protobuf/protobuf
276276
vendor/k8s.io/component-base/metrics
277-
vendor/k8s.io/kube-aggregator/pkg/apis/apiregistration
278-
vendor/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1/helper
279-
vendor/k8s.io/kube-aggregator/pkg/controllers/autoregister
280-
vendor/k8s.io/kube-aggregator/pkg/controllers/openapi/aggregator
281277
vendor/k8s.io/kubectl/pkg/cmd/annotate
282278
vendor/k8s.io/kubectl/pkg/cmd/apply
283279
vendor/k8s.io/kubectl/pkg/cmd/certificates

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import (
2424
var (
2525
a APIServiceConditionType = "A"
2626
b APIServiceConditionType = "B"
27-
c APIServiceConditionType = "C"
2827
)
2928

3029
func TestGetAPIServiceConditionByType(t *testing.T) {

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import (
2626
var (
2727
a v1.APIServiceConditionType = "A"
2828
b v1.APIServiceConditionType = "B"
29-
c v1.APIServiceConditionType = "C"
3029
)
3130

3231
func TestIsAPIServiceConditionTrue(t *testing.T) {

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,6 @@ func newAutoRegisterManagedModifiedAPIService(name string) *apiregistrationv1.AP
5151
}
5252
}
5353

54-
func newAutoRegisterManagedOnStartModifiedAPIService(name string) *apiregistrationv1.APIService {
55-
return &apiregistrationv1.APIService{
56-
ObjectMeta: metav1.ObjectMeta{Name: name, Labels: map[string]string{AutoRegisterManagedLabel: string("onstart")}},
57-
Spec: apiregistrationv1.APIServiceSpec{
58-
Group: "something",
59-
},
60-
}
61-
}
62-
6354
func newAPIService(name string) *apiregistrationv1.APIService {
6455
return &apiregistrationv1.APIService{
6556
ObjectMeta: metav1.ObjectMeta{Name: name},

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,11 @@ func BuildAndRegisterAggregator(downloader *Downloader, delegationTarget server.
110110
}
111111

112112
// Install handler
113-
s.openAPIVersionedService, err = handler.RegisterOpenAPIVersionedService(
114-
specToServe, "/openapi/v2", pathHandler)
113+
s.openAPIVersionedService, err = handler.NewOpenAPIService(specToServe)
114+
if err != nil {
115+
return nil, err
116+
}
117+
err = s.openAPIVersionedService.RegisterOpenAPIVersionedService("/openapi/v2", pathHandler)
115118
if err != nil {
116119
return nil, err
117120
}

0 commit comments

Comments
 (0)