Upgrade controller runtime to v0.17.5 and k8s api to v0.29.5 (#4160)

* upgrade controller runtime version to 0.17.5 Signed-off-by: xliuqq <xlzq1992@gmail.com> * fix go mod Signed-off-by: xliuqq <xlzq1992@gmail.com> * fix pointer to ptr Signed-off-by: xliuqq <xlzq1992@gmail.com> * update from master Signed-off-by: xliuqq <xlzq1992@gmail.com> * fix api change Signed-off-by: xliuqq <xlzq1992@gmail.com> * fix go mod conflict Signed-off-by: xliuqq <xlzq1992@gmail.com> * empty line to trigger new test Signed-off-by: xliuqq <xlzq1992@gmail.com> * fix comment Signed-off-by: xliuqq <xlzq1992@gmail.com> * order import and add todo for offset Signed-off-by: xliuqq <xlzq1992@gmail.com> --------- Signed-off-by: xliuqq <xlzq1992@gmail.com>
fluid-cloudnative · Jul 31, 2024 · 6a65a9e · 6a65a9e
1 parent 81fafee
commit 6a65a9e
Show file tree

Hide file tree

Showing 1,067 changed files with 125,505 additions and 77,732 deletions.
diff --git a/Makefile b/Makefile
@@ -331,7 +331,7 @@ docker-buildx-all-push: pre-setup ${DOCKER_BUILDX_PUSH}
 
 # find or download controller-gen
 # download controller-gen if necessary
-# controller-gen@v0.12.1 comply with k8s.io/api v0.26.x
+# controller-gen@v0.14.0 comply with k8s.io/api v0.29.x
 controller-gen:
 ifeq (, $(shell which controller-gen))
 	@{ \
@@ -340,7 +340,7 @@ ifeq (, $(shell which controller-gen))
 	cd $$CONTROLLER_GEN_TMP_DIR ;\
 	export GO111MODULE=on ;\
 	go mod init tmp ;\
-	go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.12.1 ;\
+	go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 ;\
 	rm -rf $$CONTROLLER_GEN_TMP_DIR ;\
 	}
 CONTROLLER_GEN=$(GOBIN)/controller-gen

diff --git a/api/v1alpha1/openapi_generated.go b/api/v1alpha1/openapi_generated.go
diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/charts/fluid/fluid/crds/data.fluid.io_alluxioruntimes.yaml b/charts/fluid/fluid/crds/data.fluid.io_alluxioruntimes.yaml
diff --git a/charts/fluid/fluid/crds/data.fluid.io_databackups.yaml b/charts/fluid/fluid/crds/data.fluid.io_databackups.yaml
diff --git a/charts/fluid/fluid/crds/data.fluid.io_dataloads.yaml b/charts/fluid/fluid/crds/data.fluid.io_dataloads.yaml
diff --git a/charts/fluid/fluid/crds/data.fluid.io_datamigrates.yaml b/charts/fluid/fluid/crds/data.fluid.io_datamigrates.yaml
diff --git a/charts/fluid/fluid/crds/data.fluid.io_dataprocesses.yaml b/charts/fluid/fluid/crds/data.fluid.io_dataprocesses.yaml
diff --git a/charts/fluid/fluid/crds/data.fluid.io_datasets.yaml b/charts/fluid/fluid/crds/data.fluid.io_datasets.yaml
diff --git a/charts/fluid/fluid/crds/data.fluid.io_efcruntimes.yaml b/charts/fluid/fluid/crds/data.fluid.io_efcruntimes.yaml
diff --git a/charts/fluid/fluid/crds/data.fluid.io_goosefsruntimes.yaml b/charts/fluid/fluid/crds/data.fluid.io_goosefsruntimes.yaml
diff --git a/charts/fluid/fluid/crds/data.fluid.io_jindoruntimes.yaml b/charts/fluid/fluid/crds/data.fluid.io_jindoruntimes.yaml
diff --git a/charts/fluid/fluid/crds/data.fluid.io_juicefsruntimes.yaml b/charts/fluid/fluid/crds/data.fluid.io_juicefsruntimes.yaml
diff --git a/charts/fluid/fluid/crds/data.fluid.io_thinruntimeprofiles.yaml b/charts/fluid/fluid/crds/data.fluid.io_thinruntimeprofiles.yaml
diff --git a/charts/fluid/fluid/crds/data.fluid.io_thinruntimes.yaml b/charts/fluid/fluid/crds/data.fluid.io_thinruntimes.yaml
diff --git a/charts/fluid/fluid/crds/data.fluid.io_vineyardruntimes.yaml b/charts/fluid/fluid/crds/data.fluid.io_vineyardruntimes.yaml
diff --git a/cmd/alluxio/app/alluxio.go b/cmd/alluxio/app/alluxio.go
@@ -39,6 +39,7 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
+	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 )
 
 var (
@@ -114,13 +115,15 @@ func handle() {
 
 	utils.NewPprofServer(setupLog, pprofAddr, development)
 
+	// the default webhook server port is 9443, no need to set
 	mgr, err := ctrl.NewManager(controllers.GetConfigOrDieWithQPSAndBurst(kubeClientQPS, kubeClientBurst), ctrl.Options{
-		Scheme:                  scheme,
-		MetricsBindAddress:      metricsAddr,
+		Scheme: scheme,
+		Metrics: metricsserver.Options{
+			BindAddress: metricsAddr,
+		},
 		LeaderElection:          enableLeaderElection,
 		LeaderElectionNamespace: leaderElectionNamespace,
 		LeaderElectionID:        "alluxio.data.fluid.io",
-		Port:                    9443,
 		NewClient:               controllers.NewFluidControllerClient,
 	})
 	if err != nil {

diff --git a/cmd/csi/app/csi.go b/cmd/csi/app/csi.go
@@ -37,6 +37,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
 	ctrl "sigs.k8s.io/controller-runtime"
+	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 )
 
 var (
@@ -101,10 +102,12 @@ func handle() {
 		newPprofServer(pprofAddr)
 	}
 
+	// the default webhook server port is 9443, no need to set
 	mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
-		Scheme:             scheme,
-		MetricsBindAddress: metricsAddr,
-		Port:               9443,
+		Scheme: scheme,
+		Metrics: metricsserver.Options{
+			BindAddress: metricsAddr,
+		},
 	})
 
 	if err != nil {

diff --git a/cmd/dataset/app/dataset.go b/cmd/dataset/app/dataset.go
@@ -18,6 +18,7 @@ package app
 
 import (
 	"os"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 	"time"
 
 	"github.com/spf13/cobra"
@@ -33,6 +34,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/cache"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
+	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 
 	"github.com/fluid-cloudnative/fluid"
 	datav1alpha1 "github.com/fluid-cloudnative/fluid/api/v1alpha1"
@@ -121,14 +123,16 @@ func handle() {
 
 	utils.NewPprofServer(setupLog, pprofAddr, development)
 
+	// the default webhook server port is 9443, no need to set
 	mgr, err := ctrl.NewManager(controllers.GetConfigOrDieWithQPSAndBurst(kubeClientQPS, kubeClientBurst), ctrl.Options{
-		Scheme:                  scheme,
-		MetricsBindAddress:      metricsAddr,
+		Scheme: scheme,
+		Metrics: metricsserver.Options{
+			BindAddress: metricsAddr,
+		},
 		LeaderElection:          enableLeaderElection,
 		LeaderElectionNamespace: leaderElectionNamespace,
 		LeaderElectionID:        "dataset.data.fluid.io",
-		Port:                    9443,
-		NewCache:                NewCache(scheme),
+		Cache:                   NewCacheOptions(),
 		NewClient:               controllers.NewFluidControllerClient,
 	})
 	if err != nil {
@@ -232,21 +236,22 @@ func handle() {
 	}
 }
 
-func NewCache(scheme *runtime.Scheme) cache.NewCacheFunc {
-	selectors := make(cache.SelectorsByObject, 1)
+func NewCacheOptions() cache.Options {
+	var cronJobKey client.Object
 
 	if compatibility.IsBatchV1CronJobSupported() {
-		selectors[&batchv1.CronJob{}] = cache.ObjectSelector{Label: labels.SelectorFromSet(labels.Set{
-			common.JobPolicy: common.CronPolicy,
-		})}
+		cronJobKey = &batchv1.CronJob{}
 	} else {
-		selectors[&batchv1beta1.CronJob{}] = cache.ObjectSelector{Label: labels.SelectorFromSet(labels.Set{
-			common.JobPolicy: common.CronPolicy,
-		})}
+		cronJobKey = &batchv1beta1.CronJob{}
 	}
 
-	return cache.BuilderWithOptions(cache.Options{
-		Scheme:            scheme,
-		SelectorsByObject: selectors,
-	})
+	return cache.Options{
+		ByObject: map[client.Object]cache.ByObject{
+			cronJobKey: {
+				Label: labels.SelectorFromSet(labels.Set{
+					common.JobPolicy: common.CronPolicy,
+				}),
+			},
+		},
+	}
 }
diff --git a/cmd/efc/app/efc.go b/cmd/efc/app/efc.go
@@ -34,6 +34,7 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
+	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 
 	"github.com/fluid-cloudnative/fluid"
 	datav1alpha1 "github.com/fluid-cloudnative/fluid/api/v1alpha1"
@@ -113,13 +114,15 @@ func handle() {
 
 	utils.NewPprofServer(setupLog, pprofAddr, development)
 
+	// the default webhook server port is 9443, no need to set
 	mgr, err := ctrl.NewManager(controllers.GetConfigOrDieWithQPSAndBurst(kubeClientQPS, kubeClientBurst), ctrl.Options{
-		Scheme:                  scheme,
-		MetricsBindAddress:      metricsAddr,
+		Scheme: scheme,
+		Metrics: metricsserver.Options{
+			BindAddress: metricsAddr,
+		},
 		LeaderElection:          enableLeaderElection,
 		LeaderElectionNamespace: leaderElectionNamespace,
 		LeaderElectionID:        "efc.data.fluid.io",
-		Port:                    9443,
 		NewClient:               controllers.NewFluidControllerClient,
 	})
 	if err != nil {

diff --git a/cmd/fluidapp/app/fluidapp.go b/cmd/fluidapp/app/fluidapp.go
@@ -18,13 +18,16 @@ package app
 
 import (
 	"github.com/fluid-cloudnative/fluid/pkg/common"
+
 	"github.com/fluid-cloudnative/fluid/pkg/controllers/v1alpha1/fluidapp/dataflowaffinity"
 	"github.com/fluid-cloudnative/fluid/pkg/dataflow"
 	utilfeature "github.com/fluid-cloudnative/fluid/pkg/utils/feature"
 	batchv1 "k8s.io/api/batch/v1"
+
 	"k8s.io/apimachinery/pkg/labels"
 	"os"
 	"sigs.k8s.io/controller-runtime/pkg/cache"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/fluid-cloudnative/fluid"
 	"github.com/fluid-cloudnative/fluid/pkg/controllers/v1alpha1/fluidapp"
@@ -38,6 +41,7 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
+	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 )
 
 var (
@@ -91,14 +95,16 @@ func handle() {
 
 	utils.NewPprofServer(setupLog, pprofAddr, development)
 
+	// the default webhook server port is 9443, no need to set
 	mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
-		Scheme:                  scheme,
-		MetricsBindAddress:      metricsAddr,
+		Scheme: scheme,
+		Metrics: metricsserver.Options{
+			BindAddress: metricsAddr,
+		},
 		LeaderElection:          enableLeaderElection,
 		LeaderElectionNamespace: leaderElectionNamespace,
 		LeaderElectionID:        "fluidapp.data.fluid.io",
-		Port:                    9443,
-		NewCache:                NewCache(scheme),
+		Cache:                   newCacheOptions(),
 	})
 	if err != nil {
 		setupLog.Error(err, "unable to start fluid app manager")
@@ -135,10 +141,9 @@ func handle() {
 	}
 }
 
-func NewCache(scheme *runtime.Scheme) cache.NewCacheFunc {
+func newCacheOptions() cache.Options {
 	options := cache.Options{
-		Scheme: scheme,
-		SelectorsByObject: cache.SelectorsByObject{
+		ByObject: map[client.Object]cache.ByObject{
 			&corev1.Pod{}: {
 				Label: labels.SelectorFromSet(labels.Set{
 					// watch pods managed by fluid, like data operation pods, serverless app pods.
@@ -148,13 +153,13 @@ func NewCache(scheme *runtime.Scheme) cache.NewCacheFunc {
 		},
 	}
 	if dataflow.Enabled(dataflow.DataflowAffinity) {
-		options.SelectorsByObject[&batchv1.Job{}] = cache.ObjectSelector{
+		options.ByObject[&batchv1.Job{}] = cache.ByObject{
 			// watch data operation job
 			Label: labels.SelectorFromSet(labels.Set{
 				// only data operations create job resource and the jobs created by cronjob do not have this label.
 				common.LabelAnnotationManagedBy: common.Fluid,
 			}),
 		}
 	}
-	return cache.BuilderWithOptions(options)
+	return options
 }
diff --git a/cmd/goosefs/app/goosefs.go b/cmd/goosefs/app/goosefs.go
@@ -34,6 +34,7 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
+	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 )
 
 var (
@@ -98,13 +99,15 @@ func handle() {
 
 	utils.NewPprofServer(setupLog, pprofAddr, development)
 
+	// the default webhook server port is 9443, no need to set
 	mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
-		Scheme:                  scheme,
-		MetricsBindAddress:      metricsAddr,
+		Scheme: scheme,
+		Metrics: metricsserver.Options{
+			BindAddress: metricsAddr,
+		},
 		LeaderElection:          enableLeaderElection,
 		LeaderElectionNamespace: leaderElectionNamespace,
 		LeaderElectionID:        "goosefs.data.fluid.io",
-		Port:                    9443,
 	})
 	if err != nil {
 		setupLog.Error(err, "unable to start goosefsruntime manager")

diff --git a/cmd/jindo/app/jindo.go b/cmd/jindo/app/jindo.go
@@ -41,6 +41,7 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
+	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 )
 
 var (
@@ -121,13 +122,15 @@ func handle() {
 
 	utils.NewPprofServer(setupLog, pprofAddr, development)
 
+	// the default webhook server port is 9443, no need to set
 	mgr, err := ctrl.NewManager(controllers.GetConfigOrDieWithQPSAndBurst(kubeClientQPS, kubeClientBurst), ctrl.Options{
-		Scheme:                  scheme,
-		MetricsBindAddress:      metricsAddr,
+		Scheme: scheme,
+		Metrics: metricsserver.Options{
+			BindAddress: metricsAddr,
+		},
 		LeaderElection:          enableLeaderElection,
 		LeaderElectionNamespace: leaderElectionNamespace,
 		LeaderElectionID:        "jindo.data.fluid.io",
-		Port:                    9443,
 		NewClient:               controllers.NewFluidControllerClient,
 	})
 	if err != nil {

diff --git a/cmd/juicefs/app/juicefs.go b/cmd/juicefs/app/juicefs.go
@@ -30,10 +30,10 @@ import (
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/rest"
 	ctrl "sigs.k8s.io/controller-runtime"
-	"sigs.k8s.io/controller-runtime/pkg/cache"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
+	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 
 	"github.com/fluid-cloudnative/fluid/pkg/controllers"
 	"github.com/fluid-cloudnative/fluid/pkg/ddc/base/portallocator"
@@ -121,20 +121,21 @@ func handle() {
 
 	utils.NewPprofServer(setupLog, pprofAddr, development)
 
-	NewControllerClient := func(cache cache.Cache, config *rest.Config, options client.Options, uncachedObjects ...client.Object) (client.Client, error) {
-		return controllers.NewFluidControllerClient(cache, config, options,
-			append(uncachedObjects, &rbacv1.RoleBinding{}, &rbacv1.Role{}, &corev1.ServiceAccount{})...,
-		)
+	NewControllerClient := func(config *rest.Config, options client.Options) (client.Client, error) {
+		options.Cache.DisableFor = append(options.Cache.DisableFor, &rbacv1.RoleBinding{}, &rbacv1.Role{}, &corev1.ServiceAccount{})
+		return controllers.NewFluidControllerClient(config, options)
 	}
 
+	// the default webhook server port is 9443, no need to set
 	mgr, err := ctrl.NewManager(controllers.GetConfigOrDieWithQPSAndBurst(kubeClientQPS, kubeClientBurst), ctrl.Options{
-		Scheme:                  scheme,
-		MetricsBindAddress:      metricsAddr,
+		Scheme: scheme,
+		Metrics: metricsserver.Options{
+			BindAddress: metricsAddr,
+		},
 		LeaderElection:          enableLeaderElection,
 		LeaderElectionNamespace: leaderElectionNamespace,
 		LeaderElectionID:        "juicefs.data.fluid.io",
-		Port:                    9443,
-		NewCache:                juicefsctl.NewCache(scheme),
+		Cache:                   juicefsctl.NewCacheOption(),
 		NewClient:               NewControllerClient,
 	})
 	if err != nil {