Mirror/k3s
1
0
Fork 0
mirror of https://github.com/k3s-io/k3s.git synced 2024-06-07 19:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #917 from erikwilson/fix-strongswan-root-etc

Browse Source 
Fallback to /etc/strongswan for config
This commit is contained in:
Erik Wilson 2019-10-18 11:29:16 -07:00 committed by GitHub
commit 5622a88be7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/agent/flannel/setup.go
View File

@ -147,10 +147,10 @@ func createFlannelConf(nodeConfig *config.Node) error {
}
func setupStrongSwan(nodeConfig *config.Node) error {
// if we don't know the location of extracted strongswan data then return
// if data dir env is not set point to root
dataDir := os.Getenv("K3S_DATA_DIR")
if dataDir == "" {
return nil
dataDir = "/"
}
dataDir = path.Join(dataDir, "etc", "strongswan")
@ -159,6 +159,13 @@ func setupStrongSwan(nodeConfig *config.Node) error {
if err == nil && info.Mode()&os.ModeSymlink == 0 {
return nil
}
if err == nil {
target, err := os.Readlink(nodeConfig.AgentConfig.StrongSwanDir)
// current link is the same, return
if err == nil && target == dataDir {
return nil
}
}
// clean up strongswan old link
os.Remove(nodeConfig.AgentConfig.StrongSwanDir)