mirror of
https://github.com/ceph/ceph-csi.git
synced 2024-11-10 08:20:23 +00:00
2064e674a4
Based on the review comments addressed the following, - Moved away from having to update the pod with volumes when a new Ceph cluster is added for provisioning via the CSI driver - The above now used k8s APIs to fetch secrets - TBD: Need to add a watch mechanisim such that these secrets can be cached and updated when changed - Folded the Cephc configuration and ID/key config map and secrets into a single secret - Provided the ability to read the same config via mapped or created files within the pod Tests: - Ran PV creation/deletion/attach/use using new scheme StorageClass - Ran PV creation/deletion/attach/use using older scheme to ensure nothing is broken - Did not execute snapshot related tests Signed-off-by: ShyamsundarR <srangana@redhat.com>
59 lines
1.8 KiB
Go
59 lines
1.8 KiB
Go
/*
|
|
Copyright 2019 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 util
|
|
|
|
import (
|
|
"fmt"
|
|
"io/ioutil"
|
|
"k8s.io/klog"
|
|
"path"
|
|
)
|
|
|
|
/*
|
|
FileConfig is a ConfigStore interface implementation that reads configuration
|
|
information from files.
|
|
|
|
BasePath defines the directory under which FileConfig will attempt to open and
|
|
read contents of various Ceph cluster configurations.
|
|
|
|
Each Ceph cluster configuration is stored under a directory named,
|
|
BasePath/ceph-cluster-<fsid>, where <fsid> is the Ceph cluster fsid.
|
|
|
|
Under each Ceph cluster configuration directory, individual files named as per
|
|
the ConfigKeys constants in the ConfigStore interface, store the required
|
|
configuration information.
|
|
*/
|
|
type FileConfig struct {
|
|
BasePath string
|
|
}
|
|
|
|
// DataForKey reads the appropriate config file, named using key, and returns
|
|
// the contents of the file to the caller
|
|
func (fc *FileConfig) DataForKey(fsid string, key string) (data string, err error) {
|
|
pathToKey := path.Join(fc.BasePath, "ceph-cluster-"+fsid, key)
|
|
// #nosec
|
|
content, err := ioutil.ReadFile(pathToKey)
|
|
if err != nil || string(content) == "" {
|
|
err = fmt.Errorf("error fetching configuration for cluster ID (%s). (%s)", fsid, err)
|
|
return
|
|
}
|
|
|
|
data = string(content)
|
|
klog.V(3).Infof("returning data (%s) for key (%s) against cluster (%s)", data, key, fsid)
|
|
return
|
|
}
|