ITQC/containernetworking-plugins
24
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 34 Wiki Activity

flannel: rename stateDir to dataDir

Browse Source 
Rename StateDir to DataDir for flannel CNI plugin
This commit is contained in:
Mark St.Godard
2016-11-17 15:54:29 -06:00
parent 15de81eac6
commit 6eac0ee904
3 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
plugins/meta/flannel/flannel.go
View File

@ -37,13 +37,13 @@ import (
const (
defaultSubnetFile = "/run/flannel/subnet.env"
defaultStateDir = "/var/lib/cni/flannel"
defaultDataDir = "/var/lib/cni/flannel"
)
type NetConf struct {
types.NetConf
SubnetFile string `json:"subnetFile"`
StateDir string `json:"stateDir"`
DataDir string `json:"dataDir"`
Delegate map[string]interface{} `json:"delegate"`
}
@ -75,7 +75,7 @@ func (se *subnetEnv) missing() string {
func loadFlannelNetConf(bytes []byte) (*NetConf, error) {
n := &NetConf{
SubnetFile: defaultSubnetFile,
StateDir: defaultStateDir,
DataDir: defaultDataDir,
}
if err := json.Unmarshal(bytes, n); err != nil {
return nil, fmt.Errorf("failed to load netconf: %v", err)
@ -132,29 +132,29 @@ func loadFlannelSubnetEnv(fn string) (*subnetEnv, error) {
return se, nil
}
func saveScratchNetConf(containerID, stateDir string, netconf []byte) error {
if err := os.MkdirAll(stateDir, 0700); err != nil {
func saveScratchNetConf(containerID, dataDir string, netconf []byte) error {
if err := os.MkdirAll(dataDir, 0700); err != nil {
return err
}
path := filepath.Join(stateDir, containerID)
path := filepath.Join(dataDir, containerID)
return ioutil.WriteFile(path, netconf, 0600)
}
func consumeScratchNetConf(containerID, stateDir string) ([]byte, error) {
path := filepath.Join(stateDir, containerID)
func consumeScratchNetConf(containerID, dataDir string) ([]byte, error) {
path := filepath.Join(dataDir, containerID)
defer os.Remove(path)
return ioutil.ReadFile(path)
}
func delegateAdd(cid, stateDir string, netconf map[string]interface{}) error {
func delegateAdd(cid, dataDir string, netconf map[string]interface{}) error {
netconfBytes, err := json.Marshal(netconf)
if err != nil {
return fmt.Errorf("error serializing delegate netconf: %v", err)
}
// save the rendered netconf for cmdDel
if err = saveScratchNetConf(cid, stateDir, netconfBytes); err != nil {
if err = saveScratchNetConf(cid, dataDir, netconfBytes); err != nil {
return err
}
@ -234,7 +234,7 @@ func cmdAdd(args *skel.CmdArgs) error {
},
}
return delegateAdd(args.ContainerID, n.StateDir, n.Delegate)
return delegateAdd(args.ContainerID, n.DataDir, n.Delegate)
}
func cmdDel(args *skel.CmdArgs) error {
@ -243,7 +243,7 @@ func cmdDel(args *skel.CmdArgs) error {
return err
}
netconfBytes, err := consumeScratchNetConf(args.ContainerID, nc.StateDir)
netconfBytes, err := consumeScratchNetConf(args.ContainerID, nc.DataDir)
if err != nil {
return err
}