Remove classic-dra

Signed-off-by: cyclinder <qifeng.guo@daocloud.io>
spidernet-io · Oct 28, 2024 · ed991b4 · ed991b4
1 parent a810abd
commit ed991b4
Show file tree

Hide file tree

Showing 239 changed files with 73 additions and 51,900 deletions.
diff --git a/charts/spiderpool/README.md b/charts/spiderpool/README.md
@@ -207,14 +207,6 @@ helm install spiderpool spiderpool/spiderpool --wait --namespace kube-system \
 | `multus.multusCNI.log.logLevel`               | the multus-CNI daemonset pod log level                                                                                                                                                                                                                                                                                                                                                           | `debug`                           |
 | `multus.multusCNI.log.logFile`                | the multus-CNI daemonset pod log file                                                                                                                                                                                                                                                                                                                                                            | `/var/log/multus.log`             |
 
-### dra parameters
-
-| Name                 | Description                | Value          |
-| -------------------- | -------------------------- | -------------- |
-| `dra.enabled`        | to enable dra feature      | `false`        |
-| `dra.cdiRootPath`    | the dir of cdi root        | `/var/run/cdi` |
-| `dra.hostDevicePath` | the dir path of the device | `""`           |
-
 ### plugins parameters
 
 | Name                             | Description                                                | Value                                        |

diff --git a/charts/spiderpool/templates/configmap.yaml b/charts/spiderpool/templates/configmap.yaml
@@ -26,10 +26,6 @@ data:
     {{- else}}
     clusterSubnetDefaultFlexibleIPNumber: 0
     {{- end }}
-    dra:
-      enabled: {{ .Values.dra.enabled }}
-      cdiRootPath: {{ .Values.dra.cdiRootPath }}
-      hostDevicePath: {{ .Values.dra.hostDevicePath }}
     tuneSysctlConfig: {{ .Values.spiderpoolAgent.tuneSysctlConfig }}
 {{- if .Values.multus.multusCNI.install }}
 ---

diff --git a/charts/spiderpool/templates/daemonset.yaml b/charts/spiderpool/templates/daemonset.yaml
@@ -203,7 +203,7 @@ spec:
         {{- with .Values.spiderpoolAgent.extraEnv }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
-        {{- if or .Values.dra.enabled .Values.spiderpoolAgent.tuneSysctlConfig .Values.spiderpoolAgent.securityContext }}
+        {{- if or .Values.spiderpoolAgent.tuneSysctlConfig .Values.spiderpoolAgent.securityContext }}
         securityContext:
           privileged: true
         {{- with .Values.spiderpoolAgent.securityContext }}
@@ -222,19 +222,6 @@ spec:
         - name: cni
           mountPath: /host/etc/cni/net.d
         {{- end }}
-        {{- if .Values.dra.enabled }}
-        - name: plugins-registry
-          mountPath: /var/lib/kubelet/plugins_registry
-        - name: plugins
-          mountPath: /var/lib/kubelet/plugins
-          mountPropagation: Bidirectional
-        - name: cdi
-          mountPath: /var/run/cdi
-        {{- if .Values.dra.hostDevicePath }}
-        - name: library
-          mountPath: {{ .Values.dra.hostDevicePath }}
-        {{- end }}
-        {{- end }}
         {{- if .Values.spiderpoolAgent.extraVolumes }}
         {{- include "tplvalues.render" ( dict "value" .Values.spiderpoolAgent.extraVolumeMounts "context" $ ) | nindent 8 }}
         {{- end }}
@@ -306,22 +293,6 @@ spec:
             - key: cni-conf.json
               path: 00-multus.conf
       {{- end }}
-      {{- if .Values.dra.enabled }}
-      - name: plugins-registry
-        hostPath:
-          path: /var/lib/kubelet/plugins_registry
-      - name: plugins
-        hostPath:
-          path: /var/lib/kubelet/plugins
-      - name: cdi
-        hostPath:
-          path: /var/run/cdi
-      {{- if .Values.dra.hostDevicePath }}
-      - name: library
-        hostPath: 
-          path: {{ .Values.dra.hostDevicePath }}
-      {{- end }}
-      {{- end }}
       {{- if .Values.spiderpoolAgent.extraVolumeMounts }}
       {{- include "tplvalues.render" ( dict "value" .Values.spiderpoolAgent.extraVolumeMounts "context" $ ) | nindent 6 }}
       {{- end }}

diff --git a/charts/spiderpool/templates/resourceclass.yaml b/charts/spiderpool/templates/resourceclass.yaml
diff --git a/charts/spiderpool/templates/tls.yaml b/charts/spiderpool/templates/tls.yaml
@@ -289,35 +289,6 @@ webhooks:
         - spidermultusconfigs
   sideEffects: None
 {{- end }}
-{{- if .Values.dra.enabled }}
-- admissionReviewVersions:
-    - v1
-  clientConfig:
-    service:
-      name: {{ .Values.spiderpoolController.name | trunc 63 | trimSuffix "-" }}
-      namespace: {{ .Release.Namespace }}
-      path: /validate-spiderpool-spidernet-io-v2beta1-spiderclaimparameter
-      port: {{ .Values.spiderpoolController.webhookPort }}
-    {{- if (eq .Values.spiderpoolController.tls.method "provided") }}
-    caBundle: {{ .Values.spiderpoolController.tls.provided.tlsCa | required "missing spiderpoolController.tls.provided.tlsCa" }}
-    {{- else if (eq .Values.spiderpoolController.tls.method "auto") }}
-    caBundle: {{ .ca.Cert | b64enc }}
-    {{- end }}
-  failurePolicy: Fail
-  name: spiderclaimparameter.spiderpool.spidernet.io
-  rules:
-    - apiGroups:
-        - spiderpool.spidernet.io
-      apiVersions:
-        - v2beta1
-      operations:
-        - CREATE
-        - UPDATE
-      resources:
-        - spiderclaimparameters
-  sideEffects: None
-{{- end }}
-
 {{- if eq .Values.spiderpoolController.tls.method "certmanager" -}}
 ---
 apiVersion: cert-manager.io/v1

diff --git a/charts/spiderpool/values.yaml b/charts/spiderpool/values.yaml
@@ -264,16 +264,6 @@ multus:
       ## @param multus.multusCNI.log.logFile the multus-CNI daemonset pod log file
       logFile: "/var/log/multus.log"
 
-## @section dra parameters
-##
-dra:
-  ## @param dra.enabled to enable dra feature
-  enabled: false
-  ## @param dra.cdiRootPath the dir of cdi root
-  cdiRootPath: "/var/run/cdi"
-  ## @param dra.hostDevicePath the dir path of the device
-  hostDevicePath: ""
-
 ## @section plugins parameters
 ##
 plugins:

diff --git a/cmd/spiderpool-agent/cmd/config.go b/cmd/spiderpool-agent/cmd/config.go
@@ -31,7 +31,6 @@ import (
 	"github.com/spidernet-io/spiderpool/pkg/subnetmanager"
 	spiderpooltypes "github.com/spidernet-io/spiderpool/pkg/types"
 	"github.com/spidernet-io/spiderpool/pkg/workloadendpointmanager"
-	"k8s.io/dynamic-resource-allocation/kubeletplugin"
 )
 
 var agentContext = new(AgentContext)
@@ -125,9 +124,6 @@ type AgentContext struct {
 	UnixServer        *server.Server
 	MetricsHttpServer *http.Server
 
-	// dra
-	DraPlugin kubeletplugin.DRAPlugin
-
 	// client
 	unixClient *client.SpiderpoolAgentAPI
 

diff --git a/cmd/spiderpool-agent/cmd/daemon.go b/cmd/spiderpool-agent/cmd/daemon.go
@@ -24,7 +24,6 @@ import (
 	"k8s.io/utils/ptr"
 	ctrl "sigs.k8s.io/controller-runtime"
 
-	draplugin "github.com/spidernet-io/spiderpool/pkg/dra/dra-plugin"
 	"github.com/spidernet-io/spiderpool/pkg/ipam"
 	"github.com/spidernet-io/spiderpool/pkg/ippoolmanager"
 	"github.com/spidernet-io/spiderpool/pkg/kubevirtmanager"
@@ -248,16 +247,6 @@ func DaemonMain() {
 	}
 	agentContext.unixClient = spiderpoolAgentAPI
 
-	if agentContext.Cfg.DraEnabled {
-		logger.Info("Begin to start dra-plugin Server")
-		agentContext.DraPlugin, err = draplugin.StartDRAPlugin(logger, agentContext.Cfg.DraCdiRootPath, agentContext.Cfg.DraHostDevicePath)
-		if err != nil {
-			logger.Fatal("failed to start dra-plugin server", zap.Error(err))
-		}
-	} else {
-		logger.Info("Dra feature is disable.")
-	}
-
 	logger.Info("Set spiderpool-agent startup probe ready")
 	agentContext.IsStartupProbe.Store(true)
 
@@ -290,12 +279,6 @@ func WatchSignal(sigCh chan os.Signal) {
 				logger.Sugar().Errorf("Failed to shut down spiderpool-agent UNIX server: %v", err)
 			}
 		}
-
-		if agentContext.DraPlugin != nil {
-			logger.Debug("Stopping the dra-plugin server")
-			agentContext.DraPlugin.Stop()
-		}
-
 		// others...
 
 	}

diff --git a/cmd/spiderpool-controller/cmd/daemon.go b/cmd/spiderpool-controller/cmd/daemon.go
@@ -17,23 +17,20 @@ import (
 	"github.com/grafana/pyroscope-go"
 	"go.uber.org/automaxprocs/maxprocs"
 	"k8s.io/client-go/dynamic"
-	"k8s.io/client-go/informers"
 	"k8s.io/client-go/kubernetes"
 	ctrl "sigs.k8s.io/controller-runtime"
 
 	"github.com/spidernet-io/spiderpool/pkg/applicationcontroller"
 	"github.com/spidernet-io/spiderpool/pkg/applicationcontroller/applicationinformers"
 	"github.com/spidernet-io/spiderpool/pkg/constant"
 	"github.com/spidernet-io/spiderpool/pkg/coordinatormanager"
-	dracontroller "github.com/spidernet-io/spiderpool/pkg/dra/dra-controller"
 	"github.com/spidernet-io/spiderpool/pkg/election"
 	"github.com/spidernet-io/spiderpool/pkg/event"
 	"github.com/spidernet-io/spiderpool/pkg/gcmanager"
 	"github.com/spidernet-io/spiderpool/pkg/ippoolmanager"
 	crdclientset "github.com/spidernet-io/spiderpool/pkg/k8s/client/clientset/versioned"
 	"github.com/spidernet-io/spiderpool/pkg/kubevirtmanager"
 	"github.com/spidernet-io/spiderpool/pkg/logutils"
-	"github.com/spidernet-io/spiderpool/pkg/manager/spidercliamparameter"
 	"github.com/spidernet-io/spiderpool/pkg/multuscniconfig"
 	"github.com/spidernet-io/spiderpool/pkg/namespacemanager"
 	"github.com/spidernet-io/spiderpool/pkg/nodemanager"
@@ -348,14 +345,6 @@ func initControllerServiceManagers(ctx context.Context) {
 		}
 	}
 
-	if controllerContext.Cfg.DraEnabled {
-		logger.Debug("Begin to setup SpiderClaimParameter webhook")
-		if err = spidercliamparameter.New(controllerContext.CRDManager.GetClient(),
-			controllerContext.CRDManager.GetAPIReader(), controllerContext.CRDManager); err != nil {
-			logger.Fatal(err.Error())
-		}
-	}
-
 	if controllerContext.Cfg.EnableSpiderSubnet {
 		logger.Debug("Begin to initialize Subnet manager")
 		subnetManager, err := subnetmanager.NewSubnetManager(
@@ -577,19 +566,6 @@ func setupInformers(k8sClient *kubernetes.Clientset) {
 			logger.Fatal(err.Error())
 		}
 	}
-
-	if controllerContext.Cfg.DraEnabled {
-		logger.Info("Begin to start DRA-Controller")
-		informerFactory := informers.NewSharedInformerFactory(k8sClient, 0 /* resync period */)
-		if err = dracontroller.StartController(controllerContext.InnerCtx,
-			time.Duration(controllerContext.Cfg.LeaseRetryGap)*time.Second,
-			crdClient, k8sClient, informerFactory,
-			controllerContext.Leader); err != nil {
-			logger.Fatal(err.Error())
-		}
-	} else {
-		logger.Info("the dra feature is disabled.")
-	}
 }
 
 func checkWebhookReady() {

diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml
@@ -98,7 +98,6 @@ nav:
       - Route Support: usage/route.md
       - Node-based Topology: usage/network-topology.md
       - IPoIB For Infiniband: usage/ipoib.md
-      - Dynamic-Resource-Allocation: usage/dra.md
       - Multi-Cluster Networking: usage/submariner.md
       - Access Service for Underlay CNI: usage/underlay_cni_service.md
       - Bandwidth Manage for IPVlan CNI: usage/ipvlan_bandwidth.md