diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/conversion/converter.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/conversion/converter.go index 96b2b89e0e8..0ae9093a39b 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/conversion/converter.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/conversion/converter.go @@ -57,7 +57,7 @@ func (m *CRConverterFactory) NewConverter(crd *apiextensionsv1.CustomResourceDef validVersions[schema.GroupVersion{Group: crd.Spec.Group, Version: version.Name}] = true } - var converter crConverterInterface + var converter CRConverter switch crd.Spec.Conversion.Strategy { case apiextensionsv1.NoneConverter: converter = &nopConverter{} @@ -91,8 +91,8 @@ func (m *CRConverterFactory) NewConverter(crd *apiextensionsv1.CustomResourceDef return &safeConverterWrapper{unsafe}, unsafe, nil } -// crConverterInterface is the interface all cr converters must implement -type crConverterInterface interface { +// CRConverter is the interface all CR converters must implement +type CRConverter interface { // 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 // a safe converter will be returned. @@ -103,7 +103,7 @@ type crConverterInterface interface { // user defined conversion strategy given in the CustomResourceDefinition. type crConverter struct { convertScale bool - converter crConverterInterface + converter CRConverter validVersions map[schema.GroupVersion]bool clusterScoped bool } diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/conversion/metrics.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/conversion/metrics.go index 744046b5b47..e4c6657af60 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/conversion/metrics.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/conversion/metrics.go @@ -43,15 +43,15 @@ func newConverterMetricFactory() *converterMetricFactory { return &converterMetricFactory{durations: map[string]*metrics.HistogramVec{}, factoryLock: sync.Mutex{}} } -var _ crConverterInterface = &converterMetric{} +var _ CRConverter = &converterMetric{} type converterMetric struct { - delegate crConverterInterface + delegate CRConverter latencies *metrics.HistogramVec 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() defer c.factoryLock.Unlock() metric, exists := c.durations["webhook"] diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/conversion/nop_converter.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/conversion/nop_converter.go index 8254fdfc0b9..ed7c3e8ac95 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/conversion/nop_converter.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/conversion/nop_converter.go @@ -26,7 +26,7 @@ import ( 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. func (c *nopConverter) Convert(in runtime.Object, targetGV schema.GroupVersion) (runtime.Object, error) { diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/conversion/webhook_converter.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/conversion/webhook_converter.go index e72454931fa..3cb05cef5b4 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/conversion/webhook_converter.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/conversion/webhook_converter.go @@ -96,7 +96,7 @@ func webhookClientConfigForCRD(crd *v1.CustomResourceDefinition) *webhook.Client return &ret } -var _ crConverterInterface = &webhookConverter{} +var _ CRConverter = &webhookConverter{} func (f *webhookConverterFactory) NewWebhookConverter(crd *v1.CustomResourceDefinition) (*webhookConverter, error) { restClient, err := f.clientManager.HookClient(*webhookClientConfigForCRD(crd))