fix: fix csi topology scheduling

jwcesign · jwcesign · commit 026c3297de99 · 2024-11-21T01:13:31.000+08:00
Signed-off-by: jwcesign &lt;jwcesign@cloudpilot.ai&gt;
diff --git a/pkg/operator/operator.go b/pkg/operator/operator.go
@@ -25,7 +25,7 @@ import (
 	"github.com/samber/lo"
 	corev1 "k8s.io/api/core/v1"
 	"sigs.k8s.io/controller-runtime/pkg/log"
-	"sigs.k8s.io/karpenter/pkg/apis/v1beta1"
+	v1 "sigs.k8s.io/karpenter/pkg/apis/v1"
 	"sigs.k8s.io/karpenter/pkg/operator"
 
 	alicache "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/cache"
@@ -42,7 +42,7 @@ import (
 )
 
 func init() {
-	v1beta1.NormalizedLabels = lo.Assign(v1beta1.NormalizedLabels, map[string]string{"topology.diskplugin.csi.alibabacloud.com/zone": corev1.LabelTopologyZone})
+	v1.NormalizedLabels = lo.Assign(v1.NormalizedLabels, map[string]string{"topology.diskplugin.csi.alibabacloud.com/zone": corev1.LabelTopologyZone})
 }
 
 // Operator is injected into the AliCloud CloudProvider's factories

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ import (`
`25`	`25`	`"github.com/samber/lo"`
`26`	`26`	`corev1 "k8s.io/api/core/v1"`
`27`	`27`	`"sigs.k8s.io/controller-runtime/pkg/log"`
`28`		`- "sigs.k8s.io/karpenter/pkg/apis/v1beta1"`
	`28`	`+ v1 "sigs.k8s.io/karpenter/pkg/apis/v1"`
`29`	`29`	`"sigs.k8s.io/karpenter/pkg/operator"`
`30`	`30`
`31`	`31`	`alicache "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/cache"`
`@@ -42,7 +42,7 @@ import (`
`42`	`42`	`)`
`43`	`43`
`44`	`44`	`func init() {`
`45`		`- v1beta1.NormalizedLabels = lo.Assign(v1beta1.NormalizedLabels, map[string]string{"topology.diskplugin.csi.alibabacloud.com/zone": corev1.LabelTopologyZone})`
	`45`	`+ v1.NormalizedLabels = lo.Assign(v1.NormalizedLabels, map[string]string{"topology.diskplugin.csi.alibabacloud.com/zone": corev1.LabelTopologyZone})`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`// Operator is injected into the AliCloud CloudProvider's factories`