support k8s 1.30

Author: mfanjie

.gitignore

@@ -21,6 +21,7 @@
 
 .idea/
 .vscode/
+.kiro/
 
 # binary
 bin/

Dockerfile

@@ -1,7 +1,7 @@
 ARG PKGNAME
 
 # Build the manager binary
-FROM golang:1.17.2-alpine as builder
+FROM golang:1.22.0-alpine as builder
 
 ARG LDFLAGS
 ARG PKGNAME

Makefile

@@ -164,7 +164,7 @@ ifeq (, $(shell which golangci-lint))
 	GOLANG_LINT_TMP_DIR=$$(mktemp -d) ;\
 	cd $$GOLANG_LINT_TMP_DIR ;\
 	go mod init tmp ;\
-	go get github.com/golangci/golangci-lint/cmd/golangci-lint@v1.43.0 ;\
+	go get github.com/golangci/golangci-lint/cmd/golangci-lint@v1.64.8 ;\
 	rm -rf $$GOLANG_LINT_TMP_DIR ;\
 	}
 GOLANG_LINT=$(shell go env GOPATH)/bin/golangci-lint

README.md

@@ -67,7 +67,7 @@ There are two options:
    ```
    2) Modify configfile of kube-scheduler(`scheduler-config.yaml`) to enable Dynamic scheduler plugin and configure plugin args:
    ```yaml
-   apiVersion: kubescheduler.config.k8s.io/v1beta2
+   apiVersion: kubescheduler.config.k8s.io/v1
    kind: KubeSchedulerConfiguration
    ...
    profiles:
@@ -200,11 +200,12 @@ Normal  Scheduled  28s   crane-scheduler  Successfully assigned default/cpu-stre
 
 |  Scheduler Image Version       | Supported Kubernetes Version |
 | ------------------------------ | :--------------------------: | 
+|         0.1.0                  |        >=1.30.0              |
 |         0.0.23                 |        >=1.22.0              |
 |         0.0.20                 |        >=1.18.0              | 
 
-The default scheudler image version is `0.0.23`, and you can run the following command for quick replacement:
+The default scheudler image version is `0.1.0`, and you can run the following command for quick replacement:
 
 ```bash
- KUBE_EDITOR="sed -i 's/v1beta2/v1beta1/g'" kubectl edit cm scheduler-config -n crane-system && KUBE_EDITOR="sed -i 's/0.0.23/0.0.20/g'" kubectl edit deploy crane-scheduler -n crane-system
+ KUBE_EDITOR="sed -i 's/v1/v1beta2/g'" kubectl edit cm scheduler-config -n crane-system && KUBE_EDITOR="sed -i 's/0.1.0/0.0.23/g'" kubectl edit deploy crane-scheduler -n crane-system
 ```

cmd/controller/app/server.go

@@ -79,7 +79,7 @@ func Run(cc *config.CompletedConfig, stopCh <-chan struct{}) error {
 	healthz.InstallHandler(healthMux, healthz.NamedCheck("crane-scheduler-controller", healthz.PingHealthz.Check))
 	go func() {
 		if err := http.ListenAndServe(fmt.Sprintf(":%s", cc.HealthPort), healthMux); err != nil {
-			klog.Fatal("failed to listen & server health server from port %s: %v", cc.HealthPort, err)
+			klog.Fatalf("failed to listen & server health server from port %s: %v", cc.HealthPort, err)
 		}
 	}()
 

cmd/scheduler/main.go

@@ -1,25 +1,35 @@
 package main
 
 import (
+	"context"
 	"fmt"
 	"math/rand"
 	"os"
 	"time"
 
+	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/component-base/logs"
 	"k8s.io/kubernetes/cmd/kube-scheduler/app"
+	"k8s.io/kubernetes/pkg/scheduler/framework"
 
 	_ "github.com/gocrane/crane-scheduler/pkg/plugins/apis/config/scheme"
 
 	"github.com/gocrane/crane-scheduler/pkg/plugins/dynamic"
 	"github.com/gocrane/crane-scheduler/pkg/plugins/noderesourcetopology"
 )
 
+// Adapter function to convert our plugin factory to the expected type
+func pluginFactoryAdapter(factoryFn func(runtime.Object, framework.Handle) (framework.Plugin, error)) func(context.Context, runtime.Object, framework.Handle) (framework.Plugin, error) {
+	return func(ctx context.Context, args runtime.Object, handle framework.Handle) (framework.Plugin, error) {
+		return factoryFn(args, handle)
+	}
+}
+
 func main() {
 	rand.Seed(time.Now().UTC().UnixNano())
 	cmd := app.NewSchedulerCommand(
-		app.WithPlugin(dynamic.Name, dynamic.NewDynamicScheduler),
-		app.WithPlugin(noderesourcetopology.Name, noderesourcetopology.New),
+		app.WithPlugin(dynamic.Name, pluginFactoryAdapter(dynamic.NewDynamicScheduler)),
+		app.WithPlugin(noderesourcetopology.Name, pluginFactoryAdapter(noderesourcetopology.New)),
 	)
 
 	logs.InitLogs()

deploy/controller/deployment.yaml

@@ -30,7 +30,7 @@ spec:
             - /controller
             - --policy-config-path=/data/policy.yaml
             - --prometheus-address=PROMETHEUS_ADDRESS
-          image: docker.io/gocrane/crane-scheduler-controller:0.0.23 
+          image: docker.io/gocrane/crane-scheduler-controller:0.1.0 
           imagePullPolicy: IfNotPresent
           volumeMounts:
             - mountPath: /data

deploy/manifests/dynamic/scheduler-config.yaml

@@ -1,4 +1,4 @@
-apiVersion: kubescheduler.config.k8s.io/v1beta2
+apiVersion: kubescheduler.config.k8s.io/v1
 kind: KubeSchedulerConfiguration
 leaderElection:
   leaderElect: true

deploy/manifests/noderesourcetopology/scheduler-config.yaml

@@ -1,4 +1,4 @@
-apiVersion: kubescheduler.config.k8s.io/v1beta2
+apiVersion: kubescheduler.config.k8s.io/v1
 kind: KubeSchedulerConfiguration
 leaderElection:
   leaderElect: true

deploy/scheduler/deployment.yaml

@@ -27,7 +27,7 @@ spec:
             defaultMode: 420
       containers:
         - name: crane-scheduler
-          image: docker.io/gocrane/crane-scheduler:0.0.23
+          image: docker.io/gocrane/crane-scheduler:0.1.0
           command:
             - /scheduler
             - --leader-elect=true
@@ -68,7 +68,7 @@ metadata:
   namespace: crane-system
 data:
   scheduler-config.yaml: |
-    apiVersion: kubescheduler.config.k8s.io/v1beta2
+    apiVersion: kubescheduler.config.k8s.io/v1
     kind: KubeSchedulerConfiguration
     leaderElection:
       leaderElect: true