Skip to content

Commit 7b04899

Browse files
cfergeaupraveenkumar
cfergeau
authored and
praveenkumar
committed
preflight: Remove 'old admin helper' checks
They were added 1.5 years ago, and scheduled for removal after "a few releases". Even if the old binaries stay around, this should not cause issues as crc won't try to use them. This reverts 60e11bd
1 parent 96e927e commit 7b04899

File tree

3 files changed

+5
-58
lines changed

3 files changed

+5
-58
lines changed

‎pkg/crc/preflight/preflight_checks_unix.go

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,6 @@ func genericPreflightChecks(preset crcpreset.Preset) []Check {
4646

4747
labels: None,
4848
},
49-
{
50-
configKeySuffix: "check-obsolete-admin-helper",
51-
checkDescription: "Checking for obsolete admin-helper executable",
52-
check: checkOldAdminHelperExecutableCached,
53-
fixDescription: "Removing obsolete admin-helper executable",
54-
fix: fixOldAdminHelperExecutableCached,
55-
},
5649
{
5750
configKeySuffix: "check-supported-cpu-arch",
5851
checkDescription: "Checking if running on a supported CPU architecture",
@@ -157,40 +150,6 @@ func fixAdminHelperExecutableCached() error {
157150
return setSuid(helper.GetExecutablePath())
158151
}
159152

160-
var oldAdminHelpers = []string{"admin-helper-linux", "admin-helper-darwin"}
161-
162-
/* These 2 checks can be removed after a few releases */
163-
func checkOldAdminHelperExecutableCached() error {
164-
logging.Debugf("Checking if an older admin-helper executable is installed")
165-
for _, oldExecutable := range oldAdminHelpers {
166-
oldPath := filepath.Join(constants.BinDir(), oldExecutable)
167-
if _, err := os.Stat(oldPath); !os.IsNotExist(err) {
168-
return fmt.Errorf("Found old admin-helper executable '%s'", oldExecutable)
169-
}
170-
}
171-
172-
logging.Debugf("No older admin-helper executable found")
173-
174-
return nil
175-
}
176-
177-
func fixOldAdminHelperExecutableCached() error {
178-
logging.Debugf("Removing older admin-helper executable")
179-
for _, oldExecutable := range oldAdminHelpers {
180-
oldPath := filepath.Join(constants.BinDir(), oldExecutable)
181-
if err := os.Remove(oldPath); err != nil {
182-
if !os.IsNotExist(err) {
183-
logging.Debugf("Failed to remove %s: %v", oldPath, err)
184-
return err
185-
}
186-
} else {
187-
logging.Debugf("Successfully removed %s", oldPath)
188-
}
189-
}
190-
191-
return nil
192-
}
193-
194153
func checkSupportedCPUArch() error {
195154
logging.Debugf("GOARCH is %s GOOS is %s", runtime.GOARCH, runtime.GOOS)
196155
// Only supported arches are amd64, and arm64 on macOS

‎pkg/crc/preflight/preflight_darwin_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ import (
1313
func TestCountConfigurationOptions(t *testing.T) {
1414
cfg := config.New(config.NewEmptyInMemoryStorage(), config.NewEmptyInMemorySecretStorage())
1515
RegisterSettings(cfg)
16-
assert.Len(t, cfg.AllConfigs(), 12)
16+
assert.Len(t, cfg.AllConfigs(), 11)
1717
}
1818

1919
func TestCountPreflights(t *testing.T) {
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)
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)
2222

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)
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)
2525
}

‎pkg/crc/preflight/preflight_linux_test.go

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ var checkListForDistros = []checkListForDistro{
6767
{check: checkIfRunningAsNormalUser},
6868
{check: checkRunningInsideWSL2},
6969
{check: checkAdminHelperExecutableCached},
70-
{check: checkOldAdminHelperExecutableCached},
7170
{check: checkSupportedCPUArch},
7271
{configKeySuffix: "check-ram"},
7372
{check: checkCrcSymlink},
@@ -106,7 +105,6 @@ var checkListForDistros = []checkListForDistro{
106105
{check: checkIfRunningAsNormalUser},
107106
{check: checkRunningInsideWSL2},
108107
{check: checkAdminHelperExecutableCached},
109-
{check: checkOldAdminHelperExecutableCached},
110108
{check: checkSupportedCPUArch},
111109
{configKeySuffix: "check-ram"},
112110
{check: checkCrcSymlink},
@@ -144,7 +142,6 @@ var checkListForDistros = []checkListForDistro{
144142
{check: checkIfRunningAsNormalUser},
145143
{check: checkRunningInsideWSL2},
146144
{check: checkAdminHelperExecutableCached},
147-
{check: checkOldAdminHelperExecutableCached},
148145
{check: checkSupportedCPUArch},
149146
{configKeySuffix: "check-ram"},
150147
{check: checkCrcSymlink},
@@ -176,7 +173,6 @@ var checkListForDistros = []checkListForDistro{
176173
{check: checkIfRunningAsNormalUser},
177174
{check: checkRunningInsideWSL2},
178175
{check: checkAdminHelperExecutableCached},
179-
{check: checkOldAdminHelperExecutableCached},
180176
{check: checkSupportedCPUArch},
181177
{configKeySuffix: "check-ram"},
182178
{check: checkCrcSymlink},
@@ -215,7 +211,6 @@ var checkListForDistros = []checkListForDistro{
215211
{check: checkIfRunningAsNormalUser},
216212
{check: checkRunningInsideWSL2},
217213
{check: checkAdminHelperExecutableCached},
218-
{check: checkOldAdminHelperExecutableCached},
219214
{check: checkSupportedCPUArch},
220215
{configKeySuffix: "check-ram"},
221216
{check: checkCrcSymlink},
@@ -253,7 +248,6 @@ var checkListForDistros = []checkListForDistro{
253248
{check: checkIfRunningAsNormalUser},
254249
{check: checkRunningInsideWSL2},
255250
{check: checkAdminHelperExecutableCached},
256-
{check: checkOldAdminHelperExecutableCached},
257251
{check: checkSupportedCPUArch},
258252
{configKeySuffix: "check-ram"},
259253
{check: checkCrcSymlink},
@@ -285,7 +279,6 @@ var checkListForDistros = []checkListForDistro{
285279
{check: checkIfRunningAsNormalUser},
286280
{check: checkRunningInsideWSL2},
287281
{check: checkAdminHelperExecutableCached},
288-
{check: checkOldAdminHelperExecutableCached},
289282
{check: checkSupportedCPUArch},
290283
{configKeySuffix: "check-ram"},
291284
{check: checkCrcSymlink},
@@ -324,7 +317,6 @@ var checkListForDistros = []checkListForDistro{
324317
{check: checkIfRunningAsNormalUser},
325318
{check: checkRunningInsideWSL2},
326319
{check: checkAdminHelperExecutableCached},
327-
{check: checkOldAdminHelperExecutableCached},
328320
{check: checkSupportedCPUArch},
329321
{configKeySuffix: "check-ram"},
330322
{check: checkCrcSymlink},
@@ -362,7 +354,6 @@ var checkListForDistros = []checkListForDistro{
362354
{check: checkIfRunningAsNormalUser},
363355
{check: checkRunningInsideWSL2},
364356
{check: checkAdminHelperExecutableCached},
365-
{check: checkOldAdminHelperExecutableCached},
366357
{check: checkSupportedCPUArch},
367358
{configKeySuffix: "check-ram"},
368359
{check: checkCrcSymlink},
@@ -394,7 +385,6 @@ var checkListForDistros = []checkListForDistro{
394385
{check: checkIfRunningAsNormalUser},
395386
{check: checkRunningInsideWSL2},
396387
{check: checkAdminHelperExecutableCached},
397-
{check: checkOldAdminHelperExecutableCached},
398388
{check: checkSupportedCPUArch},
399389
{configKeySuffix: "check-ram"},
400390
{check: checkCrcSymlink},
@@ -434,7 +424,6 @@ var checkListForDistros = []checkListForDistro{
434424
{check: checkIfRunningAsNormalUser},
435425
{check: checkRunningInsideWSL2},
436426
{check: checkAdminHelperExecutableCached},
437-
{check: checkOldAdminHelperExecutableCached},
438427
{check: checkSupportedCPUArch},
439428
{configKeySuffix: "check-ram"},
440429
{check: checkCrcSymlink},
@@ -473,7 +462,6 @@ var checkListForDistros = []checkListForDistro{
473462
{check: checkIfRunningAsNormalUser},
474463
{check: checkRunningInsideWSL2},
475464
{check: checkAdminHelperExecutableCached},
476-
{check: checkOldAdminHelperExecutableCached},
477465
{check: checkSupportedCPUArch},
478466
{configKeySuffix: "check-ram"},
479467
{check: checkCrcSymlink},

0 commit comments

Comments
 (0)