Skip to content

Commit 7d63132

Browse files
committed
remove helper to start the routes controller pod
this is done via a systemd service on the bundle which automatically starts the routes controller pod after the cluster is started
1 parent 7b96917 commit 7d63132

File tree

1 file changed

+0
-22
lines changed

1 file changed

+0
-22
lines changed

pkg/crc/machine/start.go

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -498,11 +498,6 @@ func (client *client) Start(ctx context.Context, startConfig types.StartConfig)
498498
return nil, err
499499
}
500500

501-
if client.useVSock() {
502-
if err := ensureRoutesControllerIsRunning(sshRunner, ocConfig); err != nil {
503-
return nil, err
504-
}
505-
}
506501
logging.Info("Adding microshift context to kubeconfig...")
507502
if err := mergeKubeConfigFile(constants.KubeconfigFilePath); err != nil {
508503
return nil, err
@@ -571,12 +566,6 @@ func (client *client) Start(ctx context.Context, startConfig types.StartConfig)
571566
return nil, errors.Wrap(err, "Failed to update cluster ID")
572567
}
573568

574-
if client.useVSock() {
575-
if err := ensureRoutesControllerIsRunning(sshRunner, ocConfig); err != nil {
576-
return nil, err
577-
}
578-
}
579-
580569
if client.monitoringEnabled() {
581570
logging.Info("Enabling cluster monitoring operator...")
582571
if err := cluster.StartMonitoring(ocConfig); err != nil {
@@ -813,17 +802,6 @@ func logBundleDate(crcBundleMetadata *bundle.CrcBundleInfo) {
813802
}
814803
}
815804

816-
func ensureRoutesControllerIsRunning(sshRunner *crcssh.Runner, ocConfig oc.Config) error {
817-
// Check if the bundle have `/opt/crc/routes-controller.yaml` file and if it has
818-
// then use it to create the resource for the routes controller.
819-
_, _, err := sshRunner.Run("ls", "/opt/crc/routes-controller.yaml")
820-
if err != nil {
821-
return err
822-
}
823-
_, _, err = ocConfig.RunOcCommand("apply", "-f", "/opt/crc/routes-controller.yaml")
824-
return err
825-
}
826-
827805
func updateKubeconfig(ctx context.Context, ocConfig oc.Config, sshRunner *crcssh.Runner, kubeconfigFilePath string) error {
828806
selfSignedCAKey, selfSignedCACert, err := crctls.GetSelfSignedCA()
829807
if err != nil {

0 commit comments

Comments
 (0)