update go api

cybozu-go · May 22, 2024 · 208fa91 · 208fa91
1 parent f9269d4
commit 208fa91
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/api/v1beta2/mysqlcluster_webhook_test.go b/api/v1beta2/mysqlcluster_webhook_test.go
@@ -460,7 +460,7 @@ var _ = Describe("MySQLCluster Webhook", func() {
  Spec: mocov1beta2.PersistentVolumeClaimSpecApplyConfiguration(
  *corev1ac.PersistentVolumeClaimSpec().
  WithStorageClassName("default").
- WithResources(corev1ac.ResourceRequirements().
+ WithResources(corev1ac.VolumeResourceRequirements().
  WithRequests(corev1.ResourceList{
  corev1.ResourceStorage: resource.MustParse("1Gi"),
  }),
@@ -475,7 +475,7 @@ var _ = Describe("MySQLCluster Webhook", func() {
  Spec: mocov1beta2.PersistentVolumeClaimSpecApplyConfiguration(
  *corev1ac.PersistentVolumeClaimSpec().
  WithStorageClassName("not-support-volume-expansion").
- WithResources(corev1ac.ResourceRequirements().
+ WithResources(corev1ac.VolumeResourceRequirements().
  WithRequests(corev1.ResourceList{
  corev1.ResourceStorage: resource.MustParse("1Gi"),
  }),
@@ -507,7 +507,7 @@ var _ = Describe("MySQLCluster Webhook", func() {
  Spec: mocov1beta2.PersistentVolumeClaimSpecApplyConfiguration(
  *corev1ac.PersistentVolumeClaimSpec().
  WithStorageClassName("default").
- WithResources(corev1ac.ResourceRequirements().
+ WithResources(corev1ac.VolumeResourceRequirements().
  WithRequests(corev1.ResourceList{
  corev1.ResourceStorage: resource.MustParse("1Gi"),
  }),
@@ -522,7 +522,7 @@ var _ = Describe("MySQLCluster Webhook", func() {
  Spec: mocov1beta2.PersistentVolumeClaimSpecApplyConfiguration(
  *corev1ac.PersistentVolumeClaimSpec().
  WithStorageClassName("not-support-volume-expansion").
- WithResources(corev1ac.ResourceRequirements().
+ WithResources(corev1ac.VolumeResourceRequirements().
  WithRequests(corev1.ResourceList{
  corev1.ResourceStorage: resource.MustParse("1Gi"),
  }),

diff --git a/controllers/mysqlcluster_controller_test.go b/controllers/mysqlcluster_controller_test.go
@@ -25,7 +25,7 @@ import (
  "k8s.io/utils/ptr"
  ctrl "sigs.k8s.io/controller-runtime"
  "sigs.k8s.io/controller-runtime/pkg/client"
-
+ metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
  . "github.com/onsi/ginkgo"
  . "github.com/onsi/gomega"
 )
@@ -108,7 +108,9 @@ var _ = Describe("MySQLCluster reconciler", func() {
  mgr, err := ctrl.NewManager(cfg, ctrl.Options{
  Scheme: scheme,
  LeaderElection: false,
- MetricsBindAddress: "0",
+ Metrics: metricsserver.Options{
+ BindAddress: "0",
+ },
  })
  Expect(err).ToNot(HaveOccurred())