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

fix host cluster reconcile bug (#2479)

Browse Source 
Signed-off-by: Jeff <zw0948@gmail.com>
This commit is contained in:
zryfish
2020-07-19 01:22:32 +08:00
committed by GitHub
parent b7eb64dd95
commit 89f850466d
5 changed files with 112 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,7 +18,7 @@ package customresourcedefinition
import (
"github.com/google/go-cmp/cmp"
v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
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"
@@ -28,7 +28,7 @@ import (
"testing"
)
var crds = []*v1.CustomResourceDefinition{
var crds = []*v1beta1.CustomResourceDefinition{
{
ObjectMeta: metav1.ObjectMeta{
Name: "clusters.cluster.kubesphere.io",
@@ -47,7 +47,7 @@ var crds = []*v1.CustomResourceDefinition{
},
}
func crdsToRuntimeObjects(crds ...*v1.CustomResourceDefinition) []runtime.Object {
func crdsToRuntimeObjects(crds ...*v1beta1.CustomResourceDefinition) []runtime.Object {
items := make([]runtime.Object, 0)
for _, crd := range crds {
@@ -57,7 +57,7 @@ func crdsToRuntimeObjects(crds ...*v1.CustomResourceDefinition) []runtime.Object
return items
}
func crdsToInterface(crds ...*v1.CustomResourceDefinition) []interface{} {
func crdsToInterface(crds ...*v1beta1.CustomResourceDefinition) []interface{} {
items := make([]interface{}, 0)
for _, crd := range crds {
@@ -91,7 +91,7 @@ func TestCrdGetterList(t *testing.T) {
informers := apiextensionsinformers.NewSharedInformerFactory(client, 0)
for _, crd := range crds {
informers.Apiextensions().V1().CustomResourceDefinitions().Informer().GetIndexer().Add(crd)
informers.Apiextensions().V1beta1().CustomResourceDefinitions().Informer().GetIndexer().Add(crd)
}
for _, testCase := range testCases {