github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #3417 from manuelbuil/replaceAll

Browse Source 
Change Replace with ReplaceAll function
pull/3425/head^2
Manuel Buil 4 years ago committed by GitHub
parent bd84012061 243fd14cf1
commit 9c2373499c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File

6
pkg/agent/flannel/setup.go
Unescape View File

@ -118,7 +118,7 @@ func createFlannelConf(nodeConfig *config.Node) error {
logrus.Infof("Using custom flannel conf defined at %s", nodeConfig.FlannelConf) logrus.Infof("Using custom flannel conf defined at %s", nodeConfig.FlannelConf)
return nil return nil
} }
confJSON := strings.Replace(flannelConf, "%CIDR%", nodeConfig.AgentConfig.ClusterCIDR.String(), -1) confJSON := strings.ReplaceAll(flannelConf, "%CIDR%", nodeConfig.AgentConfig.ClusterCIDR.String())
var backendConf string var backendConf string
@ -128,7 +128,7 @@ func createFlannelConf(nodeConfig *config.Node) error {
case config.FlannelBackendHostGW: case config.FlannelBackendHostGW:
backendConf = hostGWBackend backendConf = hostGWBackend
case config.FlannelBackendIPSEC: case config.FlannelBackendIPSEC:
backendConf = strings.Replace(ipsecBackend, "%psk%", nodeConfig.AgentConfig.IPSECPSK, -1) backendConf = strings.ReplaceAll(ipsecBackend, "%psk%", nodeConfig.AgentConfig.IPSECPSK)
if err := setupStrongSwan(nodeConfig); err != nil { if err := setupStrongSwan(nodeConfig); err != nil {
return err return err
} }
@ -137,7 +137,7 @@ func createFlannelConf(nodeConfig *config.Node) error {
default: default:
return fmt.Errorf("Cannot configure unknown flannel backend '%s'", nodeConfig.FlannelBackend) return fmt.Errorf("Cannot configure unknown flannel backend '%s'", nodeConfig.FlannelBackend)
} }
confJSON = strings.Replace(confJSON, "%backend%", backendConf, -1) confJSON = strings.ReplaceAll(confJSON, "%backend%", backendConf)
return util.WriteFile(nodeConfig.FlannelConf, confJSON) return util.WriteFile(nodeConfig.FlannelConf, confJSON)
} }

Write Preview
Loading…
Cancel
Save