Skip to content

Register SDN informers synchronously #15353

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
liggitt merged 1 commit into from
Jul 20, 2017
Merged

Register SDN informers synchronously #15353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 17 additions & 14 deletions pkg/cmd/server/origin/controller/network.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ import (
"net"
"time"

"github.com/golang/glog"
kclientsetinternal "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"

osclient "github.com/openshift/origin/pkg/client"
configapi "github.com/openshift/origin/pkg/cmd/server/api"
"github.com/openshift/origin/pkg/cmd/server/bootstrappolicy"
Expand All @@ -19,25 +20,27 @@ type SDNControllerConfig struct {

func (c *SDNControllerConfig) RunController(ctx ControllerContext) (bool, error) {
// TODO: Switch SDN to use client.Interface
osClientConfig, err := ctx.ClientBuilder.Config(bootstrappolicy.InfraSDNControllerServiceAccountName)
clientConfig, err := ctx.ClientBuilder.Config(bootstrappolicy.InfraSDNControllerServiceAccountName)
if err != nil {
return false, err
}
osClient, err := osclient.New(clientConfig)
if err != nil {
return false, err
}
osClient, err := osclient.New(osClientConfig)
kClient, err := kclientsetinternal.NewForConfig(clientConfig)
if err != nil {
return false, err
}
go func() {
err := sdnplugin.StartMaster(
c.NetworkConfig,
osClient,
ctx.ClientBuilder.KubeInternalClientOrDie(bootstrappolicy.InfraSDNControllerServiceAccountName),
ctx.InternalKubeInformers,
)
if err != nil {
glog.Errorf("failed to start SDN plugin controller: %v", err)
}
}()
err = sdnplugin.StartMaster(
c.NetworkConfig,
osClient,
kClient,
ctx.InternalKubeInformers,
)
if err != nil {
return false, fmt.Errorf("failed to start SDN plugin controller: %v", err)
}
return true, nil
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/sdn/plugin/master.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ func StartMaster(networkConfig osconfigapi.MasterNetworkConfig, osClient *osclie

// try this for a while before just dying
var getError error
err = wait.PollImmediate(1*time.Second, 30*time.Second, func() (bool, error) {
err = wait.PollImmediate(1*time.Second, time.Minute, func() (bool, error) {
// reset this so that failures come through correctly.
getError = nil
existingCN, err := master.osClient.ClusterNetwork().Get(osapi.ClusterNetworkDefault, metav1.GetOptions{})
Expand Down