Skip to content

Commit cad6cb4

Browse files
committed
remove code creating the dnsmasq config in the crc vm
since the dnsmasq config is added by a systemd service in the self-sufficient bundle we can remove the code from crc
1 parent b065a1e commit cad6cb4

File tree

2 files changed

+0
-88
lines changed

2 files changed

+0
-88
lines changed

Diff for: pkg/crc/services/dns/dns.go

-23
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ import (
1414
"github.com/crc-org/crc/v2/pkg/crc/network"
1515
"github.com/crc-org/crc/v2/pkg/crc/network/httpproxy"
1616
"github.com/crc-org/crc/v2/pkg/crc/services"
17-
"github.com/crc-org/crc/v2/pkg/crc/systemd"
18-
"github.com/crc-org/crc/v2/pkg/crc/systemd/states"
1917
)
2018

2119
const (
@@ -28,10 +26,6 @@ func init() {
2826
}
2927

3028
func RunPostStart(serviceConfig services.ServicePostStartConfig) error {
31-
if err := setupDnsmasq(serviceConfig); err != nil {
32-
return err
33-
}
34-
3529
if err := runPostStartForOS(serviceConfig); err != nil {
3630
return err
3731
}
@@ -44,23 +38,6 @@ func RunPostStart(serviceConfig services.ServicePostStartConfig) error {
4438
return network.UpdateResolvFileOnInstance(serviceConfig.SSHRunner, resolvFileValues)
4539
}
4640

47-
func setupDnsmasq(serviceConfig services.ServicePostStartConfig) error {
48-
if serviceConfig.NetworkMode == network.UserNetworkingMode {
49-
return nil
50-
}
51-
52-
if err := createDnsmasqDNSConfig(serviceConfig); err != nil {
53-
return err
54-
}
55-
sd := systemd.NewInstanceSystemdCommander(serviceConfig.SSHRunner)
56-
if state, err := sd.Status(dnsmasqService); err != nil || state != states.Running {
57-
if err := sd.Enable(dnsmasqService); err != nil {
58-
return err
59-
}
60-
}
61-
return sd.Start(dnsmasqService)
62-
}
63-
6441
func getResolvFileValues(serviceConfig services.ServicePostStartConfig) (network.ResolvFileValues, error) {
6542
dnsServers, err := dnsServers(serviceConfig)
6643
if err != nil {

Diff for: pkg/crc/services/dns/template.go

-65
This file was deleted.

0 commit comments

Comments
 (0)