github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #123634 from liggitt/handler-race

Browse Source 
Fix discovery v2 conversion registration data race
This commit is contained in:
Kubernetes Prow Robot
2024-03-01 19:48:37 -08:00
committed by GitHub
parent 84c32fdb65 0e9cdf76ad
commit 95875b7723
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
staging/src/k8s.io/apiserver/pkg/apis/apidiscovery/v2/fuzzer_test.go
View File

@@ -37,9 +37,10 @@ func TestConversionRoundTrip(t *testing.T) {
scheme := runtime.NewScheme() scheme := runtime.NewScheme()
err := v2beta1scheme.AddToScheme(scheme) err := v2beta1scheme.AddToScheme(scheme)
require.NoError(t, err) require.NoError(t, err)
v2scheme.SchemeBuilder.Register(v2scheme.RegisterConversions)
err = v2scheme.AddToScheme(scheme) err = v2scheme.AddToScheme(scheme)
require.NoError(t, err) require.NoError(t, err)
err = v2scheme.RegisterConversions(scheme)
require.NoError(t, err)
fuzzer := fuzz.NewWithSeed(2374375) fuzzer := fuzz.NewWithSeed(2374375)

4
staging/src/k8s.io/apiserver/pkg/endpoints/discovery/aggregated/handler.go
View File

@@ -151,10 +151,10 @@ type priorityInfo struct {
func NewResourceManager(path string) ResourceManager { func NewResourceManager(path string) ResourceManager {
scheme := runtime.NewScheme() scheme := runtime.NewScheme()
// Register conversion for apidiscovery
apidiscoveryv2.SchemeBuilder.Register(apidiscoveryv2conversion.RegisterConversions)
utilruntime.Must(apidiscoveryv2.AddToScheme(scheme)) utilruntime.Must(apidiscoveryv2.AddToScheme(scheme))
utilruntime.Must(apidiscoveryv2beta1.AddToScheme(scheme)) utilruntime.Must(apidiscoveryv2beta1.AddToScheme(scheme))
// Register conversion for apidiscovery
utilruntime.Must(apidiscoveryv2conversion.RegisterConversions(scheme))
codecs := serializer.NewCodecFactory(scheme) codecs := serializer.NewCodecFactory(scheme)
rdm := &resourceDiscoveryManager{ rdm := &resourceDiscoveryManager{

5
staging/src/k8s.io/apiserver/pkg/endpoints/discovery/aggregated/handler_test.go
View File

@@ -32,6 +32,7 @@ import (
fuzz "github.com/google/gofuzz" fuzz "github.com/google/gofuzz"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
apidiscoveryv2 "k8s.io/api/apidiscovery/v2" apidiscoveryv2 "k8s.io/api/apidiscovery/v2"
apidiscoveryv2beta1 "k8s.io/api/apidiscovery/v2beta1" apidiscoveryv2beta1 "k8s.io/api/apidiscovery/v2beta1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -50,10 +51,10 @@ var codecs = runtimeserializer.NewCodecFactory(scheme)
const discoveryPath = "/apis" const discoveryPath = "/apis"
func init() { func init() {
// Register conversion for apidiscovery
apidiscoveryv2.SchemeBuilder.Register(apidiscoveryv2conversion.RegisterConversions)
utilruntime.Must(apidiscoveryv2.AddToScheme(scheme)) utilruntime.Must(apidiscoveryv2.AddToScheme(scheme))
utilruntime.Must(apidiscoveryv2beta1.AddToScheme(scheme)) utilruntime.Must(apidiscoveryv2beta1.AddToScheme(scheme))
// Register conversion for apidiscovery
utilruntime.Must(apidiscoveryv2conversion.RegisterConversions(scheme))
codecs = runtimeserializer.NewCodecFactory(scheme) codecs = runtimeserializer.NewCodecFactory(scheme)
} }

4
staging/src/k8s.io/kube-aggregator/pkg/apiserver/handler_discovery.go
View File

@@ -187,10 +187,10 @@ func NewDiscoveryManager(
target discoveryendpoint.ResourceManager, target discoveryendpoint.ResourceManager,
) DiscoveryAggregationController { ) DiscoveryAggregationController {
discoveryScheme := runtime.NewScheme() discoveryScheme := runtime.NewScheme()
// Register conversion for apidiscovery
apidiscoveryv2.SchemeBuilder.Register(apidiscoveryv2conversion.RegisterConversions)
utilruntime.Must(apidiscoveryv2.AddToScheme(discoveryScheme)) utilruntime.Must(apidiscoveryv2.AddToScheme(discoveryScheme))
utilruntime.Must(apidiscoveryv2beta1.AddToScheme(discoveryScheme)) utilruntime.Must(apidiscoveryv2beta1.AddToScheme(discoveryScheme))
// Register conversion for apidiscovery
utilruntime.Must(apidiscoveryv2conversion.RegisterConversions(discoveryScheme))
codecs := serializer.NewCodecFactory(discoveryScheme) codecs := serializer.NewCodecFactory(discoveryScheme)
return &discoveryManager{ return &discoveryManager{