chore: openshift-snc with disable-cluster-readiness flag export kubeconfig

Previously we introduced the disable-cluster-readiness to allow early access to the cluster, within that commit we hide the kubeconfig export when the flag was enable, actually it can be exported no matter the value of the flag. This commit enables it. Fixes #719.

Signed-off-by: Adrian Riobo <ariobolo@redhat.com>

Author: adrianriobo

cmd/mapt/cmd/aws/hosts/rhelai.go

@@ -4,7 +4,7 @@ import (
 	"github.com/redhat-developer/mapt/cmd/mapt/cmd/params"
 	maptContext "github.com/redhat-developer/mapt/pkg/manager/context"
 	rhelai "github.com/redhat-developer/mapt/pkg/provider/aws/action/rhel-ai"
-	apiRHELAI "github.com/redhat-developer/mapt/pkg/targets/host/rhelai"
+	apiRHELAI "github.com/redhat-developer/mapt/pkg/target/host/rhelai"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 	"github.com/spf13/viper"

cmd/mapt/cmd/aws/services/kind.go

@@ -6,7 +6,7 @@ import (
 	"github.com/redhat-developer/mapt/cmd/mapt/cmd/params"
 	maptContext "github.com/redhat-developer/mapt/pkg/manager/context"
 	"github.com/redhat-developer/mapt/pkg/provider/aws/action/kind"
-	kindApi "github.com/redhat-developer/mapt/pkg/targets/service/kind"
+	kindApi "github.com/redhat-developer/mapt/pkg/target/service/kind"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 	"github.com/spf13/viper"

…d/mapt/cmd/aws/services/openshift-snc.go cmd/mapt/cmd/aws/services/snc.gocmd/mapt/cmd/aws/services/openshift-snc.go renamed to cmd/mapt/cmd/aws/services/snc.go cmd/mapt/cmd/aws/services/openshift-snc.go renamed to cmd/mapt/cmd/aws/services/snc.go

@@ -3,7 +3,8 @@ package services
 import (
 	params "github.com/redhat-developer/mapt/cmd/mapt/cmd/params"
 	maptContext "github.com/redhat-developer/mapt/pkg/manager/context"
-	openshiftsnc "github.com/redhat-developer/mapt/pkg/provider/aws/action/openshift-snc"
+	openshiftsnc "github.com/redhat-developer/mapt/pkg/provider/aws/action/snc"
+	sncApi "github.com/redhat-developer/mapt/pkg/target/service/snc"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 	"github.com/spf13/viper"
@@ -13,8 +14,10 @@ const (
 	cmdOpenshiftSNC     = "openshift-snc"
 	cmdOpenshiftSNCDesc = "Manage an OpenShift Single Node Cluster based on OpenShift Local. This is not intended for production use"
 
-	ocpVersion                  = "version"
-	ocpVersionDesc              = "version for Openshift. If not set it will pick latest available version"
+	ocpVersion        = "version"
+	ocpDefaultVersion = "4.21.0"
+	ocpVersionDesc    = "version for Openshift."
+
 	pullSecretFile              = "pull-secret-file"
 	pullSecretFileDesc          = "file path of image pull secret (download from https://console.redhat.com/openshift/create/local)"
 	disableClusterReadiness     = "disable-cluster-readiness"
@@ -58,7 +61,7 @@ func createSNC() *cobra.Command {
 					DebugLevel:    viper.GetUint(params.DebugLevel),
 					Tags:          viper.GetStringMapString(params.Tags),
 				},
-				&openshiftsnc.OpenshiftSNCArgs{
+				&sncApi.SNCArgs{
 					ComputeRequest:          params.ComputeRequestArgs(),
 					Spot:                    params.SpotArgs(),
 					Version:                 viper.GetString(ocpVersion),
@@ -73,7 +76,7 @@ func createSNC() *cobra.Command {
 	}
 	flagSet := pflag.NewFlagSet(params.CreateCmdName, pflag.ExitOnError)
 	flagSet.StringP(params.ConnectionDetailsOutput, "", "", params.ConnectionDetailsOutputDesc)
-	flagSet.StringP(ocpVersion, "", "", ocpVersionDesc)
+	flagSet.StringP(ocpVersion, "", ocpDefaultVersion, ocpVersionDesc)
 	flagSet.Bool(disableClusterReadiness, false, disableClusterReadinessDesc)
 	flagSet.StringP(params.LinuxArch, "", params.LinuxArchDefault, params.LinuxArchDesc)
 	flagSet.StringP(pullSecretFile, "", "", pullSecretFileDesc)

cmd/mapt/cmd/azure/hosts/rhelai.go

@@ -4,7 +4,7 @@ import (
 	"github.com/redhat-developer/mapt/cmd/mapt/cmd/params"
 	maptContext "github.com/redhat-developer/mapt/pkg/manager/context"
 	rhelai "github.com/redhat-developer/mapt/pkg/provider/azure/action/rhel-ai"
-	apiRHELAI "github.com/redhat-developer/mapt/pkg/targets/host/rhelai"
+	apiRHELAI "github.com/redhat-developer/mapt/pkg/target/host/rhelai"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 	"github.com/spf13/viper"

cmd/mapt/cmd/azure/services/kind.go

@@ -7,7 +7,7 @@ import (
 	"github.com/redhat-developer/mapt/cmd/mapt/cmd/params"
 	maptContext "github.com/redhat-developer/mapt/pkg/manager/context"
 	"github.com/redhat-developer/mapt/pkg/provider/azure/action/kind"
-	kindApi "github.com/redhat-developer/mapt/pkg/targets/service/kind"
+	kindApi "github.com/redhat-developer/mapt/pkg/target/service/kind"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 	"github.com/spf13/viper"

pkg/provider/aws/action/openshift-snc/constants.go

@@ -0,0 +1,22 @@
+package openshiftsnc
+
+import "fmt"
+
+var (
+	diskSize int = 200
+
+	// This is managed by https://github.com/devtools-qe-incubator/cloud-importer
+	amiProduct = "Linux/UNIX"
+	// amiProductDescription = "Red Hat Enterprise Linux"
+	amiRegex       = "openshift-local-%s-%s-*"
+	amiUserDefault = "core"
+	amiOwner       = "391597328979"
+	// amiOriginRegion       = "us-east-1"
+
+	// SSM
+	ocpPullSecretID = "ocppullsecretid"
+	kapass          = "kapass"
+	devpass         = "devpass"
+)
+
+func amiName(version, arch *string) string { return fmt.Sprintf(amiRegex, *version, *arch) }

pkg/provider/aws/action/snc/constants.go

@@ -0,0 +1,5 @@
+package openshiftsnc
+
+// This is the AWS policy required to use SSM service in order to set the values
+// within userdata
+var requiredPolicies = []string{"arn:aws:iam::aws:policy/AmazonSSMManagedInstanceCore"}