move more setup to initializejoin func

Author: ajp-io

cmd/installer/cli/install.go

@@ -1290,7 +1290,7 @@ func printSuccessMessage(license *kotsv1beta1.License, networkInterface string)
 	divider := strings.Repeat("-", maxLength)
 
 	bold := "\033[1m"
-	logrus.Infof("\n%s%s\n%s\n%s%s%s", bold, divider, message, divider, resetFormatting)
+	logrus.Infof("\n%s%s\n%s\n%s%s", bold, divider, message, divider, resetFormatting)
 
 	return nil
 }

cmd/installer/cli/join.go

@@ -97,10 +97,6 @@ func preRunJoin(flags *JoinCmdFlags) error {
 
 	flags.isAirgap = flags.airgapBundle != ""
 
-	// set the umask to 022 so that we can create files/directories with 755 permissions
-	// this does not return an error - it returns the previous umask
-	_ = syscall.Umask(0o022)
-
 	return nil
 }
 
@@ -234,12 +230,6 @@ func runJoinVerifyAndPrompt(name string, flags JoinCmdFlags, jcmd *kotsadm.JoinC
 		return fmt.Errorf("unable to write runtime config: %w", err)
 	}
 
-	if err := os.Chmod(runtimeconfig.EmbeddedClusterHomeDirectory(), 0755); err != nil {
-		// don't fail as there are cases where we can't change the permissions (bind mounts, selinux, etc...),
-		// and we handle and surface those errors to the user later (host preflights, checking exec errors, etc...)
-		logrus.Debugf("unable to chmod embedded-cluster home dir: %s", err)
-	}
-
 	// check to make sure the version returned by the join token is the same as the one we are running
 	if strings.TrimPrefix(jcmd.EmbeddedClusterVersion, "v") != strings.TrimPrefix(versions.Version, "v") {
 		return fmt.Errorf("embedded cluster version mismatch - this binary is version %q, but the cluster is running version %q", versions.Version, jcmd.EmbeddedClusterVersion)
@@ -266,6 +256,16 @@ func initializeJoin(ctx context.Context, name string, flags JoinCmdFlags, jcmd *
 	spinner := spinner.Start()
 	spinner.Infof("Initializing")
 
+	// set the umask to 022 so that we can create files/directories with 755 permissions
+	// this does not return an error - it returns the previous umask
+	_ = syscall.Umask(0o022)
+
+	if err := os.Chmod(runtimeconfig.EmbeddedClusterHomeDirectory(), 0755); err != nil {
+		// don't fail as there are cases where we can't change the permissions (bind mounts, selinux, etc...),
+		// and we handle and surface those errors to the user later (host preflights, checking exec errors, etc...)
+		logrus.Debugf("unable to chmod embedded-cluster home dir: %s", err)
+	}
+
 	logrus.Debugf("materializing %s binaries", name)
 	if err := materializeFiles(flags.airgapBundle); err != nil {
 		spinner.Errorf("Initialization failed")