Skip to content

Commit eec5bfe

Browse files
committed
pkg/infrastructure/clusterapi: remove old handler
Removes the original signal handler, which is replaced by the signal handler in installer main. pick 1464d8847d main: add top-level context and graceful shutdown
1 parent 608614a commit eec5bfe

File tree

1 file changed

+0
-10
lines changed

1 file changed

+0
-10
lines changed

pkg/infrastructure/clusterapi/clusterapi.go

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import (
1717
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
1818
utilkubeconfig "sigs.k8s.io/cluster-api/util/kubeconfig"
1919
"sigs.k8s.io/controller-runtime/pkg/client"
20-
"sigs.k8s.io/controller-runtime/pkg/manager/signals"
2120

2221
"github.com/openshift/installer/pkg/asset"
2322
"github.com/openshift/installer/pkg/asset/cluster/metadata"
@@ -96,15 +95,6 @@ func (i *InfraProvider) Provision(ctx context.Context, dir string, parents asset
9695
machineManifests = append(machineManifests, m.Object)
9796
}
9897

99-
// TODO(vincepri): The context should be passed down from the caller,
100-
// although today the Asset interface doesn't allow it, refactor once it does.
101-
ctx, cancel := context.WithCancel(signals.SetupSignalHandler())
102-
go func() {
103-
<-ctx.Done()
104-
cancel()
105-
clusterapi.System().Teardown()
106-
}()
107-
10898
if p, ok := i.impl.(PreProvider); ok {
10999
preProvisionInput := PreProvisionInput{
110100
InfraID: clusterID.InfraID,

0 commit comments

Comments
 (0)