| ... | ... |
@@ -475,7 +475,11 @@ func newAdmissionChain(pluginNames []string, admissionConfigFilename string, plu |
| 475 | 475 |
if len(options.PolicyConfig.OpenShiftInfrastructureNamespace) > 0 {
|
| 476 | 476 |
immortalNamespaces.Insert(options.PolicyConfig.OpenShiftInfrastructureNamespace) |
| 477 | 477 |
} |
| 478 |
- plugins = append(plugins, lifecycle.NewLifecycle(kubeClientSet, immortalNamespaces)) |
|
| 478 |
+ lc, err := lifecycle.NewLifecycle(kubeClientSet, immortalNamespaces) |
|
| 479 |
+ if err != nil {
|
|
| 480 |
+ return nil, err |
|
| 481 |
+ } |
|
| 482 |
+ plugins = append(plugins, lc) |
|
| 479 | 483 |
|
| 480 | 484 |
case serviceadmit.ExternalIPPluginName: |
| 481 | 485 |
// this needs to be moved upstream to be part of core config |
| ... | ... |
@@ -322,6 +322,8 @@ func (plugin *OsdnNode) SetupSDN(localSubnetCIDR, clusterNetworkCIDR, servicesNe |
| 322 | 322 |
itx.IgnoreError() |
| 323 | 323 |
_ = itx.EndTransaction() |
| 324 | 324 |
|
| 325 |
+ sysctl := sysctl.New() |
|
| 326 |
+ |
|
| 325 | 327 |
// Disable iptables for linux bridges (and in particular lbr0), ignoring errors. |
| 326 | 328 |
// (This has to have been performed in advance for docker-in-docker deployments, |
| 327 | 329 |
// since this will fail there). |
| ... | ... |
@@ -53,7 +53,7 @@ func (plugin *OsdnNode) getExecutable() string {
|
| 53 | 53 |
return "openshift-sdn-ovs" |
| 54 | 54 |
} |
| 55 | 55 |
|
| 56 |
-func (plugin *OsdnNode) Init(host knetwork.Host, _ componentconfig.HairpinMode, _ string) error {
|
|
| 56 |
+func (plugin *OsdnNode) Init(host knetwork.Host, _ componentconfig.HairpinMode, _ string, _ int) error {
|
|
| 57 | 57 |
return nil |
| 58 | 58 |
} |
| 59 | 59 |
|