Skip to content

Commit

Permalink
update install command
Browse files Browse the repository at this point in the history
  • Loading branch information
@nitisht
nitisht committed Dec 16, 2024
1 parent 344cb2d commit 36cb6a1
Show file tree
Hide file tree
Showing 3 changed files with 59 additions and 128 deletions.
23 changes: 11 additions & 12 deletions cmd/installer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,20 @@ import (
"net"
"os"
"os/exec"
"pb/pkg/common"
"pb/pkg/helm"
"pb/pkg/installer"
"runtime"
"strings"
"sync"
"time"

"pb/pkg/common"
"pb/pkg/helm"
"pb/pkg/installer"

"github.com/briandowns/spinner"
"github.com/spf13/cobra"
)

var (
verbose bool
)
var verbose bool

var InstallOssCmd = &cobra.Command{
Use: "oss",
Expand All @@ -40,10 +39,12 @@ var InstallOssCmd = &cobra.Command{
return err
}

fmt.Println(common.Green + "You selected the following plan:" + common.Reset)
fmt.Printf(common.Cyan+"Plan: %s\n"+common.Yellow+"Ingestion Speed: %s\n"+common.Green+"Per Day Ingestion: %s\n"+
common.Blue+"Query Performance: %s\n"+common.Red+"CPU & Memory: %s\n"+common.Reset,
selectedPlan.Name, selectedPlan.IngestionSpeed, selectedPlan.PerDayIngestion,
fmt.Printf(
common.Cyan+" Ingestion Speed: %s\n"+
common.Cyan+" Per Day Ingestion: %s\n"+
common.Cyan+" Query Performance: %s\n"+
common.Cyan+" CPU & Memory: %s\n"+
common.Reset, selectedPlan.IngestionSpeed, selectedPlan.PerDayIngestion,
selectedPlan.QueryPerformance, selectedPlan.CPUAndMemorySpecs)

// Get namespace and chart values from installer
Expand Down Expand Up @@ -95,7 +96,6 @@ var InstallOssCmd = &cobra.Command{
// Stop the spinner and restore stdout
spinner.Stop()
if !verbose {
//w.Close()
os.Stdout = oldStdout
}

Expand Down Expand Up @@ -164,7 +164,6 @@ func printSuccessBanner(namespace, deployment, version, username, password strin
localURL := fmt.Sprintf("http://localhost:%s/login?q=%s", localPort, base64EncodedString)
fmt.Printf(common.Green+"Opening Parseable UI at %s\n"+common.Reset, localURL)
openBrowser(localURL)

}

func createDeploymentSpinner(namespace string) *spinner.Spinner {
Expand Down
147 changes: 39 additions & 108 deletions pkg/installer/installer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ import (
"log"
"os"
"path/filepath"
"pb/pkg/common"
"strings"

"pb/pkg/common"

"github.com/manifoldco/promptui"
yamlv2 "gopkg.in/yaml.v2"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand All @@ -27,19 +28,13 @@ import (

// Installer orchestrates the installation process
func Installer(_ Plan) (values *ValuesHolder, chartValues []string) {

clusterName, err := promptK8sContext()
if err != nil {
if _, err := promptK8sContext(); err != nil {
log.Fatalf("Failed to prompt for kubernetes context: %v", err)
}

fmt.Printf(common.Yellow+"Kubernetes context set to cluster name %s: "+common.Reset+"\n", clusterName)

// Prompt for deployment options
deployment, deployValues, err := promptDeploymentType(chartValues)
if err != nil {
log.Fatalf("Failed to prompt for deployment options: %v", err)
}
// pb supports only distributed deployments
deployment := "distributed"
chartValues = append(chartValues, "parseable.highAvailability.enabled=true")

// Prompt for namespace and credentials
pbSecret, err := promptNamespaceAndCredentials()
Expand All @@ -48,7 +43,7 @@ func Installer(_ Plan) (values *ValuesHolder, chartValues []string) {
}

// Prompt for agent deployment
agent, agentValues, err := promptAgentDeployment(deployValues, deployment, pbSecret.Namespace)
agent, agentValues, err := promptAgentDeployment(chartValues, deployment, pbSecret.Namespace)
if err != nil {
log.Fatalf("Failed to prompt for agent deployment: %v", err)
}
Expand Down Expand Up @@ -103,26 +98,6 @@ func promptStorageClass() (string, error) {
return storageClass, nil
}

// promptIngestorCount prompts the user to enter a ingestor counts
// func promptIngestorCount() (string, error) {
// // Prompt user for storage class
// fmt.Print(common.Yellow + "Enter the kubernetes ingestor count: " + common.Reset)
// reader := bufio.NewReader(os.Stdin)
// ingestorCount, err := reader.ReadString('\n')
// if err != nil {
// return "", fmt.Errorf("failed to read ingestor count class: %w", err)
// }

// ingestorCount = strings.TrimSpace(ingestorCount)

// // Validate that the ingestorCount is not empty
// if ingestorCount == "" {
// return "", fmt.Errorf("ingestor count cannot be empty")
// }

// return ingestorCount, nil
// }

// promptNamespaceAndCredentials prompts the user for namespace and credentials
func promptNamespaceAndCredentials() (*ParseableSecret, error) {
// Prompt user for namespace
Expand Down Expand Up @@ -159,7 +134,6 @@ func promptNamespaceAndCredentials() (*ParseableSecret, error) {

// applyParseableSecret creates and applies the Kubernetes secret
func applyParseableSecret(ps *ParseableSecret, store ObjectStore, objectStoreConfig ObjectStoreConfig) error {

var secretManifest string
if store == LocalStore {
secretManifest = getParseableSecretLocal(ps)
Expand All @@ -181,7 +155,6 @@ func applyParseableSecret(ps *ParseableSecret, store ObjectStore, objectStoreCon
}

func getParseableSecretBlob(ps *ParseableSecret, objectStore ObjectStoreConfig) string {

// Create the Secret manifest
secretManifest := fmt.Sprintf(`
apiVersion: v1
Expand Down Expand Up @@ -217,7 +190,6 @@ data:
}

func getParseableSecretS3(ps *ParseableSecret, objectStore ObjectStoreConfig) string {

// Create the Secret manifest
secretManifest := fmt.Sprintf(`
apiVersion: v1
Expand Down Expand Up @@ -254,7 +226,6 @@ data:
}

func getParseableSecretGcs(ps *ParseableSecret, objectStore ObjectStoreConfig) string {

// Create the Secret manifest
secretManifest := fmt.Sprintf(`
apiVersion: v1
Expand Down Expand Up @@ -291,7 +262,6 @@ data:
}

func getParseableSecretLocal(ps *ParseableSecret) string {

// Create the Secret manifest
secretManifest := fmt.Sprintf(`
apiVersion: v1
Expand Down Expand Up @@ -322,8 +292,13 @@ data:
func promptAgentDeployment(chartValues []string, deployment, namespace string) (string, []string, error) {
// Prompt for Agent Deployment type
promptAgentSelect := promptui.Select{
Label: fmt.Sprintf(common.Yellow + "Deploy logging agent"),
Items: []string{string(fluentbit), string(vector), "I have my agent running / I'll set up later"},
Templates: &promptui.SelectTemplates{
Label: "{{ `Logging agent` | yellow }}",
Active: "▸ {{ . | yellow }} ", // Yellow arrow and context name for active selection
Inactive: " {{ . | yellow }}", // Default color for inactive items
Selected: "{{ `Selected option:` | green }} '{{ . | green }}' ✔ ",
},
}
_, agentDeploymentType, err := promptAgentSelect.Run()
if err != nil {
Expand All @@ -344,44 +319,16 @@ func promptAgentDeployment(chartValues []string, deployment, namespace string) (
return agentDeploymentType, chartValues, nil
}

// promptDeploy prompts the user for deployment options
func promptDeploymentType(chartValues []string) (string, []string, error) {
// Prompt for Deployment Type
promptDeploy := promptui.Select{
Label: fmt.Sprintf(common.Yellow + "Select deployment type"),
Items: []string{string(standalone), string(distributed)},
}
_, deploymentType, err := promptDeploy.Run()
if err != nil {
return "", nil, fmt.Errorf("failed to prompt for deployment type: %w", err)
}

var newChartValues []string
switch deploymentType {
case string(standalone):
newChartValues = []string{}
case string(distributed):
// ingestorCount, err := promptIngestorCount()
// if err != nil {
// return "", nil, fmt.Errorf("failed get ingestor count, err %s", err)
// }
newChartValues = []string{
"parseable.highAvailability.enabled=true",
// "parseable.highAvailability.ingestor=" + ingestorCount,
}
default:
return "", nil, fmt.Errorf("invalid deployment type selected: %s", deploymentType)
}

chartValues = append(chartValues, newChartValues...)
return deploymentType, chartValues, nil
}

// promptStore prompts the user for object store options
func promptStore(chartValues []string) (ObjectStore, []string, error) {
// Prompt for store type
promptStore := promptui.Select{
Label: "Select Object Store",
Templates: &promptui.SelectTemplates{
Label: "{{ `Object store` | yellow }}",
Active: "▸ {{ . | yellow }} ", // Yellow arrow and context name for active selection
Inactive: " {{ . | yellow }}", // Default color for inactive items
Selected: "{{ `Selected object store:` | green }} '{{ . | green }}' ✔ ",
},
Items: []string{string(S3Store), string(LocalStore), string(BlobStore), string(GcsStore)},
}
_, promptStoreType, err := promptStore.Run()
Expand All @@ -402,17 +349,17 @@ func promptStoreConfigs(store ObjectStore, chartValues []string) (ObjectStoreCon
// Initialize a struct to hold store values
var storeValues ObjectStoreConfig

// Store selected store type in chart values
fmt.Println(common.Green + "Configuring:" + common.Reset + " " + store)

// Store selected store type in chart values
switch store {
case S3Store:
fmt.Println(common.Green + "Configuring s3 store..." + common.Reset)
storeValues.S3Store = S3{
URL: promptForInput(common.Yellow + "Enter S3 URL: " + common.Reset),
AccessKey: promptForInput(common.Yellow + "Enter S3 Access Key: " + common.Reset),
SecretKey: promptForInput(common.Yellow + "Enter S3 Secret Key: " + common.Reset),
Bucket: promptForInput(common.Yellow + "Enter S3 Bucket: " + common.Reset),
Region: promptForInput(common.Yellow + "Enter S3 Region: " + common.Reset),
URL: promptForInput(common.Yellow + " Enter S3 URL: " + common.Reset),
AccessKey: promptForInput(common.Yellow + " Enter S3 Access Key: " + common.Reset),
SecretKey: promptForInput(common.Yellow + " Enter S3 Secret Key: " + common.Reset),
Bucket: promptForInput(common.Yellow + " Enter S3 Bucket: " + common.Reset),
Region: promptForInput(common.Yellow + " Enter S3 Region: " + common.Reset),
}
sc, err := promptStorageClass()
if err != nil {
Expand All @@ -424,30 +371,15 @@ func promptStoreConfigs(store ObjectStore, chartValues []string) (ObjectStoreCon
chartValues = append(chartValues, "parseable.s3ModeSecret.enabled=true")
chartValues = append(chartValues, "parseable.persistence.staging.enabled=true")
chartValues = append(chartValues, "parseable.persistence.staging.storageClass="+sc)
return storeValues, chartValues, nil
case LocalStore:
fmt.Println(common.Green + "Configuring local store..." + common.Reset)
sc, err := promptStorageClass()
if err != nil {
log.Fatalf("Failed to prompt for storage class: %v", err)
}
storeValues.StorageClass = sc
storeValues.ObjectStore = LocalStore
chartValues = append(chartValues, "parseable.store="+string(LocalStore))
chartValues = append(chartValues, "parseable.localModeSecret.enabled=true")
chartValues = append(chartValues, "parseable.persistence.staging.enabled=true")
chartValues = append(chartValues, "parseable.persistence.staging.storageClass="+sc)

return storeValues, chartValues, nil
case BlobStore:
fmt.Println(common.Green + "Configuring blob store..." + common.Reset)
sc, err := promptStorageClass()
if err != nil {
log.Fatalf("Failed to prompt for storage class: %v", err)
}
storeValues.BlobStore = Blob{
URL: promptForInput(common.Yellow + "Enter Blob URL: " + common.Reset),
Container: promptForInput(common.Yellow + "Enter Blob Container: " + common.Reset),
URL: promptForInput(common.Yellow + " Enter Blob URL: " + common.Reset),
Container: promptForInput(common.Yellow + " Enter Blob Container: " + common.Reset),
}
storeValues.StorageClass = sc
storeValues.ObjectStore = BlobStore
Expand All @@ -457,17 +389,16 @@ func promptStoreConfigs(store ObjectStore, chartValues []string) (ObjectStoreCon
chartValues = append(chartValues, "parseable.persistence.staging.storageClass="+sc)
return storeValues, chartValues, nil
case GcsStore:
fmt.Println(common.Green + "Configuring gcs store..." + common.Reset)
sc, err := promptStorageClass()
if err != nil {
log.Fatalf("Failed to prompt for storage class: %v", err)
}
storeValues.GCSStore = GCS{
URL: promptForInput(common.Yellow + "Enter GCS URL: " + common.Reset),
AccessKey: promptForInput(common.Yellow + "Enter GCS Access Key: " + common.Reset),
SecretKey: promptForInput(common.Yellow + "Enter GCS Secret Key: " + common.Reset),
Bucket: promptForInput(common.Yellow + "Enter GCS Bucket: " + common.Reset),
Region: promptForInput(common.Yellow + "Enter GCS Region: " + common.Reset),
URL: promptForInput(common.Yellow + " Enter GCS URL: " + common.Reset),
AccessKey: promptForInput(common.Yellow + " Enter GCS Access Key: " + common.Reset),
SecretKey: promptForInput(common.Yellow + " Enter GCS Secret Key: " + common.Reset),
Bucket: promptForInput(common.Yellow + " Enter GCS Bucket: " + common.Reset),
Region: promptForInput(common.Yellow + " Enter GCS Region: " + common.Reset),
}
storeValues.StorageClass = sc
storeValues.ObjectStore = GcsStore
Expand Down Expand Up @@ -585,7 +516,7 @@ func promptForInput(label string) string {
func writeParseableConfig(valuesHolder *ValuesHolder) error {
// Create config directory
configDir := filepath.Join(os.Getenv("HOME"), ".parseable")
if err := os.MkdirAll(configDir, 0755); err != nil {
if err := os.MkdirAll(configDir, 0o755); err != nil {
return fmt.Errorf("failed to create config directory: %w", err)
}

Expand All @@ -599,7 +530,7 @@ func writeParseableConfig(valuesHolder *ValuesHolder) error {
}

// Write config file
if err := os.WriteFile(configPath, configBytes, 0644); err != nil {
if err := os.WriteFile(configPath, configBytes, 0o644); err != nil {
return fmt.Errorf("failed to write config file: %w", err)
}

Expand Down Expand Up @@ -629,12 +560,12 @@ func promptK8sContext() (clusterName string, err error) {

// Prompt user to select Kubernetes context
promptK8s := promptui.Select{
Label: "\033[32mSelect your Kubernetes context:\033[0m",
Items: contexts,
Templates: &promptui.SelectTemplates{
Active: "\033[33m▸ {{ . }}\033[0m", // Yellow arrow and context name for active selection
Inactive: "{{ . }}", // Default color for inactive items
Selected: "\033[32mKubernetes context '{{ . }}' selected successfully.\033[0m",
Label: "{{ `Select your Kubernetes context` | yellow }}",
Active: "▸ {{ . | yellow }} ", // Yellow arrow and context name for active selection
Inactive: " {{ . | yellow }}", // Default color for inactive items
Selected: "{{ `Selected Kubernetes context:` | green }} '{{ . | green }}' ✔",
},
}

Expand Down
Loading

0 comments on commit 36cb6a1

Please sign in to comment.