Remove gpu support (#821)

* Remove gpu support * Remove gpu from contrib
sapcc · Sep 5, 2023 · 36551b8 · 36551b8
1 parent a9473f3
commit 36551b8
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 364 deletions.
diff --git a/contrib/nvidia-gpu/device-plugin-damonset.yaml b/contrib/nvidia-gpu/device-plugin-damonset.yaml
diff --git a/contrib/nvidia-gpu/device-plugin.yaml b/contrib/nvidia-gpu/device-plugin.yaml
diff --git a/contrib/nvidia-gpu/driver-daemonset.yaml b/contrib/nvidia-gpu/driver-daemonset.yaml
diff --git a/pkg/controller/ground/bootstrap.go b/pkg/controller/ground/bootstrap.go
@@ -18,7 +18,6 @@ import (
 	"github.com/sapcc/kubernikus/pkg/controller/ground/bootstrap/ccm"
 	"github.com/sapcc/kubernikus/pkg/controller/ground/bootstrap/csi"
 	"github.com/sapcc/kubernikus/pkg/controller/ground/bootstrap/dns"
-	"github.com/sapcc/kubernikus/pkg/controller/ground/bootstrap/gpu"
 	"github.com/sapcc/kubernikus/pkg/controller/ground/bootstrap/network"
 	"github.com/sapcc/kubernikus/pkg/util"
 	"github.com/sapcc/kubernikus/pkg/version"
@@ -81,12 +80,6 @@ func SeedKluster(clients config.Clients, factories config.Factories, images vers
 		}
 	}
 
-	if ok, _ := util.KlusterVersionConstraint(kluster, ">= 1.10"); ok {
-		if err := gpu.SeedGPUSupport(kubernetes); err != nil {
-			return errors.Wrap(err, "seed GPU support")
-		}
-	}
-
 	if ok, _ := util.KlusterVersionConstraint(kluster, ">= 1.20"); ok {
 		dynamicKubernetes, err := clients.Satellites.DynamicClientFor(kluster)
 		if err != nil {

diff --git a/pkg/controller/ground/bootstrap/gpu/gpu.go b/pkg/controller/ground/bootstrap/gpu/gpu.go
diff --git a/pkg/controller/ground/bootstrap/gpu/manifest.go b/pkg/controller/ground/bootstrap/gpu/manifest.go
diff --git a/pkg/templates/ignition.go b/pkg/templates/ignition.go
@@ -108,12 +108,6 @@ func (i *ignition) GenerateNode(kluster *kubernikusv1.Kluster, pool *models.Node
 	isFlatcar := true
 	if pool != nil {
 		nodeLabels = append(nodeLabels, "ccloud.sap.com/nodepool="+pool.Name)
-		if strings.HasPrefix(pool.Flavor, "zg") {
-			nodeLabels = append(nodeLabels, "gpu=nvidia-tesla-v100")
-		}
-		if strings.HasPrefix(pool.Flavor, "zg") {
-			nodeTaints = append(nodeTaints, "nvidia.com/gpu=present:NoSchedule")
-		}
 		for _, userTaint := range pool.Taints {
 			nodeTaints = append(nodeTaints, userTaint)
 		}

diff --git a/pkg/templates/ignition_test.go b/pkg/templates/ignition_test.go
@@ -121,12 +121,4 @@ func TestNodeLabels(t *testing.T) {
 		//Ensure we rendered the expected template
 		assert.Contains(t, string(data), fmt.Sprintf("--node-labels=ccloud.sap.com/nodepool=%s", pool.Name))
 	}
-
-	gpuPool := &models.NodePool{Name: "some-name", Flavor: "zghuh"}
-	data, err = Ignition.GenerateNode(kluster, gpuPool, "test", "abc123", &testKlusterSecret, false, imageRegistry, log.NewNopLogger())
-	if assert.NoError(t, err, "Failed to generate node") {
-		//Ensure we rendered the expected template
-		assert.Contains(t, string(data), fmt.Sprintf("--node-labels=ccloud.sap.com/nodepool=%s,gpu=nvidia-tesla-v100", pool.Name))
-		assert.Contains(t, string(data), fmt.Sprintf("--register-with-taints=nvidia.com/gpu=present:NoSchedule"))
-	}
 }