From 3477e133fd8584e26a1584f6a310a4e8afb84484 Mon Sep 17 00:00:00 2001 From: Daishan Date: Mon, 9 Dec 2019 14:58:47 -0700 Subject: [PATCH] Add custom domain and certs in CLI --- cli/cmd/info/info.go | 11 +++++++++-- .../controllers/clusterdomain/controller.go | 1 + 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/cli/cmd/info/info.go b/cli/cmd/info/info.go index 25327b2c7..04587dc79 100644 --- a/cli/cmd/info/info.go +++ b/cli/cmd/info/info.go @@ -3,6 +3,7 @@ package info import ( "fmt" "sort" + "strconv" "strings" "github.com/rancher/rio/cli/pkg/clicontext" @@ -36,6 +37,12 @@ func info(ctx *clicontext.CLIContext) error { return fmt.Errorf("no system information is generated") } + var names []string + var certs []string + for _, cd := range clusterDomains.Items { + names = append(names, cd.Name) + certs = append(certs, fmt.Sprintf("%s(%s)", cd.Name, strconv.FormatBool(cd.Status.HTTPSSupported))) + } clusterDomain := clusterDomains.Items[0] var addresses []string @@ -45,10 +52,10 @@ func info(ctx *clicontext.CLIContext) error { builder.WriteString(fmt.Sprintf("Rio Version: %s (%s)\n", info.Status.Version, info.Status.GitCommit)) builder.WriteString(fmt.Sprintf("Rio CLI Version: %s (%s)\n", version.Version, version.GitCommit)) - builder.WriteString(fmt.Sprintf("Cluster Domain: %s\n", clusterDomain.Name)) + builder.WriteString(fmt.Sprintf("Cluster Domain: %v\n", strings.Join(names, ","))) builder.WriteString(fmt.Sprintf("Cluster Domain IPs: %s\n", strings.Join(addresses, ","))) builder.WriteString(fmt.Sprintf("System Namespace: %s\n", info.Status.SystemNamespace)) - builder.WriteString(fmt.Sprintf("Wildcard certificates: %v\n", clusterDomain.Status.HTTPSSupported)) + builder.WriteString(fmt.Sprintf("Wildcard certificates: %v\n", strings.Join(certs, ","))) var keys []string for k := range info.Status.SystemComponentReadyMap { diff --git a/modules/letsencrypt/controllers/clusterdomain/controller.go b/modules/letsencrypt/controllers/clusterdomain/controller.go index a0f0fb8c7..bf8d19df1 100644 --- a/modules/letsencrypt/controllers/clusterdomain/controller.go +++ b/modules/letsencrypt/controllers/clusterdomain/controller.go @@ -66,6 +66,7 @@ func (f *certsHandler) onCertChange(key string, obj *certmanagerv1alpha2.Certifi func (f *certsHandler) Handle(obj *v1.ClusterDomain, status v1.ClusterDomainStatus) ([]runtime.Object, v1.ClusterDomainStatus, error) { if obj.Spec.SecretName != "" { status.AssignedSecretName = obj.Spec.SecretName + status.HTTPSSupported = true return nil, status, nil }