Skip to content

Commit a7de403

Browse files
Merge pull request #13726 from pravisankar/remove-stale-code
Remove stale SDN code: Writing cluster network CIDR to config.env
2 parents 250f921 + 6306dcb commit a7de403

File tree

1 file changed

+0
-11
lines changed

1 file changed

+0
-11
lines changed

pkg/sdn/plugin/sdn_controller.go

-11
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ package plugin
22

33
import (
44
"fmt"
5-
"io/ioutil"
65
"net"
7-
"os"
86
"strings"
97
"time"
108

@@ -157,15 +155,6 @@ func (plugin *OsdnNode) SetupSDN() (bool, error) {
157155
}
158156
glog.V(5).Infof("[SDN setup] full SDN setup required")
159157

160-
if err := os.MkdirAll("/run/openshift-sdn", 0700); err != nil {
161-
return false, err
162-
}
163-
config := fmt.Sprintf("export OPENSHIFT_CLUSTER_SUBNET=%s", clusterNetworkCIDR)
164-
err = ioutil.WriteFile("/run/openshift-sdn/config.env", []byte(config), 0644)
165-
if err != nil {
166-
return false, err
167-
}
168-
169158
err = plugin.oc.SetupOVS(clusterNetworkCIDR, serviceNetworkCIDR, localSubnetCIDR, localSubnetGateway)
170159
if err != nil {
171160
return false, err

0 commit comments

Comments
 (0)