install agent

Author: zreigz

cmd/command/up/up.go

@@ -183,7 +183,7 @@ func (p *Plural) handleUp(c *cli.Context) error {
 	}
 
 	utils.Success("Finished setting up your management cluster!\n")
-	if byok {
+	if byok && cloud {
 		utils.Highlight("Since you're using BYOK, be sure to complete setup of your management cluster\n")
 		utils.Highlight("IMPORTANT: You'll need to configure IAM permissions for the plrl-deploy-operator/stacks service account.\n")
 		utils.Highlight("This is no longer handled automatically. See the terraform example in the docs for the required IAM policy.\n")

pkg/cd/control_plane_install.go

@@ -108,6 +108,10 @@ func ControlPlaneValues(conf config.Config, file, domain, dsn, name string) (str
 		"clusterIssuer": "plural",
 	}
 
+	if ingressClass := utils.ToString(prov.Context()["IngressClass"]); ingressClass != "" {
+		configuration["ingressClass"] = ingressClass
+	}
+
 	if existing.Secrets.AesKey != "" {
 		configuration["aesKey"] = existing.Secrets.AesKey
 	}

pkg/provider/byok.go

@@ -35,7 +35,7 @@ func ByokFromManifest(man *manifest.ProjectManifest) (*ByokProvider, error) {
 	return prov, nil
 }
 
-func mkBYOK(conf config.Config, name string, dryRun bool) (prov *ByokProvider, err error) {
+func mkBYOK(conf config.Config, name string, dryRun, cloud bool) (prov *ByokProvider, err error) {
 	prov = &ByokProvider{
 		ctx: map[string]interface{}{},
 	}
@@ -78,22 +78,31 @@ func mkBYOK(conf config.Config, name string, dryRun bool) (prov *ByokProvider, e
 	kubeconfigBase64 := base64.StdEncoding.EncodeToString(kubeconfigData)
 
 	prov.ctx["kubeconfig"] = kubeconfigBase64
-
-	var dbURL string
-	if err := survey.AskOne(&survey.Input{
-		Message: "Enter the database URL for the Plural console (leave empty to skip):",
-	}, &dbURL); err != nil {
-		return nil, err
-	}
-	prov.ctx["DbUrl"] = dbURL
-
 	projectManifest := manifest.ProjectManifest{
 		Cluster:  name,
 		Provider: api.BYOK,
 		Owner:    &manifest.Owner{Email: conf.Email, Endpoint: conf.Endpoint},
 		Context:  prov.Context(),
 	}
-	prov.writer = projectManifest.Configure(cloudFlag, prov.Cluster())
+	if !cloud {
+		var dbURL string
+		if err := survey.AskOne(&survey.Input{
+			Message: "Enter the jdbc connection string (postgres://<user>:<password>@<host>:5432/<db>) for the Plural console:",
+		}, &dbURL); err != nil {
+			return nil, err
+		}
+		prov.ctx["DbUrl"] = dbURL
+
+		var domain string
+		if err := survey.AskOne(&survey.Input{
+			Message: "Enter the domain you want to use for your Plural console:",
+		}, &domain); err != nil {
+			return nil, err
+		}
+
+		projectManifest.Network = &manifest.NetworkConfig{Subdomain: domain, PluralDns: false}
+	}
+	prov.writer = func() error { return projectManifest.Write(manifest.ProjectManifestPath()) }
 	return prov, nil
 }
 

pkg/provider/provider.go

@@ -88,7 +88,7 @@ func New(provider string) (providerapi.Provider, error) {
 	case api.ProviderAzure:
 		return mkAzure(conf, dryRunFlag)
 	case api.BYOK:
-		return mkBYOK(conf, clusterFlag, dryRunFlag)
+		return mkBYOK(conf, clusterFlag, dryRunFlag, cloudFlag)
 	default:
 		return nil, fmt.Errorf("invalid provider name: %s", provider)
 	}

pkg/up/deploy.go

@@ -260,6 +260,29 @@ func (ctx *Context) deployBYOK(commit func() error) error {
 		return err
 	}
 
+	subdomain := ctx.Manifest.Network.Subdomain
+	if err := waitForConsole(); err != nil {
+		return err
+	}
+
+	utils.Success("Console is up! Access it at https://console.%s\n", subdomain)
+
+	if err := ctx.runCheckpoint(ctx.Manifest.Checkpoint, "commit", func() error {
+		utils.Highlight("\nSetting up gitops management, first lets commit the changes made up to this point...\n\n")
+		return commit()
+	}); err != nil {
+		return err
+	}
+
+	if err := ctx.runCheckpoint(ctx.Manifest.Checkpoint, "apps", func() error {
+		return runAll([]terraformCmd{
+			{dir: "./terraform/mgmt", cmd: "apply", args: []string{"-auto-approve"}},
+			{dir: "./terraform/apps", cmd: "init", args: []string{"-upgrade"}},
+			{dir: "./terraform/apps", cmd: "apply", args: []string{"-auto-approve"}, retries: 1},
+		})
+	}); err != nil {
+		return err
+	}
+
 	return ctx.pruneBYOK()
 }
-

pkg/up/ping.go

@@ -8,7 +8,9 @@ import (
 
 	"github.com/likexian/doh"
 	"github.com/likexian/doh/dns"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
+	"github.com/pluralsh/plural-cli/pkg/kubernetes"
 	"github.com/pluralsh/plural-cli/pkg/utils"
 )
 
@@ -69,6 +71,35 @@ func ping(url string) error {
 	})
 }
 
+// waitForConsole polls until the console deployment in plrl-console has at least
+// one ready replica. This works on local/BYOK clusters where TLS or public DNS
+// is not available.
+func waitForConsole() error {
+	return retrier(
+		"Waiting for console deployment to become ready...\n",
+		"Console deployment is ready!\n",
+		func() error {
+			kube, err := kubernetes.Kubernetes()
+			if err != nil {
+				return err
+			}
+
+			deploy, err := kube.GetClient().AppsV1().Deployments("plrl-console").
+				Get(context.Background(), "console", metav1.GetOptions{})
+			if err != nil {
+				return err
+			}
+
+			if deploy.Status.ReadyReplicas > 0 {
+				return nil
+			}
+
+			return fmt.Errorf("console deployment not ready yet (%d/%d replicas ready)",
+				deploy.Status.ReadyReplicas, deploy.Status.Replicas)
+		},
+	)
+}
+
 func retrier(retryMsg, successMsg string, f func() error) error {
 	done := make(chan bool)
 	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute)

pkg/up/prune.go

@@ -73,21 +73,29 @@ func stateRm(dir, field string) error {
 	return cmd.Run()
 }
 
+// stateRmBestEffort is like stateRm but silently ignores the case where the
+// resource was never in state (e.g. install_prereqs=false skipped certmanager/flux).
+func stateRmBestEffort(dir, field string) {
+	_ = stateRm(dir, field)
+}
+
 // pruneBYOK removes the bootstrap helm/null resources from terraform state and
 // cleans up the one-shot files used during installation (no cloud infra to touch).
 func (ctx *Context) pruneBYOK() error {
 	return ctx.runCheckpoint(ctx.Manifest.Checkpoint, "prune:mgmt", func() error {
 		utils.Highlight("\nCleaning up unneeded resources...\n\n")
 
-		toRemove := []string{
+		// These may or may not be in state depending on install_prereqs value.
+		stateRmBestEffort("./terraform/mgmt", "helm_release.certmanager")
+		stateRmBestEffort("./terraform/mgmt", "helm_release.flux")
+
+		// These are always created for BYOK.
+		required := []string{
 			"null_resource.console",
-			"helm_release.certmanager",
-			"helm_release.flux",
 			"helm_release.runtime",
 			"helm_release.console",
 		}
-
-		for _, field := range toRemove {
+		for _, field := range required {
 			if err := stateRm("./terraform/mgmt", field); err != nil {
 				return err
 			}
@@ -104,4 +112,3 @@ func (ctx *Context) pruneBYOK() error {
 		return git.Sync(repoRoot, "Post-setup resource cleanup", true)
 	})
 }
-