diff --git a/cmd/installer/cli/install2.go b/cmd/installer/cli/install2.go index add68fe77..0f2120a03 100644 --- a/cmd/installer/cli/install2.go +++ b/cmd/installer/cli/install2.go @@ -183,6 +183,12 @@ func runInstall2(cmd *cobra.Command, args []string, name string, flags Install2C return err } + logrus.Debugf("copy license file to %s", flags.dataDir) + if err := copyLicenseFileToDataDir(flags.licenseFile, flags.dataDir); err != nil { + // We have decided not to report this error + logrus.Warnf("unable to copy license file to %s: %v", flags.dataDir, err) + } + logrus.Debugf("configuring sysctl") if err := configutils.ConfigureSysctl(); err != nil { return fmt.Errorf("unable to configure sysctl: %w", err) diff --git a/e2e/scripts/single-node-install2.sh b/e2e/scripts/single-node-install2.sh index f7551eca8..2d60d44e7 100755 --- a/e2e/scripts/single-node-install2.sh +++ b/e2e/scripts/single-node-install2.sh @@ -149,10 +149,9 @@ main() { exit 1 fi -# TODO: enable this once we cache the license in the data dir in install2 -# if ! ensure_license_in_data_dir; then -# exit 1 -# fi + if ! ensure_license_in_data_dir; then + exit 1 + fi echo "kotsadm logs" kubectl logs -n kotsadm -l app=kotsadm --tail=50 || true