philipp/uncloud
1
0
Fork 0
mirror of https://github.com/psviderski/uncloud.git synced 2026-08-26 19:13:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(dns): update DNS records when reserving a new cluster domain, fixes #36

Browse Source
This commit is contained in:
Pavel Sviderski
2025-03-11 21:12:00 +10:00
parent 8719e37856
commit eb42082955
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/uncloud/dns/reserve.go
+17 -6
View File
@@ -7,7 +7,9 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"google.golang.org/grpc/codes" "google.golang.org/grpc/codes"
"google.golang.org/grpc/status" "google.golang.org/grpc/status"
"uncloud/cmd/uncloud/caddy"
"uncloud/internal/cli" "uncloud/internal/cli"
"uncloud/internal/cli/client"
"uncloud/internal/machine/api/pb" "uncloud/internal/machine/api/pb"
) )
@@ -41,13 +43,13 @@ func NewReserveCommand() *cobra.Command {
} }
func reserve(ctx context.Context, uncli *cli.CLI, opts reserveOptions) error { func reserve(ctx context.Context, uncli *cli.CLI, opts reserveOptions) error {
client, err := uncli.ConnectCluster(ctx, opts.cluster) clusterClient, err := uncli.ConnectCluster(ctx, opts.cluster)
if err != nil { if err != nil {
return fmt.Errorf("connect to cluster: %w", err) return fmt.Errorf("connect to cluster: %w", err)
} }
defer client.Close() defer clusterClient.Close()
domain, err := client.ReserveDomain(ctx, &pb.ReserveDomainRequest{Endpoint: opts.endpoint}) domain, err := clusterClient.ReserveDomain(ctx, &pb.ReserveDomainRequest{Endpoint: opts.endpoint})
if err != nil { if err != nil {
if status.Convert(err).Code() == codes.AlreadyExists { if status.Convert(err).Code() == codes.AlreadyExists {
return errors.New("domain already reserved") return errors.New("domain already reserved")
@@ -56,7 +58,16 @@ func reserve(ctx context.Context, uncli *cli.CLI, opts reserveOptions) error {
} }
fmt.Printf("Reserved cluster domain: %s\n", domain.Name) fmt.Printf("Reserved cluster domain: %s\n", domain.Name)
fmt.Println("Redeploy the Caddy service ('uc caddy deploy') to configure DNS records for the domain " +
"to route traffic to the services in the cluster.") // Update cluster domain records in Uncloud DNS to point to machines running caddy service if it has been deployed.
return nil if _, err = clusterClient.InspectService(ctx, client.CaddyServiceName); err != nil {
if errors.Is(err, client.ErrNotFound) {
fmt.Println("Deploy the Caddy reverse proxy service ('uc caddy deploy') to enable internet access " +
"to your services via the reserved or your custom domain.")
return nil
}
return fmt.Errorf("inspect caddy service: %w", err)
}
return caddy.UpdateDomainRecords(ctx, clusterClient, uncli.ProgressOut())
} }