improve registry handling

Author: mms-gianni

cmd/kuberoCli/install.go

@@ -62,6 +62,8 @@ required binaries:
 		case "monitoring":
 			installMonitoring()
 			return
+		case "buildpacks":
+			installKpack()
 		case "kubernetes":
 			installKubernetes()
 			checkCluster()
@@ -76,6 +78,7 @@ required binaries:
 			installCertManager()
 			installKuberoOperator()
 			installMonitoring()
+			installKpack()
 			installKuberoUi()
 			writeCLIconfig()
 			printDNSinfo()
@@ -103,7 +106,7 @@ var ingressControllerVersion = "v1.10.0" // https://github.com/kubernetes/ingres
 var clusterTypeList = []string{"kind", "linode", "scaleway", "gke", "digitalocean"}
 
 func init() {
-	installCmd.Flags().StringVarP(&arg_component, "component", "c", "", "install component (kubernetes,olm,ingress,metrics,certmanager,kubero-operator,monitoring,kubero-ui)")
+	installCmd.Flags().StringVarP(&arg_component, "component", "c", "", "install component (kubernetes,olm,ingress,metrics,certmanager,kubero-operator,monitoring,buildpacks,kubero-ui)")
 	installCmd.Flags().StringVarP(&arg_adminUser, "user", "u", "", "Admin username for the kubero UI")
 	installCmd.Flags().StringVarP(&arg_adminPassword, "user-password", "U", "", "Password for the admin user")
 	installCmd.Flags().StringVarP(&arg_apiToken, "apitoken", "a", "", "API token for the admin user")
@@ -324,14 +327,37 @@ func installOLM() {
 	olmWaitCatalogSpinner.Success("OLM Catalog is ready")
 }
 
+func installKpack() {
+
+	kpackInstalled, _ := exec.Command("kubectl", "get", "crd", "builds.kpack.io").Output()
+	if len(kpackInstalled) > 0 {
+		cfmt.Println("{{✓ Kpack is allredy installed}}::lightGreen")
+		return
+	}
+
+	kpackInstall := promptLine("8) Install Kpack for buildpacks.io", "[y,n]", "y")
+	if kpackInstall != "y" {
+		return
+	}
+
+	components := "https://github.com/buildpacks-community/kpack/releases/download/v0.13.3/release-0.13.3.yaml"
+	_, installErr := exec.Command("kubectl", "apply", "-f", components).Output()
+
+	if installErr != nil {
+		fmt.Println("failed to install kpack")
+		log.Fatal(installErr)
+	}
+	cfmt.Println("{{✓ Kpack Operator installed}}::lightGreen")
+}
+
 func installMetrics() {
 
 	installed, _ := exec.Command("kubectl", "get", "deployments.apps", "metrics-server", "-n", "kube-system").Output()
 	if len(installed) > 0 {
 		cfmt.Println("{{✓ Metrics is allredy enabled}}::lightGreen")
 		return
 	}
-	install := promptLine("4) Install Kubernetes internal metrics service (required for HPA and stats)", "[y,n]", "y")
+	install := promptLine("4) Install Kubernetes internal metrics service (required for HPA, Horizontal Pod Autoscaling)", "[y,n]", "y")
 	if install != "y" {
 		return
 	}
@@ -480,7 +506,7 @@ func createNamespace(namespace string) {
 
 func installKuberoUi() {
 
-	ingressInstall := promptLine("7) Install Kubero UI", "[y,n]", "y")
+	ingressInstall := promptLine("9) Install Kubero UI", "[y,n]", "y")
 	if ingressInstall != "y" {
 		return
 	}
@@ -626,20 +652,23 @@ func installKuberoUi() {
 			kuberoUIConfig.Spec.Registry.Enabled = true
 
 			kuberoUICreateRegistry := promptLine("Create a local Registry for Kubero", "[y/n]", "n")
-
 			if kuberoUICreateRegistry == "y" {
 				kuberoUIConfig.Spec.Registry.Create = true
-				kuberoUIConfig.Spec.Registry.Host = "registry.local.kubero.net" // registry.local.kubero.net points to localhost 127.0.0.1
-				kuberoUIConfig.Spec.Registry.Port = 80
-			} else {
 
-				kuberoUIRegistryPort := promptLine("Registry port", "", "443")
-				kuberoUIConfig.Spec.Registry.Port, _ = strconv.Atoi(kuberoUIRegistryPort)
+				kuberoUIRegistryStorage := promptLine("Registry storage size", "", "10Gi")
+				kuberoUIConfig.Spec.Registry.Storage = kuberoUIRegistryStorage
+
+				storageClassList := getAvailableStorageClasses()
 
-				kuberoUIRegistryHost := promptLine("Registry domain", "", "registry.yourdomain.com")
-				kuberoUIConfig.Spec.Registry.Host = kuberoUIRegistryHost
+				kuberoUIRegistryStorageClassName := selectFromList("Registry storage class", storageClassList, "")
+				kuberoUIConfig.Spec.Registry.StorageClassName = kuberoUIRegistryStorageClassName
 			}
 
+			kuberoUIRegistryHost := promptLine("Registry domain", "", "")
+			kuberoUIConfig.Spec.Registry.Host = kuberoUIRegistryHost
+			kuberoUIRegistryPort := promptLine("Registry port", "", "443")
+			kuberoUIConfig.Spec.Registry.Port, _ = strconv.Atoi(kuberoUIRegistryPort)
+
 			kuberoUIRegistryUsername := promptLine("Registry username", "", "admin")
 			kuberoUIConfig.Spec.Registry.Account.Username = kuberoUIRegistryUsername
 
@@ -648,14 +677,6 @@ func installKuberoUi() {
 
 			kuberoUIRegistryPasswordBytes, _ := bcrypt.GenerateFromPassword([]byte(kuberoUIRegistryPassword), 14)
 			kuberoUIConfig.Spec.Registry.Account.Hash = string(kuberoUIRegistryPasswordBytes)
-
-			kuberoUIRegistryStorage := promptLine("Registry storage size", "", "10Gi")
-			kuberoUIConfig.Spec.Registry.Storage = kuberoUIRegistryStorage
-
-			storageClassList := getAvailableStorageClasses()
-
-			kuberoUIRegistryStorageClassName := selectFromList("Registry storage class", storageClassList, "")
-			kuberoUIConfig.Spec.Registry.StorageClassName = kuberoUIRegistryStorageClassName
 		}
 
 		kuberoUIAudit := promptLine("Enable Audit Logging", "[y/n]", "n")
@@ -742,7 +763,7 @@ func installKuberoUi() {
 
 func installMonitoring() {
 
-	if promptLine("Enable longterm metrics", "[y/n]", "y") == "y" {
+	if promptLine("7) Enable longterm metrics", "[y/n]", "y") == "y" {
 		monitoringInstalled = true
 	} else {
 		monitoringInstalled = false
@@ -752,7 +773,7 @@ func installMonitoring() {
 	createNamespace("kubero")
 
 	spinner := spinner.New("enable metrics")
-	if promptLine("Create local Prometheus instance", "[y/n]", "y") == "y" {
+	if promptLine("7.1) Create local Prometheus instance", "[y/n]", "y") == "y" {
 		URL := "https://raw.githubusercontent.com/kubero-dev/kubero-operator/main/config/samples/application_v1alpha1_kuberoprometheus.yaml"
 		cfmt.Println("  run command : kubectl apply -f " + URL)
 		spinner.Start("Installing Prometheus")
@@ -774,7 +795,7 @@ func installMonitoring() {
 		spinner.Success("Prometheus installed sucessfully")
 	}
 
-	if promptLine("Enable Kubemetrtics", "[y/n]", "y") == "y" {
+	if promptLine("7.2) Enable Kubemetrtics", "[y/n]", "y") == "y" {
 		cfmt.Println("  run command : kubectl patch kuberoes kubero -n kubero --type=merge")
 		spinner.Start("Enabling Metrics")
 
@@ -919,10 +940,10 @@ func installCertManagerClusterissuer(namespace string) {
 	var certmanagerClusterIssuer CertmanagerClusterIssuer
 	yaml.Unmarshal(kf.Body(), &certmanagerClusterIssuer)
 
-	arg_certmanagerContact := promptLine("Letsencrypt ACME contact email", "", "[email protected]")
+	arg_certmanagerContact := promptLine("5.1) Letsencrypt ACME contact email", "", "[email protected]")
 	certmanagerClusterIssuer.Spec.Acme.Email = arg_certmanagerContact
 
-	clusterissuer := promptLine("Clusterissuer Name", "", "letsencrypt-prod")
+	clusterissuer := promptLine("5.2) Clusterissuer Name", "", "letsencrypt-prod")
 	certmanagerClusterIssuer.Metadata.Name = clusterissuer
 
 	certmanagerClusterIssuerYaml, _ := yaml.Marshal(certmanagerClusterIssuer)
@@ -984,7 +1005,7 @@ func installOLMCertManager() {
 
 func writeCLIconfig() {
 
-	ingressInstall := promptLine("8) Write the Kubero CLI config", "[y,n]", "n")
+	ingressInstall := promptLine("10) Write the Kubero CLI config", "[y,n]", "n")
 	if ingressInstall != "y" {
 		return
 	}
@@ -1042,16 +1063,19 @@ func finalMessage() {
     https://docs.kubero.dev
     `)
 
-	if arg_domain != "" && arg_port != "" && arg_apiToken != "" && arg_adminPassword != "" {
-		cfmt.Println(`
+	protocol := "https"
+	if arg_port == "80" {
+		protocol = "http"
+	}
+	cfmt.Println(`
     Your Kubero UI :{{
-    URL : ` + arg_domain + `:` + arg_port + `
+    URL : ` + protocol + "://" + arg_domain + ":" + arg_port + `
     User: ` + arg_adminUser + `
     Pass: ` + arg_adminPassword + `}}::lightBlue
 	`)
-	} else {
-		cfmt.Println("\n\n    {{Done - you can now login to your Kubero UI}}::lightGreen\n\n ")
-	}
+
+	cfmt.Println("\n\n    {{Done - you can now login to your Kubero UI}}::lightGreen\n\n ")
+
 }
 
 func generateRandomString(length int, chars string) string {

cmd/kuberoCli/tunnel.go

@@ -76,9 +76,9 @@ func startTunnel() {
 		os.Exit(1)
 	}
 	cfmt.Println()
-	cfmt.Println("  Endpoint IP      : {{" + ipres.String() + "}}::cyan")
-	cfmt.Println("  Destination Host : {{" + tunnelHost + "}}::cyan")
-	cfmt.Println("  Destination Port : {{" + strconv.Itoa(tunnelPort) + "}}::cyan\n\n")
+	cfmt.Println("  Endpoint IP (Tunnel Password) : {{" + ipres.String() + "}}::cyan")
+	cfmt.Println("  Destination Host              : {{" + tunnelHost + "}}::cyan")
+	cfmt.Println("  Destination Port              : {{" + strconv.Itoa(tunnelPort) + "}}::cyan\n\n")
 
 	spinner := spinner.New()
 	spinner.Start("Waiting for tunnel to be ready")