Skip to content

Commit afe9670

Browse files
anjannathopenshift-merge-robot
anjannath
authored and
openshift-merge-robot
committed
remove CRC specific entries from known_hosts file during cleanup
previously we were cleaning the known_hosts file only during 'crc delete' but when a user upgrades they usually runs 'crc cleanup'
1 parent 09b97a3 commit afe9670

File tree

4 files changed

+32
-8
lines changed

4 files changed

+32
-8
lines changed

‎pkg/crc/preflight/preflight_checks_common.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"github.com/crc-org/crc/pkg/crc/logging"
1212
"github.com/crc-org/crc/pkg/crc/machine/bundle"
1313
crcpreset "github.com/crc-org/crc/pkg/crc/preset"
14+
"github.com/crc-org/crc/pkg/crc/ssh"
1415
"github.com/crc-org/crc/pkg/crc/validation"
1516
"github.com/pkg/errors"
1617
)
@@ -55,6 +56,13 @@ var genericCleanupChecks = []Check{
5556
cleanup: removeHostsFileEntry,
5657
flags: CleanUpOnly,
5758

59+
labels: None,
60+
},
61+
{
62+
cleanupDescription: "Removing CRC Specific entries from user's known_hosts file",
63+
cleanup: removeCRCHostEntriesFromKnownHosts,
64+
flags: CleanUpOnly,
65+
5866
labels: None,
5967
},
6068
}
@@ -143,3 +151,7 @@ func removeOldLogs() error {
143151
}
144152
return nil
145153
}
154+
155+
func removeCRCHostEntriesFromKnownHosts() error {
156+
return ssh.RemoveCRCHostEntriesFromKnownHosts()
157+
}

‎pkg/crc/preflight/preflight_darwin_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ func TestCountConfigurationOptions(t *testing.T) {
1717
}
1818

1919
func TestCountPreflights(t *testing.T) {
20-
assert.Len(t, getPreflightChecks(true, network.SystemNetworkingMode, constants.GetDefaultBundlePath(preset.OpenShift), preset.OpenShift), 16)
21-
assert.Len(t, getPreflightChecks(true, network.SystemNetworkingMode, constants.GetDefaultBundlePath(preset.OpenShift), preset.OpenShift), 16)
20+
assert.Len(t, getPreflightChecks(true, network.SystemNetworkingMode, constants.GetDefaultBundlePath(preset.OpenShift), preset.OpenShift), 17)
21+
assert.Len(t, getPreflightChecks(true, network.SystemNetworkingMode, constants.GetDefaultBundlePath(preset.OpenShift), preset.OpenShift), 17)
2222

23-
assert.Len(t, getPreflightChecks(true, network.UserNetworkingMode, constants.GetDefaultBundlePath(preset.OpenShift), preset.OpenShift), 15)
24-
assert.Len(t, getPreflightChecks(true, network.UserNetworkingMode, constants.GetDefaultBundlePath(preset.OpenShift), preset.OpenShift), 15)
23+
assert.Len(t, getPreflightChecks(true, network.UserNetworkingMode, constants.GetDefaultBundlePath(preset.OpenShift), preset.OpenShift), 16)
24+
assert.Len(t, getPreflightChecks(true, network.UserNetworkingMode, constants.GetDefaultBundlePath(preset.OpenShift), preset.OpenShift), 16)
2525
}

‎pkg/crc/preflight/preflight_linux_test.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ var checkListForDistros = []checkListForDistro{
7474
{cleanup: removeOldLogs},
7575
{cleanup: cluster.ForgetPullSecret},
7676
{cleanup: removeHostsFileEntry},
77+
{cleanup: removeCRCHostEntriesFromKnownHosts},
7778
{check: checkVirtualizationEnabled},
7879
{check: checkKvmEnabled},
7980
{check: checkLibvirtInstalled},
@@ -112,6 +113,7 @@ var checkListForDistros = []checkListForDistro{
112113
{cleanup: removeOldLogs},
113114
{cleanup: cluster.ForgetPullSecret},
114115
{cleanup: removeHostsFileEntry},
116+
{cleanup: removeCRCHostEntriesFromKnownHosts},
115117
{check: checkVirtualizationEnabled},
116118
{check: checkKvmEnabled},
117119
{check: checkLibvirtInstalled},
@@ -149,6 +151,7 @@ var checkListForDistros = []checkListForDistro{
149151
{cleanup: removeOldLogs},
150152
{cleanup: cluster.ForgetPullSecret},
151153
{cleanup: removeHostsFileEntry},
154+
{cleanup: removeCRCHostEntriesFromKnownHosts},
152155
{check: checkVirtualizationEnabled},
153156
{check: checkKvmEnabled},
154157
{check: checkLibvirtInstalled},
@@ -180,6 +183,7 @@ var checkListForDistros = []checkListForDistro{
180183
{cleanup: removeOldLogs},
181184
{cleanup: cluster.ForgetPullSecret},
182185
{cleanup: removeHostsFileEntry},
186+
{cleanup: removeCRCHostEntriesFromKnownHosts},
183187
{check: checkVirtualizationEnabled},
184188
{check: checkKvmEnabled},
185189
{check: checkLibvirtInstalled},
@@ -218,6 +222,7 @@ var checkListForDistros = []checkListForDistro{
218222
{cleanup: removeOldLogs},
219223
{cleanup: cluster.ForgetPullSecret},
220224
{cleanup: removeHostsFileEntry},
225+
{cleanup: removeCRCHostEntriesFromKnownHosts},
221226
{check: checkVirtualizationEnabled},
222227
{check: checkKvmEnabled},
223228
{check: checkLibvirtInstalled},
@@ -255,6 +260,7 @@ var checkListForDistros = []checkListForDistro{
255260
{cleanup: removeOldLogs},
256261
{cleanup: cluster.ForgetPullSecret},
257262
{cleanup: removeHostsFileEntry},
263+
{cleanup: removeCRCHostEntriesFromKnownHosts},
258264
{check: checkVirtualizationEnabled},
259265
{check: checkKvmEnabled},
260266
{check: checkLibvirtInstalled},
@@ -286,6 +292,7 @@ var checkListForDistros = []checkListForDistro{
286292
{cleanup: removeOldLogs},
287293
{cleanup: cluster.ForgetPullSecret},
288294
{cleanup: removeHostsFileEntry},
295+
{cleanup: removeCRCHostEntriesFromKnownHosts},
289296
{check: checkVirtualizationEnabled},
290297
{check: checkKvmEnabled},
291298
{check: checkLibvirtInstalled},
@@ -324,6 +331,7 @@ var checkListForDistros = []checkListForDistro{
324331
{cleanup: removeOldLogs},
325332
{cleanup: cluster.ForgetPullSecret},
326333
{cleanup: removeHostsFileEntry},
334+
{cleanup: removeCRCHostEntriesFromKnownHosts},
327335
{check: checkVirtualizationEnabled},
328336
{check: checkKvmEnabled},
329337
{check: checkLibvirtInstalled},
@@ -361,6 +369,7 @@ var checkListForDistros = []checkListForDistro{
361369
{cleanup: removeOldLogs},
362370
{cleanup: cluster.ForgetPullSecret},
363371
{cleanup: removeHostsFileEntry},
372+
{cleanup: removeCRCHostEntriesFromKnownHosts},
364373
{check: checkVirtualizationEnabled},
365374
{check: checkKvmEnabled},
366375
{check: checkLibvirtInstalled},
@@ -392,6 +401,7 @@ var checkListForDistros = []checkListForDistro{
392401
{cleanup: removeOldLogs},
393402
{cleanup: cluster.ForgetPullSecret},
394403
{cleanup: removeHostsFileEntry},
404+
{cleanup: removeCRCHostEntriesFromKnownHosts},
395405
{check: checkVirtualizationEnabled},
396406
{check: checkKvmEnabled},
397407
{check: checkLibvirtInstalled},
@@ -431,6 +441,7 @@ var checkListForDistros = []checkListForDistro{
431441
{cleanup: removeOldLogs},
432442
{cleanup: cluster.ForgetPullSecret},
433443
{cleanup: removeHostsFileEntry},
444+
{cleanup: removeCRCHostEntriesFromKnownHosts},
434445
{check: checkVirtualizationEnabled},
435446
{check: checkKvmEnabled},
436447
{check: checkLibvirtInstalled},
@@ -469,6 +480,7 @@ var checkListForDistros = []checkListForDistro{
469480
{cleanup: removeOldLogs},
470481
{cleanup: cluster.ForgetPullSecret},
471482
{cleanup: removeHostsFileEntry},
483+
{cleanup: removeCRCHostEntriesFromKnownHosts},
472484
{check: checkVirtualizationEnabled},
473485
{check: checkKvmEnabled},
474486
{check: checkLibvirtInstalled},

‎pkg/crc/preflight/preflight_windows_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ func TestCountConfigurationOptions(t *testing.T) {
1717
}
1818

1919
func TestCountPreflights(t *testing.T) {
20-
assert.Len(t, getPreflightChecks(false, network.SystemNetworkingMode, constants.GetDefaultBundlePath(preset.OpenShift), preset.OpenShift), 18)
21-
assert.Len(t, getPreflightChecks(true, network.SystemNetworkingMode, constants.GetDefaultBundlePath(preset.OpenShift), preset.OpenShift), 18)
20+
assert.Len(t, getPreflightChecks(false, network.SystemNetworkingMode, constants.GetDefaultBundlePath(preset.OpenShift), preset.OpenShift), 19)
21+
assert.Len(t, getPreflightChecks(true, network.SystemNetworkingMode, constants.GetDefaultBundlePath(preset.OpenShift), preset.OpenShift), 19)
2222

23-
assert.Len(t, getPreflightChecks(false, network.UserNetworkingMode, constants.GetDefaultBundlePath(preset.OpenShift), preset.OpenShift), 17)
24-
assert.Len(t, getPreflightChecks(true, network.UserNetworkingMode, constants.GetDefaultBundlePath(preset.OpenShift), preset.OpenShift), 17)
23+
assert.Len(t, getPreflightChecks(false, network.UserNetworkingMode, constants.GetDefaultBundlePath(preset.OpenShift), preset.OpenShift), 18)
24+
assert.Len(t, getPreflightChecks(true, network.UserNetworkingMode, constants.GetDefaultBundlePath(preset.OpenShift), preset.OpenShift), 18)
2525
}

0 commit comments

Comments
 (0)