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

Rename crConverterInterface to CRConverter

Browse Source 
Signed-off-by: Andy Goldstein <andy.goldstein@redhat.com>
This commit is contained in:
Andy Goldstein 2022-10-18 13:21:15 -04:00
parent bb6edfb96b
commit 02f8c48f75
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/conversion/converter.go
View File

@ -57,7 +57,7 @@ func (m *CRConverterFactory) NewConverter(crd *apiextensionsv1.CustomResourceDef
validVersions[schema.GroupVersion{Group: crd.Spec.Group, Version: version.Name}] = true validVersions[schema.GroupVersion{Group: crd.Spec.Group, Version: version.Name}] = true
} }
var converter crConverterInterface var converter CRConverter
switch crd.Spec.Conversion.Strategy { switch crd.Spec.Conversion.Strategy {
case apiextensionsv1.NoneConverter: case apiextensionsv1.NoneConverter:
converter = &nopConverter{} converter = &nopConverter{}
@ -91,8 +91,8 @@ func (m *CRConverterFactory) NewConverter(crd *apiextensionsv1.CustomResourceDef
return &safeConverterWrapper{unsafe}, unsafe, nil return &safeConverterWrapper{unsafe}, unsafe, nil
} }
// crConverterInterface is the interface all cr converters must implement // CRConverter is the interface all CR converters must implement
type crConverterInterface interface { type CRConverter interface {
// Convert converts in object to the given gvk and returns the converted object. // Convert converts in object to the given gvk and returns the converted object.
// Note that the function may mutate in object and return it. A safe wrapper will make sure // Note that the function may mutate in object and return it. A safe wrapper will make sure
// a safe converter will be returned. // a safe converter will be returned.
@ -103,7 +103,7 @@ type crConverterInterface interface {
// user defined conversion strategy given in the CustomResourceDefinition. // user defined conversion strategy given in the CustomResourceDefinition.
type crConverter struct { type crConverter struct {
convertScale bool convertScale bool
converter crConverterInterface converter CRConverter
validVersions map[schema.GroupVersion]bool validVersions map[schema.GroupVersion]bool
clusterScoped bool clusterScoped bool
} }

6
staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/conversion/metrics.go
View File

@ -43,15 +43,15 @@ func newConverterMetricFactory() *converterMetricFactory {
return &converterMetricFactory{durations: map[string]*metrics.HistogramVec{}, factoryLock: sync.Mutex{}} return &converterMetricFactory{durations: map[string]*metrics.HistogramVec{}, factoryLock: sync.Mutex{}}
} }
var _ crConverterInterface = &converterMetric{} var _ CRConverter = &converterMetric{}
type converterMetric struct { type converterMetric struct {
delegate crConverterInterface delegate CRConverter
latencies *metrics.HistogramVec latencies *metrics.HistogramVec
crdName string crdName string
} }
func (c *converterMetricFactory) addMetrics(crdName string, converter crConverterInterface) (crConverterInterface, error) { func (c *converterMetricFactory) addMetrics(crdName string, converter CRConverter) (CRConverter, error) {
c.factoryLock.Lock() c.factoryLock.Lock()
defer c.factoryLock.Unlock() defer c.factoryLock.Unlock()
metric, exists := c.durations["webhook"] metric, exists := c.durations["webhook"]

2
staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/conversion/nop_converter.go
View File

@ -26,7 +26,7 @@ import (
type nopConverter struct { type nopConverter struct {
} }
var _ crConverterInterface = &nopConverter{} var _ CRConverter = &nopConverter{}
// ConvertToVersion converts in object to the given gv in place and returns the same `in` object. // ConvertToVersion converts in object to the given gv in place and returns the same `in` object.
func (c *nopConverter) Convert(in runtime.Object, targetGV schema.GroupVersion) (runtime.Object, error) { func (c *nopConverter) Convert(in runtime.Object, targetGV schema.GroupVersion) (runtime.Object, error) {

2
staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/conversion/webhook_converter.go
View File

@ -96,7 +96,7 @@ func webhookClientConfigForCRD(crd *v1.CustomResourceDefinition) *webhook.Client
return &ret return &ret
} }
var _ crConverterInterface = &webhookConverter{} var _ CRConverter = &webhookConverter{}
func (f *webhookConverterFactory) NewWebhookConverter(crd *v1.CustomResourceDefinition) (*webhookConverter, error) { func (f *webhookConverterFactory) NewWebhookConverter(crd *v1.CustomResourceDefinition) (*webhookConverter, error) {
restClient, err := f.clientManager.HookClient(*webhookClientConfigForCRD(crd)) restClient, err := f.clientManager.HookClient(*webhookClientConfigForCRD(crd))