Skip to content

Commit

Permalink
Remove wait-for-node-ready in GW and RA main
Browse files Browse the repository at this point in the history
This is now handled by the separate await-node-ready binary.

Fixes submariner-io/submariner-operator#3274

Signed-off-by: Tom Pantelis <[email protected]>
  • Loading branch information
tpantelis committed Dec 12, 2024
1 parent 0df358d commit 91a097d
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 15 deletions.
7 changes: 0 additions & 7 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ import (
submarinerClientset "github.com/submariner-io/submariner/pkg/client/clientset/versioned"
"github.com/submariner-io/submariner/pkg/gateway"
"github.com/submariner-io/submariner/pkg/natdiscovery"
"github.com/submariner-io/submariner/pkg/node"
"github.com/submariner-io/submariner/pkg/types"
"github.com/submariner-io/submariner/pkg/versions"
"golang.org/x/net/http/httpproxy"
Expand Down Expand Up @@ -126,12 +125,6 @@ func main() {

ctx := signals.SetupSignalHandler()

if submSpec.WaitForNode {
node.WaitForLocalNodeReady(ctx, k8sClient)

return
}

gw, err := gateway.New(ctx, &gateway.Config{
LeaderElectionConfig: gateway.LeaderElectionConfig{
LeaseDuration: time.Duration(gwLeadershipConfig.LeaseDuration) * time.Second,
Expand Down
1 change: 0 additions & 1 deletion pkg/routeagent_driver/environment/env.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,4 @@ type Specification struct {
GlobalCidr []string
ProfilePort int `default:"32782"`
Uninstall bool
WaitForNode bool
}
6 changes: 0 additions & 6 deletions pkg/routeagent_driver/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -111,12 +111,6 @@ func main() {
restMapper, err := util.BuildRestMapper(cfg)
logger.FatalOnError(err, "Error building the REST mapper")

if env.WaitForNode {
node.WaitForLocalNodeReady(ctx, k8sClientSet)

return
}

// Set packetfilter driver to iptables. Once nftables is available, we'll check which driver is supported.
packetfilter.SetNewDriverFn(iptables.New)

Expand Down
1 change: 0 additions & 1 deletion pkg/types/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ type SubmarinerSpecification struct {
HealthCheckEnabled bool `default:"true"`
Uninstall bool
HaltOnCertError bool `split_words:"true"`
WaitForNode bool
HealthCheckInterval int
HealthCheckMaxPacketLossCount int
MetricsPort int `default:"32780"`
Expand Down

0 comments on commit 91a097d

Please sign in to comment.