Update deps to 1.30 (#546)

Signed-off-by: Jian Qiu <jqiu@redhat.com>
2026-02-14 18:09:57 +00:00 · 2024-07-02 22:04:15 +08:00
parent 5dd2123342
commit 2582ad922d
1026 changed files with 58974 additions and 59738 deletions
--- a/pkg/addon/manager_test.go
+++ b/pkg/addon/manager_test.go
@@ -0,0 +1,83 @@
+package addon
+
+import (
+	"context"
+	"path/filepath"
+	"testing"
+
+	"github.com/onsi/ginkgo/v2"
+	"github.com/onsi/gomega"
+	"github.com/openshift/library-go/pkg/controller/controllercmd"
+	"k8s.io/client-go/kubernetes/scheme"
+	"k8s.io/client-go/rest"
+	"sigs.k8s.io/controller-runtime/pkg/envtest"
+	logf "sigs.k8s.io/controller-runtime/pkg/log"
+	"sigs.k8s.io/controller-runtime/pkg/log/zap"
+
+	addonv1alpha1 "open-cluster-management.io/api/addon/v1alpha1"
+	clusterv1 "open-cluster-management.io/api/cluster/v1"
+	clusterv1beta1 "open-cluster-management.io/api/cluster/v1beta1"
+	workv1 "open-cluster-management.io/api/work/v1"
+
+	"open-cluster-management.io/ocm/test/integration/util"
+)
+
+var testEnv *envtest.Environment
+var cfg *rest.Config
+
+func TestAddonManager(t *testing.T) {
+	gomega.RegisterFailHandler(ginkgo.Fail)
+	ginkgo.RunSpecs(t, "Addon Manager Suite")
+}
+
+var _ = ginkgo.BeforeSuite(func() {
+	logf.SetLogger(zap.New(zap.WriteTo(ginkgo.GinkgoWriter), zap.UseDevMode(true)))
+	ginkgo.By("bootstrapping test environment")
+	var err error
+
+	// start a kube-apiserver
+	testEnv = &envtest.Environment{
+		ErrorIfCRDPathMissing: true,
+		CRDDirectoryPaths: []string{
+			filepath.Join("../../", "vendor", "open-cluster-management.io", "api", "work", "v1", "0000_00_work.open-cluster-management.io_manifestworks.crd.yaml"),
+			filepath.Join("../../", "vendor", "open-cluster-management.io", "api", "cluster", "v1"),
+			filepath.Join("../../", "vendor", "open-cluster-management.io", "api", "cluster", "v1beta1"),
+			filepath.Join("../../", "vendor", "open-cluster-management.io", "api", "addon", "v1alpha1"),
+		},
+	}
+	cfg, err = testEnv.Start()
+	gomega.Expect(err).ToNot(gomega.HaveOccurred())
+	gomega.Expect(cfg).ToNot(gomega.BeNil())
+
+	err = workv1.Install(scheme.Scheme)
+	gomega.Expect(err).NotTo(gomega.HaveOccurred())
+	err = clusterv1beta1.Install(scheme.Scheme)
+	gomega.Expect(err).NotTo(gomega.HaveOccurred())
+	err = clusterv1.Install(scheme.Scheme)
+	gomega.Expect(err).NotTo(gomega.HaveOccurred())
+	err = addonv1alpha1.Install(scheme.Scheme)
+	gomega.Expect(err).NotTo(gomega.HaveOccurred())
+})
+
+var _ = ginkgo.AfterSuite(func() {
+	ginkgo.By("tearing down the test environment")
+
+	err := testEnv.Stop()
+	gomega.Expect(err).ToNot(gomega.HaveOccurred())
+})
+
+var _ = ginkgo.Describe("start hub manager", func() {
+	ginkgo.It("start hub manager", func() {
+		ctx, stopHub := context.WithCancel(context.Background())
+
+		// start hub controller
+		go func() {
+			err := RunManager(ctx, &controllercmd.ControllerContext{
+				KubeConfig:    cfg,
+				EventRecorder: util.NewIntegrationTestEventRecorder("integration"),
+			})
+			gomega.Expect(err).ToNot(gomega.HaveOccurred())
+		}()
+		stopHub()
+	})
+})
--- a/pkg/operator/operators/clustermanager/options_test.go
+++ b/pkg/operator/operators/clustermanager/options_test.go
@@ -0,0 +1,72 @@
+package clustermanager
+
+import (
+	"context"
+	"path/filepath"
+	"testing"
+
+	"github.com/onsi/ginkgo/v2"
+	"github.com/onsi/gomega"
+	"github.com/openshift/library-go/pkg/controller/controllercmd"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/client-go/rest"
+	"sigs.k8s.io/controller-runtime/pkg/envtest"
+	logf "sigs.k8s.io/controller-runtime/pkg/log"
+	"sigs.k8s.io/controller-runtime/pkg/log/zap"
+
+	"open-cluster-management.io/ocm/test/integration/util"
+)
+
+var testEnv *envtest.Environment
+var cfg *rest.Config
+
+func TestClusterManager(t *testing.T) {
+	gomega.RegisterFailHandler(ginkgo.Fail)
+	ginkgo.RunSpecs(t, "ClusterManager Suite")
+}
+
+var _ = ginkgo.BeforeSuite(func() {
+	logf.SetLogger(zap.New(zap.WriteTo(ginkgo.GinkgoWriter), zap.UseDevMode(true)))
+
+	ginkgo.By("bootstrapping test environment")
+
+	var err error
+	// install operator CRDs and start a local kube-apiserver
+	testEnv = &envtest.Environment{
+		ErrorIfCRDPathMissing: true,
+		CRDDirectoryPaths: []string{
+			filepath.Join("../../../../", "deploy", "cluster-manager", "olm-catalog", "latest", "manifests"),
+		},
+	}
+	cfg, err = testEnv.Start()
+	cfg.QPS = 100
+	cfg.Burst = 200
+
+	gomega.Expect(err).ToNot(gomega.HaveOccurred())
+	gomega.Expect(cfg).ToNot(gomega.BeNil())
+})
+
+var _ = ginkgo.AfterSuite(func() {
+	ginkgo.By("tearing down the test environment")
+
+	err := testEnv.Stop()
+	gomega.Expect(err).ToNot(gomega.HaveOccurred())
+})
+
+var _ = ginkgo.Describe("start cluster manager", func() {
+	ginkgo.It("start hub manager", func() {
+		ctx, stopHub := context.WithCancel(context.Background())
+
+		// start hub controller
+		go func() {
+			o := &Options{}
+			err := o.RunClusterManagerOperator(ctx, &controllercmd.ControllerContext{
+				KubeConfig:        cfg,
+				EventRecorder:     util.NewIntegrationTestEventRecorder("integration"),
+				OperatorNamespace: metav1.NamespaceDefault,
+			})
+			gomega.Expect(err).NotTo(gomega.HaveOccurred())
+		}()
+		stopHub()
+	})
+})
--- a/pkg/operator/operators/klusterlet/options_test.go
+++ b/pkg/operator/operators/klusterlet/options_test.go
@@ -0,0 +1,70 @@
+package klusterlet
+
+import (
+	"context"
+	"path/filepath"
+	"testing"
+
+	"github.com/onsi/ginkgo/v2"
+	"github.com/onsi/gomega"
+	"github.com/openshift/library-go/pkg/controller/controllercmd"
+	"k8s.io/client-go/rest"
+	"sigs.k8s.io/controller-runtime/pkg/envtest"
+	logf "sigs.k8s.io/controller-runtime/pkg/log"
+	"sigs.k8s.io/controller-runtime/pkg/log/zap"
+
+	"open-cluster-management.io/ocm/test/integration/util"
+)
+
+var testEnv *envtest.Environment
+var cfg *rest.Config
+
+func TestKlusterlet(t *testing.T) {
+	gomega.RegisterFailHandler(ginkgo.Fail)
+	ginkgo.RunSpecs(t, "Klusterlet Suite")
+}
+
+var _ = ginkgo.BeforeSuite(func() {
+	logf.SetLogger(zap.New(zap.WriteTo(ginkgo.GinkgoWriter), zap.UseDevMode(true)))
+
+	ginkgo.By("bootstrapping test environment")
+
+	var err error
+	// install operator CRDs and start a local kube-apiserver
+	testEnv = &envtest.Environment{
+		ErrorIfCRDPathMissing: true,
+		CRDDirectoryPaths: []string{
+			filepath.Join("../../../../", "deploy", "klusterlet", "olm-catalog", "latest", "manifests"),
+		},
+	}
+	cfg, err = testEnv.Start()
+	cfg.QPS = 100
+	cfg.Burst = 200
+
+	gomega.Expect(err).ToNot(gomega.HaveOccurred())
+	gomega.Expect(cfg).ToNot(gomega.BeNil())
+})
+
+var _ = ginkgo.AfterSuite(func() {
+	ginkgo.By("tearing down the test environment")
+
+	err := testEnv.Stop()
+	gomega.Expect(err).ToNot(gomega.HaveOccurred())
+})
+
+var _ = ginkgo.Describe("start klusterlet", func() {
+	ginkgo.It("start klusterlet", func() {
+		ctx, stopKlusterlet := context.WithCancel(context.Background())
+
+		// start hub controller
+		go func() {
+			o := &Options{EnableSyncLabels: true}
+			err := o.RunKlusterletOperator(ctx, &controllercmd.ControllerContext{
+				KubeConfig:    cfg,
+				EventRecorder: util.NewIntegrationTestEventRecorder("integration"),
+			})
+			gomega.Expect(err).NotTo(gomega.HaveOccurred())
+		}()
+		stopKlusterlet()
+	})
+})
--- a/pkg/placement/controllers/manager_test.go
+++ b/pkg/placement/controllers/manager_test.go
@@ -0,0 +1,80 @@
+package hub
+
+import (
+	"context"
+	"testing"
+
+	"github.com/onsi/ginkgo/v2"
+	"github.com/onsi/gomega"
+	"github.com/openshift/library-go/pkg/controller/controllercmd"
+	"k8s.io/client-go/kubernetes/scheme"
+	"k8s.io/client-go/rest"
+	"sigs.k8s.io/controller-runtime/pkg/envtest"
+	logf "sigs.k8s.io/controller-runtime/pkg/log"
+	"sigs.k8s.io/controller-runtime/pkg/log/zap"
+
+	clusterv1beta1 "open-cluster-management.io/api/cluster/v1beta1"
+	clusterv1beta2 "open-cluster-management.io/api/cluster/v1beta2"
+
+	"open-cluster-management.io/ocm/test/integration/util"
+)
+
+var testEnv *envtest.Environment
+var cfg *rest.Config
+
+var CRDPaths = []string{
+	"../../../vendor/open-cluster-management.io/api/cluster/v1/0000_00_clusters.open-cluster-management.io_managedclusters.crd.yaml",
+	"../../../vendor/open-cluster-management.io/api/cluster/v1alpha1/0000_05_clusters.open-cluster-management.io_addonplacementscores.crd.yaml",
+	"../../../vendor/open-cluster-management.io/api/cluster/v1beta2/0000_00_clusters.open-cluster-management.io_managedclustersets.crd.yaml",
+	"../../../vendor/open-cluster-management.io/api/cluster/v1beta2/0000_01_clusters.open-cluster-management.io_managedclustersetbindings.crd.yaml",
+	"../../../vendor/open-cluster-management.io/api/cluster/v1beta1/0000_02_clusters.open-cluster-management.io_placements.crd.yaml",
+	"../../../vendor/open-cluster-management.io/api/cluster/v1beta1/0000_03_clusters.open-cluster-management.io_placementdecisions.crd.yaml",
+}
+
+func TestPlacementManager(t *testing.T) {
+	gomega.RegisterFailHandler(ginkgo.Fail)
+	ginkgo.RunSpecs(t, "Placement Suite")
+}
+
+var _ = ginkgo.BeforeSuite(func() {
+	logf.SetLogger(zap.New(zap.WriteTo(ginkgo.GinkgoWriter), zap.UseDevMode(true)))
+	ginkgo.By("bootstrapping test environment")
+	var err error
+
+	// start a kube-apiserver
+	testEnv = &envtest.Environment{
+		ErrorIfCRDPathMissing: true,
+		CRDDirectoryPaths:     CRDPaths,
+	}
+	cfg, err = testEnv.Start()
+	gomega.Expect(err).ToNot(gomega.HaveOccurred())
+	gomega.Expect(cfg).ToNot(gomega.BeNil())
+
+	err = clusterv1beta2.Install(scheme.Scheme)
+	gomega.Expect(err).NotTo(gomega.HaveOccurred())
+	err = clusterv1beta1.Install(scheme.Scheme)
+	gomega.Expect(err).NotTo(gomega.HaveOccurred())
+})
+
+var _ = ginkgo.AfterSuite(func() {
+	ginkgo.By("tearing down the test environment")
+
+	err := testEnv.Stop()
+	gomega.Expect(err).ToNot(gomega.HaveOccurred())
+})
+
+var _ = ginkgo.Describe("start hub manager", func() {
+	ginkgo.It("start hub manager", func() {
+		ctx, stopHub := context.WithCancel(context.Background())
+
+		// start hub controller
+		go func() {
+			err := RunControllerManager(ctx, &controllercmd.ControllerContext{
+				KubeConfig:    cfg,
+				EventRecorder: util.NewIntegrationTestEventRecorder("integration"),
+			})
+			gomega.Expect(err).ToNot(gomega.HaveOccurred())
+		}()
+		stopHub()
+	})
+})
--- a/pkg/registration/hub/manager_test.go
+++ b/pkg/registration/hub/manager_test.go
@@ -0,0 +1,101 @@
+package hub
+
+import (
+	"context"
+	"testing"
+
+	"github.com/onsi/ginkgo/v2"
+	"github.com/onsi/gomega"
+	"github.com/openshift/library-go/pkg/controller/controllercmd"
+	"k8s.io/client-go/kubernetes/scheme"
+	"k8s.io/client-go/rest"
+	"sigs.k8s.io/controller-runtime/pkg/envtest"
+	logf "sigs.k8s.io/controller-runtime/pkg/log"
+	"sigs.k8s.io/controller-runtime/pkg/log/zap"
+
+	clusterv1 "open-cluster-management.io/api/cluster/v1"
+	ocmfeature "open-cluster-management.io/api/feature"
+
+	"open-cluster-management.io/ocm/pkg/features"
+	"open-cluster-management.io/ocm/test/integration/util"
+)
+
+var testEnv *envtest.Environment
+var cfg *rest.Config
+
+var CRDPaths = []string{
+	// hub
+	"../../../vendor/open-cluster-management.io/api/cluster/v1/0000_00_clusters.open-cluster-management.io_managedclusters.crd.yaml",
+	"../../../vendor/open-cluster-management.io/api/work/v1/0000_00_work.open-cluster-management.io_manifestworks.crd.yaml",
+	"../../../vendor/open-cluster-management.io/api/addon/v1alpha1/0000_01_addon.open-cluster-management.io_managedclusteraddons.crd.yaml",
+	"../../../vendor/open-cluster-management.io/api/cluster/v1beta2/0000_00_clusters.open-cluster-management.io_managedclustersets.crd.yaml",
+	"../../../vendor/open-cluster-management.io/api/cluster/v1beta2/0000_01_clusters.open-cluster-management.io_managedclustersetbindings.crd.yaml",
+}
+
+func TestManager(t *testing.T) {
+	gomega.RegisterFailHandler(ginkgo.Fail)
+	ginkgo.RunSpecs(t, "Manager Suite")
+}
+
+var _ = ginkgo.BeforeSuite(func() {
+	logf.SetLogger(zap.New(zap.WriteTo(ginkgo.GinkgoWriter), zap.UseDevMode(true)))
+
+	ginkgo.By("bootstrapping test environment")
+
+	var err error
+
+	// install cluster CRD and start a local kube-apiserver
+	gomega.Expect(err).ToNot(gomega.HaveOccurred())
+
+	testEnv = &envtest.Environment{
+		ErrorIfCRDPathMissing: true,
+		CRDDirectoryPaths:     CRDPaths,
+	}
+
+	cfg, err = testEnv.Start()
+	gomega.Expect(err).ToNot(gomega.HaveOccurred())
+	gomega.Expect(cfg).ToNot(gomega.BeNil())
+
+	err = features.SpokeMutableFeatureGate.Add(ocmfeature.DefaultSpokeRegistrationFeatureGates)
+	gomega.Expect(err).ToNot(gomega.HaveOccurred())
+	err = features.HubMutableFeatureGate.Add(ocmfeature.DefaultHubRegistrationFeatureGates)
+	gomega.Expect(err).ToNot(gomega.HaveOccurred())
+
+	err = clusterv1.Install(scheme.Scheme)
+	gomega.Expect(err).NotTo(gomega.HaveOccurred())
+
+	// enable DefaultClusterSet feature gate
+	err = features.HubMutableFeatureGate.Set("DefaultClusterSet=true")
+	gomega.Expect(err).ToNot(gomega.HaveOccurred())
+
+	// enable ManagedClusterAutoApproval feature gate
+	err = features.HubMutableFeatureGate.Set("ManagedClusterAutoApproval=true")
+	gomega.Expect(err).NotTo(gomega.HaveOccurred())
+
+	// enable resourceCleanup feature gate
+	err = features.HubMutableFeatureGate.Set("ResourceCleanup=true")
+	gomega.Expect(err).NotTo(gomega.HaveOccurred())
+})
+
+var _ = ginkgo.AfterSuite(func() {
+	ginkgo.By("tearing down the test environment")
+
+	err := testEnv.Stop()
+	gomega.Expect(err).ToNot(gomega.HaveOccurred())
+})
+
+var _ = ginkgo.Describe("start hub manager", func() {
+	ginkgo.It("start hub manager", func() {
+		ctx, stopHub := context.WithCancel(context.Background())
+		m := NewHubManagerOptions()
+		m.ClusterAutoApprovalUsers = []string{util.AutoApprovalBootstrapUser}
+		go func() {
+			err := m.RunControllerManager(ctx, &controllercmd.ControllerContext{
+				KubeConfig:    cfg,
+				EventRecorder: util.NewIntegrationTestEventRecorder("hub"),
+			})
+			gomega.Expect(err).NotTo(gomega.HaveOccurred())
+		}()
+		stopHub()
+	})
+})
--- a/pkg/work/hub/manager_test.go
+++ b/pkg/work/hub/manager_test.go
@@ -0,0 +1,81 @@
+package hub
+
+import (
+	"context"
+	"testing"
+
+	"github.com/onsi/ginkgo/v2"
+	"github.com/onsi/gomega"
+	"github.com/openshift/library-go/pkg/controller/controllercmd"
+	"k8s.io/client-go/kubernetes/scheme"
+	"k8s.io/client-go/rest"
+	"sigs.k8s.io/controller-runtime/pkg/envtest"
+	logf "sigs.k8s.io/controller-runtime/pkg/log"
+	"sigs.k8s.io/controller-runtime/pkg/log/zap"
+
+	workapiv1 "open-cluster-management.io/api/work/v1"
+
+	"open-cluster-management.io/ocm/test/integration/util"
+)
+
+var testEnv *envtest.Environment
+var sourceConfigFileName string
+var cfg *rest.Config
+
+var CRDPaths = []string{
+	// hub
+	"../../../vendor/open-cluster-management.io/api/work/v1/0000_00_work.open-cluster-management.io_manifestworks.crd.yaml",
+	"../../../vendor/open-cluster-management.io/api/work/v1alpha1/0000_00_work.open-cluster-management.io_manifestworkreplicasets.crd.yaml",
+	"../../../vendor/open-cluster-management.io/api/cluster/v1beta1/0000_02_clusters.open-cluster-management.io_placements.crd.yaml",
+	"../../../vendor/open-cluster-management.io/api/cluster/v1beta1/0000_03_clusters.open-cluster-management.io_placementdecisions.crd.yaml",
+}
+
+func TestWorkManager(t *testing.T) {
+	gomega.RegisterFailHandler(ginkgo.Fail)
+	ginkgo.RunSpecs(t, "Work Manager Suite")
+}
+
+var _ = ginkgo.BeforeSuite(func() {
+	logf.SetLogger(zap.New(zap.WriteTo(ginkgo.GinkgoWriter), zap.UseDevMode(true)))
+	ginkgo.By("bootstrapping test environment")
+	var err error
+
+	// start a kube-apiserver
+	testEnv = &envtest.Environment{
+		ErrorIfCRDPathMissing: true,
+		CRDDirectoryPaths:     CRDPaths,
+	}
+	cfg, err = testEnv.Start()
+	gomega.Expect(err).ToNot(gomega.HaveOccurred())
+	gomega.Expect(cfg).ToNot(gomega.BeNil())
+
+	err = workapiv1.Install(scheme.Scheme)
+	gomega.Expect(err).NotTo(gomega.HaveOccurred())
+})
+
+var _ = ginkgo.AfterSuite(func() {
+	ginkgo.By("tearing down the test environment")
+
+	err := testEnv.Stop()
+	gomega.Expect(err).ToNot(gomega.HaveOccurred())
+})
+
+var _ = ginkgo.Describe("start hub manager", func() {
+	ginkgo.It("start hub manager", func() {
+		ctx, stopHub := context.WithCancel(context.Background())
+		opts := NewWorkHubManagerOptions()
+		opts.WorkDriver = "kube"
+		opts.WorkDriverConfig = sourceConfigFileName
+		hubConfig := NewWorkHubManagerConfig(opts)
+
+		// start hub controller
+		go func() {
+			err := hubConfig.RunWorkHubManager(ctx, &controllercmd.ControllerContext{
+				KubeConfig:    cfg,
+				EventRecorder: util.NewIntegrationTestEventRecorder("hub"),
+			})
+			gomega.Expect(err).NotTo(gomega.HaveOccurred())
+		}()
+		stopHub()
+	})
+})