fix: remove back the unneeded MC support in chart

weka · Jul 14, 2023 · cc369a2 · cc369a2
1 parent a580320
commit cc369a2
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 17 deletions.
diff --git a/charts/csi-wekafsplugin/templates/controllerserver-statefulset.yaml b/charts/csi-wekafsplugin/templates/controllerserver-statefulset.yaml
@@ -200,9 +200,6 @@ spec:
             - "--concurrency.createSnapshot={{ .Values.controller.concurrency.createSnapshot | default "1" }}"
             - "--concurrency.deleteSnapshot={{ .Values.controller.concurrency.deleteSnapshot | default "1" }}"
           {{- end }}
-          {{- if .Values.pluginConfig.supportMultipleClusters }}
-            - "--supportmultipleclusters"
-          {{- end }}
           ports:
             - containerPort: 9898
               name: healthz

diff --git a/charts/csi-wekafsplugin/templates/nodeserver-daemonset-selinux.yaml b/charts/csi-wekafsplugin/templates/nodeserver-daemonset-selinux.yaml
@@ -81,9 +81,6 @@ spec:
             - "--concurrency.nodePublishVolume={{ .Values.node.concurrency.nodePublishVolume | default "1" }}"
             - "--concurrency.nodeUnpublishVolume={{ .Values.node.concurrency.nodeUnpublishVolume | default "1" }}"
           {{- end }}
-          {{- if .Values.pluginConfig.supportMultipleClusters }}
-            - "--supportmultipleclusters"
-          {{- end }}
           ports:
             - containerPort: 9898
               name: healthz

diff --git a/charts/csi-wekafsplugin/templates/nodeserver-daemonset.yaml b/charts/csi-wekafsplugin/templates/nodeserver-daemonset.yaml
@@ -79,9 +79,6 @@ spec:
             - "--concurrency.nodePublishVolume={{ .Values.node.concurrency.nodePublishVolume | default "1" }}"
             - "--concurrency.nodeUnpublishVolume={{ .Values.node.concurrency.nodeUnpublishVolume | default "1" }}"
           {{- end }}
-          {{- if .Values.pluginConfig.supportMultipleClusters }}
-            - "--supportmultipleclusters"
-          {{- end }}
           ports:
             - containerPort: 9898
               name: healthz

diff --git a/charts/csi-wekafsplugin/values.yaml b/charts/csi-wekafsplugin/values.yaml
@@ -102,8 +102,6 @@ tracingUrl: ""
 pluginConfig:
   # -- Allow insecure HTTPS (skip TLS certificate verification)
   allowInsecureHttps: false
-  # -- Support connection to multiple Weka clusters from same node. Might affect performance
-  supportMultipleClusters: true
   objectNaming:
     # -- Prefix that will be added to names of Weka cluster filesystems / snapshots assocciated with CSI volume,
     #    must not exceed 7 symbols.

diff --git a/cmd/wekafsplugin/main.go b/cmd/wekafsplugin/main.go
@@ -90,7 +90,6 @@ var (
 	maxConcurrentNodePublishVolumeReqs   = flag.Int64("concurrency.nodePublishVolume", 1, "Maximum concurrent NodePublishVolume requests")
 	maxConcurrentNodeUnpublishVolumeReqs = flag.Int64("concurrency.nodeUnpublishVolume", 1, "Maximum concurrent NodeUnpublishVolume requests")
 	grpcRequestTimeoutSeconds            = flag.Int("grpcrequesttimeoutseconds", 30, "Time out requests waiting in queue after X seconds")
-	supportMultipleClusters              = flag.Bool("supportmultipleclusters", false, "Allow support of multiple Weka clusters")
 	// Set by the build process
 	version = ""
 )
@@ -207,7 +206,6 @@ func handle() {
 		*suppressVolumeCloneCapability,
 		*allowInsecureHttps,
 		*alwaysAllowSnapshotVolumes,
-		*supportMultipleClusters,
 		mutuallyExclusiveMountOptionsStrings,
 		*maxConcurrentCreateVolumeReqs,
 		*maxConcurrentDeleteVolumeReqs,

diff --git a/pkg/wekafs/driverconfig.go b/pkg/wekafs/driverconfig.go
@@ -32,7 +32,6 @@ type DriverConfig struct {
 	mutuallyExclusiveOptions      []mutuallyExclusiveMountOptionSet
 	maxConcurrencyPerOp           map[string]int64
 	grpcRequestTimeout            time.Duration
-	supportMultipleClusters       bool
 }
 
 func (dc *DriverConfig) Log() {
@@ -41,12 +40,11 @@ func (dc *DriverConfig) Log() {
 		Bool("allow_auto_fs_creation", dc.allowAutoFsCreation).Bool("allow_auto_fs_expansion", dc.allowAutoFsExpansion).
 		Bool("advertise_snapshot_support", dc.advertiseSnapshotSupport).Bool("advertise_volume_clone_support", dc.advertiseVolumeCloneSupport).
 		Bool("allow_insecure_https", dc.allowInsecureHttps).Bool("always_allow_snapshot_volumes", dc.alwaysAllowSnapshotVolumes).
-		Bool("support_multiple_clusters", dc.supportMultipleClusters).
 		Interface("mutually_exclusive_mount_options", dc.mutuallyExclusiveOptions).Msg("Starting driver with the following configuration")
 }
 func NewDriverConfig(dynamicVolPath, VolumePrefix, SnapshotPrefix, SeedSnapshotPrefix, debugPath string,
 	allowAutoFsCreation, allowAutoFsExpansion, allowSnapshotsOfLegacyVolumes bool,
-	suppressnapshotSupport, suppressVolumeCloneSupport, allowInsecureHttps, alwaysAllowSnapshotVolumes, supportMultipleClusters bool,
+	suppressnapshotSupport, suppressVolumeCloneSupport, allowInsecureHttps, alwaysAllowSnapshotVolumes bool,
 	mutuallyExclusiveMountOptions MutuallyExclusiveMountOptsStrings,
 	maxCreateVolumeReqs, maxDeleteVolumeReqs, maxExpandVolumeReqs, maxCreateSnapshotReqs, maxDeleteSnapshotReqs, maxNodePublishVolumeReqs, maxNodeUnpublishVolumeReqs int64,
 	grpcRequestTimeoutSeconds int) *DriverConfig {
@@ -87,7 +85,6 @@ func NewDriverConfig(dynamicVolPath, VolumePrefix, SnapshotPrefix, SeedSnapshotP
 		mutuallyExclusiveOptions:      MutuallyExclusiveMountOptions,
 		maxConcurrencyPerOp:           concurrency,
 		grpcRequestTimeout:            grpcRequestTimeout,
-		supportMultipleClusters:       supportMultipleClusters,
 	}
 }