feat: preflight storage needed to perform airgap install #2336
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -95,7 +95,16 @@ func InstallCmd(ctx context.Context, name string) *cobra.Command { | |
| cancel() // Cancel context when command completes | ||
| }, | ||
| RunE: func(cmd *cobra.Command, args []string) error { | ||
| var airgapInfo *kotsv1beta1.Airgap | ||
| if flags.airgapBundle != "" { | ||
| var err error | ||
| airgapInfo, err = airgap.AirgapInfoFromPath(flags.airgapBundle) | ||
| if err != nil { | ||
| return fmt.Errorf("failed to get airgap info: %w", err) | ||
| } | ||
| } | ||
|
There was a problem hiding this comment. Is there any reason this is not in the preRunInstall function as suggested? That way it exists with the rest of the flag parsing code and will work for both install and install run-preflights command. There was a problem hiding this comment. Isn't There was a problem hiding this comment. I'll create a new flag like the rest |
||
|
|
||
| if err := verifyAndPrompt(ctx, name, flags, prompts.New(), airgapInfo); err != nil { | ||
| return err | ||
| } | ||
| if err := preRunInstall(cmd, &flags, rc); err != nil { | ||
|
|
@@ -120,7 +129,7 @@ func InstallCmd(ctx context.Context, name string) *cobra.Command { | |
| installReporter.ReportSignalAborted(ctx, sig) | ||
| }) | ||
|
|
||
| if err := runInstall(cmd.Context(), flags, rc, installReporter, airgapInfo); err != nil { | ||
| // Check if this is an interrupt error from the terminal | ||
| if errors.Is(err, terminal.InterruptErr) { | ||
| installReporter.ReportSignalAborted(ctx, syscall.SIGINT) | ||
|
|
@@ -435,7 +444,7 @@ func runManagerExperienceInstall(ctx context.Context, flags InstallCmdFlags, rc | |
| return nil | ||
| } | ||
|
|
||
| func runInstall(ctx context.Context, flags InstallCmdFlags, rc runtimeconfig.RuntimeConfig, installReporter *InstallReporter, airgapInfo *kotsv1beta1.Airgap) (finalErr error) { | ||
| if flags.enableManagerExperience { | ||
| return nil | ||
| } | ||
|
|
@@ -470,7 +479,7 @@ func runInstall(ctx context.Context, flags InstallCmdFlags, rc runtimeconfig.Run | |
| errCh := kubeutils.WaitForKubernetes(ctx, kcli) | ||
| defer logKubernetesErrors(errCh) | ||
|
|
||
| in, err := recordInstallation(ctx, kcli, flags, rc, flags.license, airgapInfo) | ||
| if err != nil { | ||
| return fmt.Errorf("unable to record installation: %w", err) | ||
| } | ||
|
|
@@ -571,7 +580,7 @@ func getAddonInstallOpts(flags InstallCmdFlags, rc runtimeconfig.RuntimeConfig, | |
| return opts, nil | ||
| } | ||
|
|
||
| func verifyAndPrompt(ctx context.Context, name string, flags InstallCmdFlags, prompt prompts.Prompt, airgapInfo *kotsv1beta1.Airgap) error { | ||
| logrus.Debugf("checking if k0s is already installed") | ||
| err := verifyNoInstallation(name, "reinstall") | ||
| if err != nil { | ||
|
|
@@ -588,9 +597,9 @@ func verifyAndPrompt(ctx context.Context, name string, flags InstallCmdFlags, pr | |
| if err != nil { | ||
| return err | ||
| } | ||
| if airgapInfo != nil { | ||
| logrus.Debugf("checking airgap bundle matches binary") | ||
| if err := checkAirgapMatches(airgapInfo); err != nil { | ||
| return err // we want the user to see the error message without a prefix | ||
| } | ||
| } | ||
|
|
@@ -885,23 +894,15 @@ func installExtensions(ctx context.Context, hcli helm.Client) error { | |
| return nil | ||
| } | ||
|
|
||
| func checkAirgapMatches(airgapInfo *kotsv1beta1.Airgap) error { | ||
| rel := release.GetChannelRelease() | ||
| if rel == nil { | ||
| return fmt.Errorf("airgap bundle provided but no release was found in binary, please rerun without the airgap-bundle flag") | ||
| } | ||
|
|
||
| appSlug := airgapInfo.Spec.AppSlug | ||
| channelID := airgapInfo.Spec.ChannelID | ||
| airgapVersion := airgapInfo.Spec.VersionLabel | ||
|
|
||
| // Check if the airgap bundle matches the application version data | ||
| if rel.AppSlug != appSlug { | ||
|
|
@@ -1047,7 +1048,7 @@ func waitForNode(ctx context.Context) error { | |
| } | ||
|
|
||
| func recordInstallation( | ||
| ctx context.Context, kcli client.Client, flags InstallCmdFlags, rc runtimeconfig.RuntimeConfig, license *kotsv1beta1.License, airgapInfo *kotsv1beta1.Airgap, | ||
| ) (*ecv1beta1.Installation, error) { | ||
| // get the embedded cluster config | ||
| cfg := release.GetEmbeddedClusterConfig() | ||
|
|
@@ -1062,14 +1063,21 @@ func recordInstallation( | |
| return nil, fmt.Errorf("process overrides file: %w", err) | ||
| } | ||
|
|
||
| // extract airgap uncompressed size if airgap info is provided | ||
| var airgapUncompressedSize int64 | ||
| if airgapInfo != nil { | ||
| airgapUncompressedSize = airgapInfo.Spec.UncompressedSize | ||
| } | ||
|
|
||
| // record the installation | ||
| installation, err := kubeutils.RecordInstallation(ctx, kcli, kubeutils.RecordInstallationOptions{ | ||
| IsAirgap: flags.isAirgap, | ||
| License: license, | ||
| ConfigSpec: cfgspec, | ||
| MetricsBaseURL: replicatedAppURL(), | ||
| RuntimeConfig: rc.Get(), | ||
| EndUserConfig: eucfg, | ||
| AirgapUncompressedSize: airgapUncompressedSize, | ||
| }) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("record installation: %w", err) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
could we move this to the flag parsing code in preRunInstall so it is only run once and fails much earlier? Then make airgapInfo a property of InstallController like airgapBundle.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This method gets called by postInstallRunHostPreflights which is a http request served by the controller. At which point does
preRunInstallcome in?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
preRunInstall is called in the cli and stores properties for later use in the InstallCmdFlags struct. You can add an
airgapInfoproperty and pass this to the api server and store it as a property similar to airgapBundle on the API and InstallController structs.