admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3711 from yuswift/upgrade_crd

Browse Source 
upgrade crd to apiextensions/v1
This commit is contained in:
KubeSphere CI Bot
2021-04-11 13:35:15 +08:00
committed by GitHub
parent a055e8edd1 a35da047f3
commit a9a0be79d1
3 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/apiserver/apiserver.go
View File

@@ -535,7 +535,7 @@ func (s *APIServer) waitForResourceSync(stopCh <-chan struct{}) error {
apiextensionsInformerFactory := s.InformerFactory.ApiExtensionSharedInformerFactory()
apiextensionsGVRs := []schema.GroupVersionResource{
{Group: "apiextensions.k8s.io", Version: "v1beta1", Resource: "customresourcedefinitions"},
{Group: "apiextensions.k8s.io", Version: "v1", Resource: "customresourcedefinitions"},
}
for _, gvr := range apiextensionsGVRs {

15
pkg/models/resources/v1alpha3/customresourcedefinition/customresourcedefinitions.go
View File

@@ -19,7 +19,7 @@ package customresourcedefinition
import (
"strings"
"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
apiextensionsinformers "k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions"
"k8s.io/apimachinery/pkg/runtime"
@@ -38,15 +38,12 @@ func New(informers apiextensionsinformers.SharedInformerFactory) v1alpha3.Interf
}
}
// The reason we are still using v1beta1 instead of stable v1 is v1 is not released yet
// in Kubernetes v1.15.x, while v1.15.x is in our supporting list. Maybe we can change
// it to v1 when v1.15.x is no longer officially supported.
func (c crdGetter) Get(_, name string) (runtime.Object, error) {
return c.informers.Apiextensions().V1beta1().CustomResourceDefinitions().Lister().Get(name)
return c.informers.Apiextensions().V1().CustomResourceDefinitions().Lister().Get(name)
}
func (c crdGetter) List(_ string, query *query.Query) (*api.ListResult, error) {
crds, err := c.informers.Apiextensions().V1beta1().CustomResourceDefinitions().Lister().List(query.Selector())
crds, err := c.informers.Apiextensions().V1().CustomResourceDefinitions().Lister().List(query.Selector())
if err != nil {
return nil, err
}
@@ -60,12 +57,12 @@ func (c crdGetter) List(_ string, query *query.Query) (*api.ListResult, error) {
}
func (c crdGetter) compare(left runtime.Object, right runtime.Object, field query.Field) bool {
leftCRD, ok := left.(*v1beta1.CustomResourceDefinition)
leftCRD, ok := left.(*v1.CustomResourceDefinition)
if !ok {
return false
}
rightCRD, ok := right.(*v1beta1.CustomResourceDefinition)
rightCRD, ok := right.(*v1.CustomResourceDefinition)
if !ok {
return false
}
@@ -74,7 +71,7 @@ func (c crdGetter) compare(left runtime.Object, right runtime.Object, field quer
}
func (c crdGetter) filter(object runtime.Object, filter query.Filter) bool {
crd, ok := object.(*v1beta1.CustomResourceDefinition)
crd, ok := object.(*v1.CustomResourceDefinition)
if !ok {
return false
}

10
pkg/models/resources/v1alpha3/customresourcedefinition/customresourcedefinitions_test.go
View File

@@ -20,7 +20,7 @@ import (
"testing"
"github.com/google/go-cmp/cmp"
"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
fakeapiextensions "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake"
apiextensionsinformers "k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -30,7 +30,7 @@ import (
"kubesphere.io/kubesphere/pkg/apiserver/query"
)
var crds = []*v1beta1.CustomResourceDefinition{
var crds = []*v1.CustomResourceDefinition{
{
ObjectMeta: metav1.ObjectMeta{
Name: "clusters.cluster.kubesphere.io",
@@ -49,7 +49,7 @@ var crds = []*v1beta1.CustomResourceDefinition{
},
}
func crdsToRuntimeObjects(crds ...*v1beta1.CustomResourceDefinition) []runtime.Object {
func crdsToRuntimeObjects(crds ...*v1.CustomResourceDefinition) []runtime.Object {
items := make([]runtime.Object, 0)
for _, crd := range crds {
@@ -59,7 +59,7 @@ func crdsToRuntimeObjects(crds ...*v1beta1.CustomResourceDefinition) []runtime.O
return items
}
func crdsToInterface(crds ...*v1beta1.CustomResourceDefinition) []interface{} {
func crdsToInterface(crds ...*v1.CustomResourceDefinition) []interface{} {
items := make([]interface{}, 0)
for _, crd := range crds {
@@ -93,7 +93,7 @@ func TestCrdGetterList(t *testing.T) {
informers := apiextensionsinformers.NewSharedInformerFactory(client, 0)
for _, crd := range crds {
informers.Apiextensions().V1beta1().CustomResourceDefinitions().Informer().GetIndexer().Add(crd)
informers.Apiextensions().V1().CustomResourceDefinitions().Informer().GetIndexer().Add(crd)
}
for _, testCase := range testCases {