Skip to content

Commit 680e30c

Browse files
authored
fix cipher_suites for rhcos (#264)
* fix cipher_suites for rhcos Signed-off-by: Ashima-Ashima1 <[email protected]> --------- Signed-off-by: Ashima-Ashima1 <[email protected]>
1 parent ab7f63f commit 680e30c

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

.secrets.baseline

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"files": "go.sum|^.secrets.baseline$",
44
"lines": null
55
},
6-
"generated_at": "2025-09-04T09:22:05Z",
6+
"generated_at": "2025-09-05T07:59:11Z",
77
"plugins_used": [
88
{
99
"name": "AWSKeyDetector"

pkg/driver/s3-driver.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ func newNodeServer(d *S3Driver, statsUtil pkgUtils.StatsUtils, nodeID string, mo
158158
maxVolumesPerNode = int64(constants.DefaultVolumesPerNode)
159159
}
160160

161-
ciphersuite := "default"
161+
ciphersuite := ""
162162
if strings.Contains(strings.ToLower(data.OS), "ubuntu") {
163163
ciphersuite = "AESGCM"
164164
}

pkg/mounter/mounter-s3fs.go

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -286,9 +286,13 @@ func updateS3FSMountOptions(defaultMountOp []string, secretMap map[string]string
286286
}
287287

288288
// Mount options which are not present in secret mountOptions and need to be set by nodeserver
289-
if _, ok := mountOptsMap[constants.CipherSuitesKey]; !ok {
290-
option := fmt.Sprintf("%s=%s", constants.CipherSuitesKey, defaultParams[constants.CipherSuitesKey])
291-
updatedOptions = append(updatedOptions, option)
289+
for key, value := range defaultParams {
290+
if value != "" {
291+
if _, ok := mountOptsMap[key]; !ok {
292+
option := fmt.Sprintf("%s=%s", key, value)
293+
updatedOptions = append(updatedOptions, option)
294+
}
295+
}
292296
}
293297

294298
klog.Infof("updated S3fsMounter Options: %v", updatedOptions)

0 commit comments

Comments
 (0)