mirror of
https://github.com/ceph/ceph-csi.git
synced 2025-01-29 16:19:29 +00:00
Merge pull request #217 from red-hat-storage/sync_us--devel
Syncing latest changes from devel for ceph-csi
This commit is contained in:
commit
89fa3a9941
30
.github/workflows/snyk.yaml
vendored
Normal file
30
.github/workflows/snyk.yaml
vendored
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
---
|
||||||
|
name: Security scanning
|
||||||
|
# yamllint disable-line rule:truthy
|
||||||
|
on:
|
||||||
|
schedule:
|
||||||
|
# Run weekly on every Monday
|
||||||
|
- cron: '0 0 * * 1'
|
||||||
|
push:
|
||||||
|
tags:
|
||||||
|
- v*
|
||||||
|
branches:
|
||||||
|
- release-*
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
security:
|
||||||
|
if: github.repository == 'ceph/ceph-csi'
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: checkout
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
fetch-depth: 0
|
||||||
|
|
||||||
|
- name: run Snyk to check for code vulnerabilities
|
||||||
|
uses: snyk/actions/golang@master
|
||||||
|
env:
|
||||||
|
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
|
@ -9,7 +9,7 @@
|
|||||||
|
|
||||||
## Features
|
## Features
|
||||||
|
|
||||||
RBD
|
|
||||||
|
|
||||||
- Support for configuring read affinity for individuals cluster within the ceph-csi-config
|
- Support for configuring read affinity for individuals cluster within the ceph-csi-config
|
||||||
ConfigMap in [PR](https://github.com/ceph/ceph-csi/pull/4165)
|
ConfigMap in [PR](https://github.com/ceph/ceph-csi/pull/4165)
|
||||||
|
|
||||||
|
- Support for CephFS kernel and fuse mount options per cluster in [PR](https://github.com/ceph/ceph-csi/pull/4245)
|
||||||
|
@ -24,6 +24,12 @@ kind: ConfigMap
|
|||||||
# The "cephFS.netNamespaceFilePath" fields are the various network namespace
|
# The "cephFS.netNamespaceFilePath" fields are the various network namespace
|
||||||
# path for the Ceph cluster identified by the <cluster-id>, This will be used
|
# path for the Ceph cluster identified by the <cluster-id>, This will be used
|
||||||
# by the CephFS CSI plugin to execute the mount -t in the
|
# by the CephFS CSI plugin to execute the mount -t in the
|
||||||
|
# The "cephFS.kernelMountOptions" fields are comma separated mount options
|
||||||
|
# for `Ceph Kernel client`. Setting this will override the kernelmountoptions
|
||||||
|
# command line flag.
|
||||||
|
# The "cephFS.fuseMountOptions" fields are common separated mount options
|
||||||
|
# for `Ceph FUSE driver`. Setting this will override the fusemountoptions
|
||||||
|
# command line flag.
|
||||||
# network namespace specified by the "cephFS.netNamespaceFilePath".
|
# network namespace specified by the "cephFS.netNamespaceFilePath".
|
||||||
# The "nfs.netNamespaceFilePath" fields are the various network namespace
|
# The "nfs.netNamespaceFilePath" fields are the various network namespace
|
||||||
# path for the Ceph cluster identified by the <cluster-id>, This will be used
|
# path for the Ceph cluster identified by the <cluster-id>, This will be used
|
||||||
@ -68,6 +74,8 @@ data:
|
|||||||
"cephFS": {
|
"cephFS": {
|
||||||
"subvolumeGroup": "<subvolumegroup for cephFS volumes>"
|
"subvolumeGroup": "<subvolumegroup for cephFS volumes>"
|
||||||
"netNamespaceFilePath": "<kubeletRootPath>/plugins/cephfs.csi.ceph.com/net",
|
"netNamespaceFilePath": "<kubeletRootPath>/plugins/cephfs.csi.ceph.com/net",
|
||||||
|
"kernelMountOptions": "<kernelMountOptions for cephFS volumes>",
|
||||||
|
"fuseMountOptions": "<fuseMountOptions for cephFS volumes>"
|
||||||
}
|
}
|
||||||
"nfs": {
|
"nfs": {
|
||||||
"netNamespaceFilePath": "<kubeletRootPath>/plugins/nfs.csi.ceph.com/net",
|
"netNamespaceFilePath": "<kubeletRootPath>/plugins/nfs.csi.ceph.com/net",
|
||||||
|
@ -44,8 +44,8 @@ make image-cephcsi
|
|||||||
| `--timeout` | `3s` | Probe timeout in seconds |
|
| `--timeout` | `3s` | Probe timeout in seconds |
|
||||||
| `--clustername` | _empty_ | Cluster name to set on subvolume |
|
| `--clustername` | _empty_ | Cluster name to set on subvolume |
|
||||||
| `--forcecephkernelclient` | `false` | Force enabling Ceph Kernel clients for mounting on kernels < 4.17 |
|
| `--forcecephkernelclient` | `false` | Force enabling Ceph Kernel clients for mounting on kernels < 4.17 |
|
||||||
| `--kernelmountoptions` | _empty_ | Comma separated string of mount options accepted by cephfs kernel mounter |
|
| `--kernelmountoptions` | _empty_ | Comma separated string of mount options accepted by cephfs kernel mounter.<br>`Note: These options will be replaced if kernelMountOptions are defined in the ceph-csi-config ConfigMap for the specific cluster.` |
|
||||||
| `--fusemountoptions` | _empty_ | Comma separated string of mount options accepted by ceph-fuse mounter |
|
| `--fusemountoptions` | _empty_ | Comma separated string of mount options accepted by ceph-fuse mounter.<br>`Note: These options will be replaced if fuseMountOptions are defined in the ceph-csi-config ConfigMap for the specific cluster.` |
|
||||||
| `--domainlabels` | _empty_ | Kubernetes node labels to use as CSI domain labels for topology aware provisioning, should be a comma separated value (ex:= "failure-domain/region,failure-domain/zone") |
|
| `--domainlabels` | _empty_ | Kubernetes node labels to use as CSI domain labels for topology aware provisioning, should be a comma separated value (ex:= "failure-domain/region,failure-domain/zone") |
|
||||||
|
|
||||||
**NOTE:** The parameter `-forcecephkernelclient` enables the Kernel
|
**NOTE:** The parameter `-forcecephkernelclient` enables the Kernel
|
||||||
|
@ -311,34 +311,11 @@ func (ns *NodeServer) mount(
|
|||||||
|
|
||||||
log.DebugLog(ctx, "cephfs: mounting volume %s with %s", volID, mnt.Name())
|
log.DebugLog(ctx, "cephfs: mounting volume %s with %s", volID, mnt.Name())
|
||||||
|
|
||||||
var mountOptions []string
|
err = ns.setMountOptions(mnt, volOptions, volCap, util.CsiConfigFile)
|
||||||
if m := volCap.GetMount(); m != nil {
|
if err != nil {
|
||||||
mountOptions = m.GetMountFlags()
|
log.ErrorLog(ctx, "failed to set mount options for volume %s: %v", volID, err)
|
||||||
}
|
|
||||||
|
|
||||||
switch mnt.(type) {
|
return status.Error(codes.Internal, err.Error())
|
||||||
case *mounter.FuseMounter:
|
|
||||||
volOptions.FuseMountOptions = util.MountOptionsAdd(volOptions.FuseMountOptions, ns.fuseMountOptions)
|
|
||||||
volOptions.FuseMountOptions = util.MountOptionsAdd(volOptions.FuseMountOptions, mountOptions...)
|
|
||||||
case *mounter.KernelMounter:
|
|
||||||
volOptions.KernelMountOptions = util.MountOptionsAdd(volOptions.KernelMountOptions, ns.kernelMountOptions)
|
|
||||||
volOptions.KernelMountOptions = util.MountOptionsAdd(volOptions.KernelMountOptions, mountOptions...)
|
|
||||||
}
|
|
||||||
|
|
||||||
const readOnly = "ro"
|
|
||||||
|
|
||||||
if volCap.AccessMode.Mode == csi.VolumeCapability_AccessMode_MULTI_NODE_READER_ONLY ||
|
|
||||||
volCap.AccessMode.Mode == csi.VolumeCapability_AccessMode_SINGLE_NODE_READER_ONLY {
|
|
||||||
switch mnt.(type) {
|
|
||||||
case *mounter.FuseMounter:
|
|
||||||
if !csicommon.MountOptionContains(strings.Split(volOptions.FuseMountOptions, ","), readOnly) {
|
|
||||||
volOptions.FuseMountOptions = util.MountOptionsAdd(volOptions.FuseMountOptions, readOnly)
|
|
||||||
}
|
|
||||||
case *mounter.KernelMounter:
|
|
||||||
if !csicommon.MountOptionContains(strings.Split(volOptions.KernelMountOptions, ","), readOnly) {
|
|
||||||
volOptions.KernelMountOptions = util.MountOptionsAdd(volOptions.KernelMountOptions, readOnly)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if err = mnt.Mount(ctx, stagingTargetPath, cr, volOptions); err != nil {
|
if err = mnt.Mount(ctx, stagingTargetPath, cr, volOptions); err != nil {
|
||||||
@ -779,3 +756,67 @@ func (ns *NodeServer) NodeGetVolumeStats(
|
|||||||
|
|
||||||
return nil, status.Errorf(codes.InvalidArgument, "targetpath %q is not a directory or device", targetPath)
|
return nil, status.Errorf(codes.InvalidArgument, "targetpath %q is not a directory or device", targetPath)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// setMountOptions updates the kernel/fuse mount options from CSI config file if it exists.
|
||||||
|
// If not, it falls back to returning the kernelMountOptions/fuseMountOptions from the command line.
|
||||||
|
func (ns *NodeServer) setMountOptions(
|
||||||
|
mnt mounter.VolumeMounter,
|
||||||
|
volOptions *store.VolumeOptions,
|
||||||
|
volCap *csi.VolumeCapability,
|
||||||
|
csiConfigFile string,
|
||||||
|
) error {
|
||||||
|
var (
|
||||||
|
configuredMountOptions string
|
||||||
|
kernelMountOptions string
|
||||||
|
fuseMountOptions string
|
||||||
|
mountOptions []string
|
||||||
|
err error
|
||||||
|
)
|
||||||
|
if m := volCap.GetMount(); m != nil {
|
||||||
|
mountOptions = m.GetMountFlags()
|
||||||
|
}
|
||||||
|
|
||||||
|
if volOptions.ClusterID != "" {
|
||||||
|
kernelMountOptions, fuseMountOptions, err = util.GetCephFSMountOptions(csiConfigFile, volOptions.ClusterID)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
switch mnt.(type) {
|
||||||
|
case *mounter.FuseMounter:
|
||||||
|
configuredMountOptions = ns.fuseMountOptions
|
||||||
|
// override if fuseMountOptions are set
|
||||||
|
if fuseMountOptions != "" {
|
||||||
|
configuredMountOptions = fuseMountOptions
|
||||||
|
}
|
||||||
|
volOptions.FuseMountOptions = util.MountOptionsAdd(volOptions.FuseMountOptions, configuredMountOptions)
|
||||||
|
volOptions.FuseMountOptions = util.MountOptionsAdd(volOptions.FuseMountOptions, mountOptions...)
|
||||||
|
case *mounter.KernelMounter:
|
||||||
|
configuredMountOptions = ns.kernelMountOptions
|
||||||
|
// override of kernelMountOptions are set
|
||||||
|
if kernelMountOptions != "" {
|
||||||
|
configuredMountOptions = kernelMountOptions
|
||||||
|
}
|
||||||
|
volOptions.KernelMountOptions = util.MountOptionsAdd(volOptions.KernelMountOptions, configuredMountOptions)
|
||||||
|
volOptions.KernelMountOptions = util.MountOptionsAdd(volOptions.KernelMountOptions, mountOptions...)
|
||||||
|
}
|
||||||
|
|
||||||
|
const readOnly = "ro"
|
||||||
|
|
||||||
|
if volCap.AccessMode.Mode == csi.VolumeCapability_AccessMode_MULTI_NODE_READER_ONLY ||
|
||||||
|
volCap.AccessMode.Mode == csi.VolumeCapability_AccessMode_SINGLE_NODE_READER_ONLY {
|
||||||
|
switch mnt.(type) {
|
||||||
|
case *mounter.FuseMounter:
|
||||||
|
if !csicommon.MountOptionContains(strings.Split(volOptions.FuseMountOptions, ","), readOnly) {
|
||||||
|
volOptions.FuseMountOptions = util.MountOptionsAdd(volOptions.FuseMountOptions, readOnly)
|
||||||
|
}
|
||||||
|
case *mounter.KernelMounter:
|
||||||
|
if !csicommon.MountOptionContains(strings.Split(volOptions.KernelMountOptions, ","), readOnly) {
|
||||||
|
volOptions.KernelMountOptions = util.MountOptionsAdd(volOptions.KernelMountOptions, readOnly)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
166
internal/cephfs/nodeserver_test.go
Normal file
166
internal/cephfs/nodeserver_test.go
Normal file
@ -0,0 +1,166 @@
|
|||||||
|
/*
|
||||||
|
Copyright 2023 The Ceph-CSI Authors.
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package cephfs
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"os"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/container-storage-interface/spec/lib/go/csi"
|
||||||
|
|
||||||
|
"github.com/ceph/ceph-csi/internal/cephfs/mounter"
|
||||||
|
"github.com/ceph/ceph-csi/internal/cephfs/store"
|
||||||
|
"github.com/ceph/ceph-csi/internal/util"
|
||||||
|
)
|
||||||
|
|
||||||
|
func Test_setMountOptions(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
cliKernelMountOptions := "noexec,nodev"
|
||||||
|
cliFuseMountOptions := "default_permissions,auto_cache"
|
||||||
|
|
||||||
|
configKernelMountOptions := "crc"
|
||||||
|
configFuseMountOptions := "allow_other"
|
||||||
|
|
||||||
|
csiConfig := []util.ClusterInfo{
|
||||||
|
{
|
||||||
|
ClusterID: "cluster-1",
|
||||||
|
CephFS: util.CephFS{
|
||||||
|
KernelMountOptions: configKernelMountOptions,
|
||||||
|
FuseMountOptions: configFuseMountOptions,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
ClusterID: "cluster-2",
|
||||||
|
CephFS: util.CephFS{
|
||||||
|
KernelMountOptions: "",
|
||||||
|
FuseMountOptions: "",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
csiConfigFileContent, err := json.Marshal(csiConfig)
|
||||||
|
if err != nil {
|
||||||
|
t.Errorf("failed to marshal csi config info %v", err)
|
||||||
|
}
|
||||||
|
tmpConfPath := t.TempDir() + "/ceph-csi.json"
|
||||||
|
t.Logf("path = %s", tmpConfPath)
|
||||||
|
err = os.WriteFile(tmpConfPath, csiConfigFileContent, 0o600)
|
||||||
|
if err != nil {
|
||||||
|
t.Errorf("failed to write %s file content: %v", util.CsiConfigFile, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
ns NodeServer
|
||||||
|
mnt mounter.VolumeMounter
|
||||||
|
volOptions *store.VolumeOptions
|
||||||
|
want string
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "KernelMountOptions set in cluster-1 config and not set in CLI",
|
||||||
|
ns: NodeServer{},
|
||||||
|
mnt: mounter.VolumeMounter(&mounter.KernelMounter{}),
|
||||||
|
volOptions: &store.VolumeOptions{
|
||||||
|
ClusterID: "cluster-1",
|
||||||
|
},
|
||||||
|
want: configKernelMountOptions,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "FuseMountOptions set in cluster-1 config and not set in CLI",
|
||||||
|
ns: NodeServer{},
|
||||||
|
mnt: mounter.VolumeMounter(&mounter.FuseMounter{}),
|
||||||
|
volOptions: &store.VolumeOptions{
|
||||||
|
ClusterID: "cluster-1",
|
||||||
|
},
|
||||||
|
want: configFuseMountOptions,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "KernelMountOptions set in cluster-1 config and set in CLI",
|
||||||
|
ns: NodeServer{
|
||||||
|
kernelMountOptions: cliKernelMountOptions,
|
||||||
|
},
|
||||||
|
mnt: mounter.VolumeMounter(&mounter.KernelMounter{}),
|
||||||
|
volOptions: &store.VolumeOptions{
|
||||||
|
ClusterID: "cluster-1",
|
||||||
|
},
|
||||||
|
want: configKernelMountOptions,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "FuseMountOptions not set in cluster-2 config and set in CLI",
|
||||||
|
ns: NodeServer{
|
||||||
|
fuseMountOptions: cliFuseMountOptions,
|
||||||
|
},
|
||||||
|
mnt: mounter.VolumeMounter(&mounter.FuseMounter{}),
|
||||||
|
volOptions: &store.VolumeOptions{
|
||||||
|
ClusterID: "cluster-1",
|
||||||
|
},
|
||||||
|
want: configFuseMountOptions,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "KernelMountOptions not set in cluster-2 config and set in CLI",
|
||||||
|
ns: NodeServer{
|
||||||
|
kernelMountOptions: cliKernelMountOptions,
|
||||||
|
},
|
||||||
|
mnt: mounter.VolumeMounter(&mounter.KernelMounter{}),
|
||||||
|
volOptions: &store.VolumeOptions{
|
||||||
|
ClusterID: "cluster-2",
|
||||||
|
},
|
||||||
|
want: cliKernelMountOptions,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "FuseMountOptions not set in cluster-1 config and set in CLI",
|
||||||
|
ns: NodeServer{
|
||||||
|
fuseMountOptions: cliFuseMountOptions,
|
||||||
|
},
|
||||||
|
mnt: mounter.VolumeMounter(&mounter.FuseMounter{}),
|
||||||
|
volOptions: &store.VolumeOptions{
|
||||||
|
ClusterID: "cluster-2",
|
||||||
|
},
|
||||||
|
want: cliFuseMountOptions,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
volCap := &csi.VolumeCapability{
|
||||||
|
AccessMode: &csi.VolumeCapability_AccessMode{},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tt := range tests {
|
||||||
|
tc := tt
|
||||||
|
t.Run(tc.name, func(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
err := tc.ns.setMountOptions(tc.mnt, tc.volOptions, volCap, tmpConfPath)
|
||||||
|
if err != nil {
|
||||||
|
t.Errorf("setMountOptions() = %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
switch tc.mnt.(type) {
|
||||||
|
case *mounter.FuseMounter:
|
||||||
|
if !strings.Contains(tc.volOptions.FuseMountOptions, tc.want) {
|
||||||
|
t.Errorf("Set FuseMountOptions = %v Required FuseMountOptions = %v", tc.volOptions.FuseMountOptions, tc.want)
|
||||||
|
}
|
||||||
|
case *mounter.KernelMounter:
|
||||||
|
if !strings.Contains(tc.volOptions.KernelMountOptions, tc.want) {
|
||||||
|
t.Errorf("Set KernelMountOptions = %v Required KernelMountOptions = %v", tc.volOptions.KernelMountOptions, tc.want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
@ -43,30 +43,40 @@ type ClusterInfo struct {
|
|||||||
// Monitors is monitor list for corresponding cluster ID
|
// Monitors is monitor list for corresponding cluster ID
|
||||||
Monitors []string `json:"monitors"`
|
Monitors []string `json:"monitors"`
|
||||||
// CephFS contains CephFS specific options
|
// CephFS contains CephFS specific options
|
||||||
CephFS struct {
|
CephFS CephFS `json:"cephFS"`
|
||||||
// symlink filepath for the network namespace where we need to execute commands.
|
|
||||||
NetNamespaceFilePath string `json:"netNamespaceFilePath"`
|
|
||||||
// SubvolumeGroup contains the name of the SubvolumeGroup for CSI volumes
|
|
||||||
SubvolumeGroup string `json:"subvolumeGroup"`
|
|
||||||
} `json:"cephFS"`
|
|
||||||
|
|
||||||
// RBD Contains RBD specific options
|
// RBD Contains RBD specific options
|
||||||
RBD struct {
|
RBD RBD `json:"rbd"`
|
||||||
// symlink filepath for the network namespace where we need to execute commands.
|
|
||||||
NetNamespaceFilePath string `json:"netNamespaceFilePath"`
|
|
||||||
// RadosNamespace is a rados namespace in the pool
|
|
||||||
RadosNamespace string `json:"radosNamespace"`
|
|
||||||
} `json:"rbd"`
|
|
||||||
// NFS contains NFS specific options
|
// NFS contains NFS specific options
|
||||||
NFS struct {
|
NFS NFS `json:"nfs"`
|
||||||
// symlink filepath for the network namespace where we need to execute commands.
|
|
||||||
NetNamespaceFilePath string `json:"netNamespaceFilePath"`
|
|
||||||
} `json:"nfs"`
|
|
||||||
// Read affinity map options
|
// Read affinity map options
|
||||||
ReadAffinity struct {
|
ReadAffinity ReadAffinity `json:"readAffinity"`
|
||||||
Enabled bool `json:"enabled"`
|
}
|
||||||
CrushLocationLabels []string `json:"crushLocationLabels"`
|
|
||||||
} `json:"readAffinity"`
|
type CephFS struct {
|
||||||
|
// symlink filepath for the network namespace where we need to execute commands.
|
||||||
|
NetNamespaceFilePath string `json:"netNamespaceFilePath"`
|
||||||
|
// SubvolumeGroup contains the name of the SubvolumeGroup for CSI volumes
|
||||||
|
SubvolumeGroup string `json:"subvolumeGroup"`
|
||||||
|
// KernelMountOptions contains the kernel mount options for CephFS volumes
|
||||||
|
KernelMountOptions string `json:"kernelMountOptions"`
|
||||||
|
// FuseMountOptions contains the fuse mount options for CephFS volumes
|
||||||
|
FuseMountOptions string `json:"fuseMountOptions"`
|
||||||
|
}
|
||||||
|
type RBD struct {
|
||||||
|
// symlink filepath for the network namespace where we need to execute commands.
|
||||||
|
NetNamespaceFilePath string `json:"netNamespaceFilePath"`
|
||||||
|
// RadosNamespace is a rados namespace in the pool
|
||||||
|
RadosNamespace string `json:"radosNamespace"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type NFS struct {
|
||||||
|
// symlink filepath for the network namespace where we need to execute commands.
|
||||||
|
NetNamespaceFilePath string `json:"netNamespaceFilePath"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type ReadAffinity struct {
|
||||||
|
Enabled bool `json:"enabled"`
|
||||||
|
CrushLocationLabels []string `json:"crushLocationLabels"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// Expected JSON structure in the passed in config file is,
|
// Expected JSON structure in the passed in config file is,
|
||||||
@ -226,3 +236,13 @@ func GetCrushLocationLabels(pathToConfig, clusterID string) (bool, string, error
|
|||||||
|
|
||||||
return true, crushLocationLabels, nil
|
return true, crushLocationLabels, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// GetCephFSMountOptions returns the `kernelMountOptions` and `fuseMountOptions` for CephFS volumes.
|
||||||
|
func GetCephFSMountOptions(pathToConfig, clusterID string) (string, string, error) {
|
||||||
|
cluster, err := readClusterInfo(pathToConfig, clusterID)
|
||||||
|
if err != nil {
|
||||||
|
return "", "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
return cluster.CephFS.KernelMountOptions, cluster.CephFS.FuseMountOptions, nil
|
||||||
|
}
|
||||||
|
@ -168,20 +168,14 @@ func TestGetRBDNetNamespaceFilePath(t *testing.T) {
|
|||||||
{
|
{
|
||||||
ClusterID: "cluster-1",
|
ClusterID: "cluster-1",
|
||||||
Monitors: []string{"ip-1", "ip-2"},
|
Monitors: []string{"ip-1", "ip-2"},
|
||||||
RBD: struct {
|
RBD: RBD{
|
||||||
NetNamespaceFilePath string `json:"netNamespaceFilePath"`
|
|
||||||
RadosNamespace string `json:"radosNamespace"`
|
|
||||||
}{
|
|
||||||
NetNamespaceFilePath: "/var/lib/kubelet/plugins/rbd.ceph.csi.com/cluster1-net",
|
NetNamespaceFilePath: "/var/lib/kubelet/plugins/rbd.ceph.csi.com/cluster1-net",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
ClusterID: "cluster-2",
|
ClusterID: "cluster-2",
|
||||||
Monitors: []string{"ip-3", "ip-4"},
|
Monitors: []string{"ip-3", "ip-4"},
|
||||||
RBD: struct {
|
RBD: RBD{
|
||||||
NetNamespaceFilePath string `json:"netNamespaceFilePath"`
|
|
||||||
RadosNamespace string `json:"radosNamespace"`
|
|
||||||
}{
|
|
||||||
NetNamespaceFilePath: "/var/lib/kubelet/plugins/rbd.ceph.csi.com/cluster2-net",
|
NetNamespaceFilePath: "/var/lib/kubelet/plugins/rbd.ceph.csi.com/cluster2-net",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@ -244,20 +238,14 @@ func TestGetCephFSNetNamespaceFilePath(t *testing.T) {
|
|||||||
{
|
{
|
||||||
ClusterID: "cluster-1",
|
ClusterID: "cluster-1",
|
||||||
Monitors: []string{"ip-1", "ip-2"},
|
Monitors: []string{"ip-1", "ip-2"},
|
||||||
CephFS: struct {
|
CephFS: CephFS{
|
||||||
NetNamespaceFilePath string `json:"netNamespaceFilePath"`
|
|
||||||
SubvolumeGroup string `json:"subvolumeGroup"`
|
|
||||||
}{
|
|
||||||
NetNamespaceFilePath: "/var/lib/kubelet/plugins/cephfs.ceph.csi.com/cluster1-net",
|
NetNamespaceFilePath: "/var/lib/kubelet/plugins/cephfs.ceph.csi.com/cluster1-net",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
ClusterID: "cluster-2",
|
ClusterID: "cluster-2",
|
||||||
Monitors: []string{"ip-3", "ip-4"},
|
Monitors: []string{"ip-3", "ip-4"},
|
||||||
CephFS: struct {
|
CephFS: CephFS{
|
||||||
NetNamespaceFilePath string `json:"netNamespaceFilePath"`
|
|
||||||
SubvolumeGroup string `json:"subvolumeGroup"`
|
|
||||||
}{
|
|
||||||
NetNamespaceFilePath: "/var/lib/kubelet/plugins/cephfs.ceph.csi.com/cluster2-net",
|
NetNamespaceFilePath: "/var/lib/kubelet/plugins/cephfs.ceph.csi.com/cluster2-net",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@ -320,18 +308,14 @@ func TestGetNFSNetNamespaceFilePath(t *testing.T) {
|
|||||||
{
|
{
|
||||||
ClusterID: "cluster-1",
|
ClusterID: "cluster-1",
|
||||||
Monitors: []string{"ip-1", "ip-2"},
|
Monitors: []string{"ip-1", "ip-2"},
|
||||||
NFS: struct {
|
NFS: NFS{
|
||||||
NetNamespaceFilePath string `json:"netNamespaceFilePath"`
|
|
||||||
}{
|
|
||||||
NetNamespaceFilePath: "/var/lib/kubelet/plugins/nfs.ceph.csi.com/cluster1-net",
|
NetNamespaceFilePath: "/var/lib/kubelet/plugins/nfs.ceph.csi.com/cluster1-net",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
ClusterID: "cluster-2",
|
ClusterID: "cluster-2",
|
||||||
Monitors: []string{"ip-3", "ip-4"},
|
Monitors: []string{"ip-3", "ip-4"},
|
||||||
NFS: struct {
|
NFS: NFS{
|
||||||
NetNamespaceFilePath string `json:"netNamespaceFilePath"`
|
|
||||||
}{
|
|
||||||
NetNamespaceFilePath: "/var/lib/kubelet/plugins/nfs.ceph.csi.com/cluster2-net",
|
NetNamespaceFilePath: "/var/lib/kubelet/plugins/nfs.ceph.csi.com/cluster2-net",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@ -413,10 +397,7 @@ func TestGetReadAffinityOptions(t *testing.T) {
|
|||||||
csiConfig := []ClusterInfo{
|
csiConfig := []ClusterInfo{
|
||||||
{
|
{
|
||||||
ClusterID: "cluster-1",
|
ClusterID: "cluster-1",
|
||||||
ReadAffinity: struct {
|
ReadAffinity: ReadAffinity{
|
||||||
Enabled bool `json:"enabled"`
|
|
||||||
CrushLocationLabels []string `json:"crushLocationLabels"`
|
|
||||||
}{
|
|
||||||
Enabled: true,
|
Enabled: true,
|
||||||
CrushLocationLabels: []string{
|
CrushLocationLabels: []string{
|
||||||
"topology.kubernetes.io/region",
|
"topology.kubernetes.io/region",
|
||||||
@ -427,10 +408,7 @@ func TestGetReadAffinityOptions(t *testing.T) {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
ClusterID: "cluster-2",
|
ClusterID: "cluster-2",
|
||||||
ReadAffinity: struct {
|
ReadAffinity: ReadAffinity{
|
||||||
Enabled bool `json:"enabled"`
|
|
||||||
CrushLocationLabels []string `json:"crushLocationLabels"`
|
|
||||||
}{
|
|
||||||
Enabled: true,
|
Enabled: true,
|
||||||
CrushLocationLabels: []string{
|
CrushLocationLabels: []string{
|
||||||
"topology.kubernetes.io/region",
|
"topology.kubernetes.io/region",
|
||||||
@ -439,10 +417,7 @@ func TestGetReadAffinityOptions(t *testing.T) {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
ClusterID: "cluster-3",
|
ClusterID: "cluster-3",
|
||||||
ReadAffinity: struct {
|
ReadAffinity: ReadAffinity{
|
||||||
Enabled bool `json:"enabled"`
|
|
||||||
CrushLocationLabels []string `json:"crushLocationLabels"`
|
|
||||||
}{
|
|
||||||
Enabled: false,
|
Enabled: false,
|
||||||
CrushLocationLabels: []string{
|
CrushLocationLabels: []string{
|
||||||
"topology.io/rack",
|
"topology.io/rack",
|
||||||
@ -478,3 +453,78 @@ func TestGetReadAffinityOptions(t *testing.T) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestGetCephFSMountOptions(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
clusterID string
|
||||||
|
wantKernelMntOptions string
|
||||||
|
wantFuseMntOptions string
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "cluster-1 with non-empty mount options",
|
||||||
|
clusterID: "cluster-1",
|
||||||
|
wantKernelMntOptions: "crc",
|
||||||
|
wantFuseMntOptions: "ro",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "cluster-2 with empty mount options",
|
||||||
|
clusterID: "cluster-2",
|
||||||
|
wantKernelMntOptions: "",
|
||||||
|
wantFuseMntOptions: "",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "cluster-3 with no mount options",
|
||||||
|
clusterID: "cluster-3",
|
||||||
|
wantKernelMntOptions: "",
|
||||||
|
wantFuseMntOptions: "",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
csiConfig := []ClusterInfo{
|
||||||
|
{
|
||||||
|
ClusterID: "cluster-1",
|
||||||
|
CephFS: CephFS{
|
||||||
|
KernelMountOptions: "crc",
|
||||||
|
FuseMountOptions: "ro",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
ClusterID: "cluster-2",
|
||||||
|
CephFS: CephFS{
|
||||||
|
KernelMountOptions: "",
|
||||||
|
FuseMountOptions: "",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
ClusterID: "cluster-3",
|
||||||
|
CephFS: CephFS{},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
csiConfigFileContent, err := json.Marshal(csiConfig)
|
||||||
|
if err != nil {
|
||||||
|
t.Errorf("failed to marshal csi config info %v", err)
|
||||||
|
}
|
||||||
|
tmpConfPath := t.TempDir() + "/ceph-csi.json"
|
||||||
|
err = os.WriteFile(tmpConfPath, csiConfigFileContent, 0o600)
|
||||||
|
if err != nil {
|
||||||
|
t.Errorf("failed to write %s file content: %v", CsiConfigFile, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tt := range tests {
|
||||||
|
tc := tt
|
||||||
|
t.Run(tc.name, func(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
kernelMntOptions, fuseMntOptions, err := GetCephFSMountOptions(tmpConfPath, tc.clusterID)
|
||||||
|
if err != nil {
|
||||||
|
t.Errorf("GetCephFSMountOptions() error = %v", err)
|
||||||
|
}
|
||||||
|
if kernelMntOptions != tc.wantKernelMntOptions || fuseMntOptions != tc.wantFuseMntOptions {
|
||||||
|
t.Errorf("GetCephFSMountOptions() = (%v, %v), want (%v, %v)",
|
||||||
|
kernelMntOptions, fuseMntOptions, tc.wantKernelMntOptions, tc.wantFuseMntOptions,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user