Merge pull request #589 from XiShanYongYe-Chang/cluster-api-v4

add cluster-api schemes

go.mod

@@ -9,7 +9,7 @@ require (
 	github.com/kr/pretty v0.3.0
 	github.com/onsi/ginkgo v1.16.4
 	github.com/onsi/gomega v1.14.0
-	github.com/spf13/cobra v1.1.1
+	github.com/spf13/cobra v1.1.3
 	github.com/spf13/pflag v1.0.5
 	k8s.io/api v0.21.3
 	k8s.io/apiextensions-apiserver v0.21.3
@@ -19,18 +19,20 @@ require (
 	k8s.io/code-generator v0.21.3
 	k8s.io/component-base v0.21.3
 	k8s.io/component-helpers v0.21.3
-	k8s.io/klog/v2 v2.8.0
+	k8s.io/klog/v2 v2.9.0
 	k8s.io/kubernetes v1.20.6
 	k8s.io/utils v0.0.0-20210722164352-7f3ee0f31471
+	sigs.k8s.io/cluster-api v0.4.0
 	sigs.k8s.io/controller-runtime v0.9.5
 	sigs.k8s.io/kind v0.10.0
 	sigs.k8s.io/mcs-api v0.1.0
 )
 
-// controller-runtime@v0.8.3 uses gnostic@v0.5.1 which not compatible with kubernetes@v1.20.6.
-// kubernetes@v1.20.6 using gnostic@v0.4.1.
 replace (
+	// kubernetes@v1.21.3 requires gnostic@v0.4.1 which is not compatible with gnostic@v0.5.1 that controller-runtime@v0.9.5 requires.
 	github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.4.1
+	// kubernete@v1.21.3 requires grpc@v1.27.1 which is not compatible with grpc@v1.39.x that cluster-api@v0.4.0 requires.
+	google.golang.org/grpc => google.golang.org/grpc v1.27.1
 	k8s.io/api => k8s.io/api v0.21.3
 	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.21.3
 	k8s.io/apimachinery => k8s.io/apimachinery v0.21.3

pkg/util/gclient/gclient.go

@@ -4,6 +4,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/rest"
+	clusterapiv1alpha4 "sigs.k8s.io/cluster-api/api/v1alpha4"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	mcsv1alpha1 "sigs.k8s.io/mcs-api/pkg/apis/v1alpha1"
 
@@ -16,11 +17,12 @@ import (
 var aggregatedScheme = runtime.NewScheme()
 
 func init() {
-	var _ = scheme.AddToScheme(aggregatedScheme)          // add Kubernetes schemes
-	var _ = clusterv1alpha1.AddToScheme(aggregatedScheme) // add cluster schemes
-	var _ = policyv1alpha1.AddToScheme(aggregatedScheme)  // add propagation schemes
-	var _ = workv1alpha1.AddToScheme(aggregatedScheme)    // add work schemes
-	var _ = mcsv1alpha1.AddToScheme(aggregatedScheme)     // add mcs-api schemes
+	var _ = scheme.AddToScheme(aggregatedScheme)             // add Kubernetes schemes
+	var _ = clusterv1alpha1.AddToScheme(aggregatedScheme)    // add cluster schemes
+	var _ = policyv1alpha1.AddToScheme(aggregatedScheme)     // add propagation schemes
+	var _ = workv1alpha1.AddToScheme(aggregatedScheme)       // add work schemes
+	var _ = mcsv1alpha1.AddToScheme(aggregatedScheme)        // add mcs-api schemes
+	var _ = clusterapiv1alpha4.AddToScheme(aggregatedScheme) // add cluster-api v1alpha4 schemes
 }
 
 // NewSchema returns a singleton schema set which aggregated Kubernetes's schemes and extended schemes.