Merge pull request #170 from kndpio/158-install-nginx-ingress-controller-by-default

158 install nginx ingress controller by default

Author: evghen1

cmd/kndp/environment/copy.go

@@ -9,10 +9,13 @@ import (
 )
 
 type copyCmd struct {
-	Source      string `arg:"" required:"" help:"Name source of environment."`
-	Destination string `arg:"" required:"" help:"Name destination of environment."`
+	Source       string `arg:"" required:"" help:"Name source of environment."`
+	Destination  string `arg:"" required:"" help:"Name destination of environment."`
+	SourceEngine string `arg:"" required:"" help:"Specifies the Kubernetes engine to use for the runtime environment." default:"kind"`
 }
 
 func (c *copyCmd) Run(ctx context.Context, logger *log.Logger) error {
-	return environment.CopyEnvironment(ctx, logger, c.Source, c.Destination)
+	return environment.
+		New(c.Source, c.Source).
+		CopyEnvironment(ctx, logger, c.Source, c.Destination)
 }

cmd/kndp/environment/create.go

@@ -8,12 +8,20 @@ import (
 )
 
 type createCmd struct {
-	Name     string `arg:"" requried:"" help:"Name of environment."`
-	HostPort int    `optional:"" short:"p" help:"Host port for mapping" default:"80"`
-	Context  string `optional:"" short:"c" help:"Kubernetes context where Environment will be created."`
-	Engine   string `optional:"" short:"e" help:"Specifies the Kubernetes engine to use for the runtime environment." default:"kind"`
+	Name              string `arg:"" requried:"" help:"Name of environment."`
+	HttpPort          int    `optional:"" short:"p" help:"Http host port for mapping" default:"80"`
+	HttpsPort         int    `optional:"" short:"s" help:"Https host port for mapping" default:"443"`
+	Context           string `optional:"" short:"c" help:"Kubernetes context where Environment will be created."`
+	Engine            string `optional:"" short:"e" help:"Specifies the Kubernetes engine to use for the runtime environment." default:"kind"`
+	IngressController string `optional:"" help:"Specifies the Ingress Controller type. (Default: nginx)" default:"nginx"`
 }
 
 func (c *createCmd) Run(ctx context.Context, logger *log.Logger) error {
-	return environment.Create(ctx, c.Engine, c.Name, c.HostPort, logger, c.Context)
+	return environment.
+		New(c.Engine, c.Name).
+		WithHttpPort(c.HttpPort).
+		WithHttpsPort(c.HttpsPort).
+		WithContext(c.Context).
+		WithIngressController(c.IngressController).
+		Create(ctx, logger)
 }

cmd/kndp/environment/delete.go

@@ -9,9 +9,11 @@ import (
 
 type deleteCmd struct {
 	Name   string `arg:"" required:"" help:"Name of environment."`
-	Engine string `arg:"" required:"" help:"Specifies the Kubernetes engine to use for the runtime environment." default:"kind"`
+	Engine string `optional:"" help:"Specifies the Kubernetes engine to use for the runtime environment." default:"kind"`
 }
 
 func (c *deleteCmd) Run(ctx context.Context, logger *log.Logger) error {
-	return environment.Delete(c.Engine, c.Name, logger)
+	return environment.
+		New(c.Engine, c.Name).
+		Delete(logger)
 }

cmd/kndp/environment/start.go

@@ -10,9 +10,11 @@ import (
 type startCmd struct {
 	Name   string `arg:"" required:"" help:"Name of environment."`
 	Switch bool   `optional:"" short:"s" help:"Switch kubernetes context to started cluster context."`
-	Engine string `arg:"" required:"" help:"Specifies the Kubernetes engine to use for the runtime environment." default:"kind"`
+	Engine string `optional:"" help:"Specifies the Kubernetes engine to use for the runtime environment." default:"kind"`
 }
 
 func (c *startCmd) Run(ctx context.Context, logger *log.Logger) error {
-	return environment.Start(ctx, c.Name, c.Switch, c.Engine, logger)
+	return environment.
+		New(c.Engine, c.Name).
+		Start(ctx, c.Switch, logger)
 }

cmd/kndp/environment/stop.go

@@ -8,9 +8,12 @@ import (
 )
 
 type stopCmd struct {
-	Name string `arg:"" required:"" help:"Name of environment."`
+	Name   string `arg:"" required:"" help:"Name of environment."`
+	Engine string `optional:"" help:"Specifies the Kubernetes engine to use for the runtime environment." default:"kind"`
 }
 
 func (c *stopCmd) Run(ctx context.Context, logger *log.Logger) error {
-	return environment.Stop(ctx, c.Name, logger)
+	return environment.
+		New(c.Engine, c.Name).
+		Stop(ctx, logger)
 }

cmd/kndp/environment/upgrade.go

@@ -8,11 +8,16 @@ import (
 )
 
 type upgradeCmd struct {
-	Name    string `arg:"" required:"" help:"Environment name where engine will be upgraded."`
-	Engine  string `arg:"" required:"" help:"Specifies the Kubernetes engine to use for the runtime environment." default:"kind"`
-	Context string `optional:"" short:"c" help:"Kubernetes context where Environment will be upgraded."`
+	Name              string `arg:"" required:"" help:"Environment name where engine will be upgraded."`
+	Engine            string `optional:"" help:"Specifies the Kubernetes engine to use for the runtime environment." default:"kind"`
+	Context           string `optional:"" short:"c" help:"Kubernetes context where Environment will be upgraded."`
+	IngressController string `optional:"" help:"Specifies the Ingress Controller type. (Default: nginx)" default:"nginx"`
 }
 
 func (c *upgradeCmd) Run(ctx context.Context, logger *log.Logger) error {
-	return environment.Upgrade(ctx, c.Engine, c.Name, logger, c.Context)
+	return environment.
+		New(c.Engine, c.Name).
+		WithContext(c.Context).
+		WithIngressController(c.IngressController).
+		Upgrade(ctx, logger)
 }

internal/engine/engine.go

@@ -22,6 +22,7 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/rest"
 
+	logger "github.com/charmbracelet/log"
 	corev1 "k8s.io/api/core/v1"
 	rbacv1 "k8s.io/api/rbac/v1"
 	extv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
@@ -102,7 +103,7 @@ func GetEngine(configClient *rest.Config) (install.Manager, error) {
 }
 
 // Install engine Helm release
-func InstallEngine(ctx context.Context, configClient *rest.Config, params map[string]any) error {
+func InstallEngine(ctx context.Context, configClient *rest.Config, params map[string]any, logger *logger.Logger) error {
 	engine, err := GetEngine(configClient)
 	if err != nil {
 		return err
@@ -111,13 +112,14 @@ func InstallEngine(ctx context.Context, configClient *rest.Config, params map[st
 	if params == nil {
 		params = initParameters
 	}
-
+	logger.Debug("Upgrade Crossplane release")
 	err = engine.Upgrade(Version, params)
 	if err != nil {
 		return err
 	}
+	logger.Debug("Done")
 
-	return SetupPrivilegedKubernetesProvider(ctx, configClient)
+	return SetupPrivilegedKubernetesProvider(ctx, configClient, logger)
 }
 
 // Check if engine release exists
@@ -157,7 +159,7 @@ func ManagedSelector(m map[string]string) string {
 }
 
 // Setup Kubernetes provider which has crossplane admin aggregation role assigned
-func SetupPrivilegedKubernetesProvider(ctx context.Context, configClient *rest.Config) error {
+func SetupPrivilegedKubernetesProvider(ctx context.Context, configClient *rest.Config, logger *logger.Logger) error {
 
 	pcn := providerConfigName
 
@@ -261,13 +263,13 @@ func SetupPrivilegedKubernetesProvider(ctx context.Context, configClient *rest.C
 		}); err != nil {
 		return err
 	}
+	logger.Debug("Starting reconciliation of Kubernetes Provider")
 	mgr.Start(mgrContext)
 	return nil
 }
 
 // Reconcile SvcAcc secret for make kubeconfig
 func (a *SecretReconciler) Reconcile(ctx context.Context, req reconcile.Request) (reconcile.Result, error) {
-
 	sec := &corev1.Secret{}
 	err := a.Get(ctx, req.NamespacedName, sec)
 	if err != nil {