add disableCsiLvm feature gate

Makefile

@@ -83,11 +83,11 @@ check: $(GOIMPORTS) $(GOLANGCI_LINT) $(HELM)
 
 .PHONY: generate
 generate: $(VGOPATH) $(HELM) $(YQ)
+	echo $(shell git -c safe.directory=/go/src/github.com/metal-stack/gardener-extension-provider-metal describe --abbrev=0 --tags) > VERSION
 	@REPO_ROOT=$(REPO_ROOT) VGOPATH=$(VGOPATH) GARDENER_HACK_DIR=$(GARDENER_HACK_DIR) bash $(GARDENER_HACK_DIR)/generate-sequential.sh ./charts/... ./cmd/... ./pkg/...
 
 .PHONY: generate-in-docker
-generate-in-docker: tidy update-crds $(HELM)
-	echo $(shell git describe --abbrev=0 --tags) > VERSION
+generate-in-docker: tidy install update-crds $(HELM)
 	docker run --rm -i$(DOCKER_TTY_ARG) \
 		--volume $(PWD):/go/src/github.com/metal-stack/gardener-extension-provider-metal golang:$(GO_VERSION) \
 			sh -c "cd /go/src/github.com/metal-stack/gardener-extension-provider-metal \

charts/internal/shoot-storageclasses/templates/storageclasses.yaml

@@ -1,3 +1,4 @@
+{{ if not .Values.disableCsiLvm }}
 ---
 apiVersion: v1
 kind: Namespace
@@ -255,3 +256,4 @@ spec:
             path: /run/lock/lvm
             type: DirectoryOrCreate
           name: lvmlock
+{{ end }}

charts/internal/shoot-storageclasses/values.yaml

@@ -1,6 +1,7 @@
 ---
 images:
-    csi-lvm-controller: image-repository:image-tag
-    csi-lvm-provisioner: image-repository:image-tag
+  csi-lvm-controller: image-repository:image-tag
+  csi-lvm-provisioner: image-repository:image-tag
 
 isDefaultStorageClass: true
+disableCsiLvm: false

example/controller-registration.yaml

@@ -7,7 +7,7 @@ helm:
   rawChart: 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
   values:
     image:
-      tag: v0.25.0
+      tag: v0.25.2
 ---
 apiVersion: core.gardener.cloud/v1beta1
 kind: ControllerRegistration

pkg/apis/metal/types_controlplane.go

@@ -63,6 +63,11 @@ type ControlPlaneFeatures struct {
 	// Deprecated: This is not used anymore. The gardener-extension-audit handles cluster auditing.
 	// +optional
 	AuditToSplunk *bool
+
+	// DisableCsiLvm disables the deployment of the csi-lvm driver for the control plane.
+	// In order to deploy the new csi-driver-lvm, the feature gate must be enabled so the old driver is removed.
+	// +optional
+	DisableCsiLvm *bool `json:"disableCsiLvm,omitempty"`
 }
 
 // CloudControllerManagerConfig contains configuration settings for the cloud-controller-manager.

pkg/apis/metal/v1alpha1/types_controlplane.go

@@ -62,6 +62,11 @@ type ControlPlaneFeatures struct {
 	// Deprecated: This is not used anymore. The gardener-extension-audit handles cluster auditing.
 	// +optional
 	AuditToSplunk *bool `json:"auditToSplunk,omitempty"`
+
+	// DisableCsiLvm disables the deployment of the csi-lvm driver for the control plane.
+	// In order to deploy the new csi-driver-lvm, the feature gate must be enabled so the old driver is removed.
+	// +optional
+	DisableCsiLvm *bool `json:"disableCsiLvm,omitempty"`
 }
 
 // CloudControllerManagerConfig contains configuration settings for the cloud-controller-manager.

pkg/controller/controlplane/valuesprovider.go

@@ -700,8 +700,14 @@ func (vp *valuesProvider) GetStorageClassesChartValues(_ context.Context, contro
 		isDefaultSC = false
 	}
 
+	disableCsiLvm := false
+	if cp.FeatureGates.DisableCsiLvm != nil {
+		disableCsiLvm = *cp.FeatureGates.DisableCsiLvm
+	}
+
 	values := map[string]interface{}{
 		"isDefaultStorageClass": isDefaultSC,
+		"disableCsiLvm":         disableCsiLvm,
 	}
 
 	return values, nil