Add flag to ignore app preflights for V2 installs and update success message (#2711)

* Add CLI flag ignore-app-preflights for install

* Update success message for headless install

* Add dry-run test for ignore-app-preflights flag

Author: screspod

cmd/installer/cli/install.go

@@ -75,6 +75,7 @@ type InstallCmdFlags struct {
 	localArtifactMirrorPort int
 	skipHostPreflights      bool
 	ignoreHostPreflights    bool
+	ignoreAppPreflights     bool
 	networkInterface        string
 
 	// kubernetes flags
@@ -276,8 +277,9 @@ func newLinuxInstallFlags(flags *InstallCmdFlags, enableV3 bool) *pflag.FlagSet
 	defaultDataDir := ecv1beta1.DefaultDataDir
 	if enableV3 {
 		defaultDataDir = filepath.Join("/var/lib", runtimeconfig.AppSlug())
+	} else {
+		flagSet.BoolVar(&flags.ignoreAppPreflights, "ignore-app-preflights", false, "Allow bypassing app preflight failures")
 	}
-
 	flagSet.StringVar(&flags.dataDir, "data-dir", defaultDataDir, "Path to the data directory")
 	flagSet.IntVar(&flags.localArtifactMirrorPort, "local-artifact-mirror-port", ecv1beta1.DefaultLocalArtifactMirrorPort, "Port on which the Local Artifact Mirror will be served")
 	flagSet.StringVar(&flags.networkInterface, "network-interface", "", "The network interface to use for the cluster")
@@ -827,7 +829,9 @@ func runInstall(ctx context.Context, flags InstallCmdFlags, rc runtimeconfig.Run
 		logrus.Warnf("Unable to create host support bundle: %v", err)
 	}
 
-	printSuccessMessage(flags.license, flags.hostname, flags.networkInterface, rc)
+	isHeadlessInstall := flags.configValues != "" && flags.adminConsolePassword != ""
+
+	printSuccessMessage(flags.license, flags.hostname, flags.networkInterface, rc, isHeadlessInstall)
 
 	return nil
 }
@@ -875,6 +879,7 @@ func getAddonInstallOpts(flags InstallCmdFlags, rc runtimeconfig.RuntimeConfig,
 				AirgapBundle:          flags.airgapBundle,
 				ConfigValuesFile:      flags.configValues,
 				ReplicatedAppEndpoint: replicatedAppURL(),
+				SkipPreflights:        flags.ignoreAppPreflights,
 				Stdout:                *loading,
 			}
 			return kotscli.Install(opts)
@@ -1415,11 +1420,16 @@ func normalizeNoPromptToYes(f *pflag.FlagSet, name string) pflag.NormalizedName
 	return pflag.NormalizedName(name)
 }
 
-func printSuccessMessage(license *kotsv1beta1.License, hostname string, networkInterface string, rc runtimeconfig.RuntimeConfig) {
+func printSuccessMessage(license *kotsv1beta1.License, hostname string, networkInterface string, rc runtimeconfig.RuntimeConfig, isHeadlessInstall bool) {
 	adminConsoleURL := getAdminConsoleURL(hostname, networkInterface, rc.AdminConsolePort())
 
 	// Create the message content
-	message := fmt.Sprintf("Visit the Admin Console to configure and install %s:", license.Spec.AppSlug)
+	var message string
+	if isHeadlessInstall {
+		message = fmt.Sprintf("The Admin Console for %s is available at:", license.Spec.AppSlug)
+	} else {
+		message = fmt.Sprintf("Visit the Admin Console to configure and install %s:", license.Spec.AppSlug)
+	}
 
 	// Determine the length of the longest line
 	longestLine := len(message)

cmd/installer/cli/install_test.go

@@ -704,6 +704,122 @@ func boolPtr(b bool) *bool {
 	return &b
 }
 
+func Test_ignoreAppPreflights_FlagVisibility(t *testing.T) {
+	tests := []struct {
+		name                        string
+		enableV3EnvVar              string
+		expectedFlagShouldBeVisible bool
+	}{
+		{
+			name:                        "ENABLE_V3 not set - flag should be visible",
+			enableV3EnvVar:              "",
+			expectedFlagShouldBeVisible: true,
+		},
+		{
+			name:                        "ENABLE_V3 set to 1 - flag should be hidden",
+			enableV3EnvVar:              "1",
+			expectedFlagShouldBeVisible: false,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			// Clean environment
+			os.Unsetenv("ENABLE_V3")
+
+			// Set environment variable if specified
+			if tt.enableV3EnvVar != "" {
+				t.Setenv("ENABLE_V3", tt.enableV3EnvVar)
+			}
+
+			flags := &InstallCmdFlags{}
+			enableV3 := isV3Enabled()
+			flagSet := newLinuxInstallFlags(flags, enableV3)
+
+			// Check if the flag exists
+			flag := flagSet.Lookup("ignore-app-preflights")
+			flagExists := flag != nil
+
+			assert.Equal(t, tt.expectedFlagShouldBeVisible, flagExists, "Flag visibility should match expected")
+
+			if flagExists {
+				// Test flag properties
+				assert.Equal(t, "ignore-app-preflights", flag.Name)
+				assert.Equal(t, "false", flag.DefValue) // Default should be false
+				assert.Equal(t, "Allow bypassing app preflight failures", flag.Usage)
+				assert.Equal(t, "bool", flag.Value.Type())
+
+				// Test flag targets - should be Linux only
+				targetAnnotation := flag.Annotations[flagAnnotationTarget]
+				require.NotNil(t, targetAnnotation, "Flag should have target annotation")
+				assert.Contains(t, targetAnnotation, flagAnnotationTargetValueLinux)
+			}
+		})
+	}
+}
+
+func Test_ignoreAppPreflights_FlagParsing(t *testing.T) {
+	tests := []struct {
+		name                     string
+		args                     []string
+		enableV3                 bool
+		expectedIgnorePreflights bool
+		expectError              bool
+	}{
+		{
+			name:                     "flag not provided, V3 disabled",
+			args:                     []string{},
+			enableV3:                 false,
+			expectedIgnorePreflights: false,
+			expectError:              false,
+		},
+		{
+			name:                     "flag set to true, V3 disabled",
+			args:                     []string{"--ignore-app-preflights"},
+			enableV3:                 false,
+			expectedIgnorePreflights: true,
+			expectError:              false,
+		},
+		{
+			name:                     "flag set but V3 enabled - should error",
+			args:                     []string{"--ignore-app-preflights"},
+			enableV3:                 true,
+			expectedIgnorePreflights: false,
+			expectError:              true,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			// Set environment variable for V3 testing
+			if tt.enableV3 {
+				t.Setenv("ENABLE_V3", "1")
+			}
+
+			// Create a flagset similar to how newLinuxInstallFlags works
+			flags := &InstallCmdFlags{}
+			flagSet := newLinuxInstallFlags(flags, tt.enableV3)
+
+			// Create a command to test flag parsing
+			cmd := &cobra.Command{
+				Use: "test",
+				Run: func(cmd *cobra.Command, args []string) {},
+			}
+			cmd.Flags().AddFlagSet(flagSet)
+
+			// Try to parse the arguments
+			err := cmd.Flags().Parse(tt.args)
+			if tt.expectError {
+				assert.Error(t, err, "Flag parsing should fail when flag doesn't exist")
+			} else {
+				assert.NoError(t, err, "Flag parsing should succeed")
+				// Check the flag value only if parsing succeeded
+				assert.Equal(t, tt.expectedIgnorePreflights, flags.ignoreAppPreflights)
+			}
+		})
+	}
+}
+
 func Test_processTLSConfig(t *testing.T) {
 	// Create a temporary directory for test certificates
 	tmpdir := t.TempDir()

tests/dryrun/install_test.go

@@ -752,3 +752,48 @@ oxhVqyhpk86rf0rT5DcD/sBw
 
 	t.Logf("%s: test complete", time.Now().Format(time.RFC3339))
 }
+
+func TestIgnoreAppPreflightsInstallation(t *testing.T) {
+	hcli := &helm.MockClient{}
+
+	mock.InOrder(
+		// 4 addons
+		hcli.On("Install", mock.Anything, mock.Anything).Times(4).Return(nil, nil),
+		hcli.On("Close").Once().Return(nil),
+	)
+
+	dr := dryrunInstall(t,
+		&dryrun.Client{HelmClient: hcli},
+		"--ignore-app-preflights",
+	)
+
+	// --- validate commands --- //
+	assertCommands(t, dr.Commands,
+		[]any{
+			regexp.MustCompile(`install fake-app-slug/fake-channel-slug .* --skip-preflights`),
+		},
+		false,
+	)
+
+	// --- validate metrics --- //
+	assertMetrics(t, dr.Metrics, []struct {
+		title    string
+		validate func(string)
+	}{
+		{
+			title: "InstallationStarted",
+			validate: func(payload string) {
+				assert.Contains(t, payload, "--ignore-app-preflights")
+			},
+		},
+		{
+			title: "GenericEvent",
+			validate: func(payload string) {
+				assert.Contains(t, payload, `"isExitEvent":true`)
+				assert.Contains(t, payload, `"eventType":"InstallationSucceeded"`)
+			},
+		},
+	})
+
+	t.Logf("%s: test complete", time.Now().Format(time.RFC3339))
+}