mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 19:56:01 +00:00
Merge pull request #81703 from RainbowMango/pr_fix_static_failure_for_staging_kube-aggregator
Fix static failure from package: staging/src/k8s.io/kube-aggregator
This commit is contained in:
commit
16cde44e24
@ -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/go-to-protobuf/protobuf
|
||||
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/certificates
|
||||
vendor/k8s.io/kubectl/pkg/cmd/config
|
||||
|
@ -24,7 +24,6 @@ import (
|
||||
var (
|
||||
a APIServiceConditionType = "A"
|
||||
b APIServiceConditionType = "B"
|
||||
c APIServiceConditionType = "C"
|
||||
)
|
||||
|
||||
func TestGetAPIServiceConditionByType(t *testing.T) {
|
||||
|
@ -26,7 +26,6 @@ import (
|
||||
var (
|
||||
a v1.APIServiceConditionType = "A"
|
||||
b v1.APIServiceConditionType = "B"
|
||||
c v1.APIServiceConditionType = "C"
|
||||
)
|
||||
|
||||
func TestIsAPIServiceConditionTrue(t *testing.T) {
|
||||
|
@ -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 {
|
||||
return &apiregistrationv1.APIService{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: name},
|
||||
|
@ -120,8 +120,11 @@ func BuildAndRegisterAggregator(downloader *Downloader, delegationTarget server.
|
||||
}
|
||||
|
||||
// Install handler
|
||||
s.openAPIVersionedService, err = handler.RegisterOpenAPIVersionedService(
|
||||
specToServe, "/openapi/v2", pathHandler)
|
||||
s.openAPIVersionedService, err = handler.NewOpenAPIService(specToServe)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
err = s.openAPIVersionedService.RegisterOpenAPIVersionedService("/openapi/v2", pathHandler)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user