lzc256
/
tailscale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

funnel: change references from alpha to beta (#7613) 

Updates CLI and docs to reference Funnel as beta

Signed-off-by: Shayne Sweeney <shayne@tailscale.com>
pull/7699/head
shayne 2023-03-27 10:12:32 -04:00 committed by GitHub
parent 3177ccabe5
commit 43f7ec48ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/tailscale/cli/funnel.go
View File

@ -29,7 +29,7 @@ var funnelCmd = newFunnelCommand(&serveEnv{lc: &localClient})
func newFunnelCommand(e *serveEnv) *ffcli.Command { func newFunnelCommand(e *serveEnv) *ffcli.Command {
return &ffcli.Command{ return &ffcli.Command{
Name: "funnel", Name: "funnel",
ShortHelp: "[ALPHA] turn Tailscale Funnel on or off", ShortHelp: "[BETA] turn Tailscale Funnel on or off",
ShortUsage: strings.TrimSpace(` ShortUsage: strings.TrimSpace(`
funnel <serve-port> {on|off} funnel <serve-port> {on|off}
funnel status [--json] funnel status [--json]

4
cmd/tailscale/cli/serve.go
View File

@ -33,7 +33,7 @@ var serveCmd = newServeCommand(&serveEnv{lc: &localClient})
func newServeCommand(e *serveEnv) *ffcli.Command { func newServeCommand(e *serveEnv) *ffcli.Command {
return &ffcli.Command{ return &ffcli.Command{
Name: "serve", Name: "serve",
ShortHelp: "[ALPHA] Serve from your Tailscale node", ShortHelp: "[BETA] Serve from your Tailscale node",
ShortUsage: strings.TrimSpace(` ShortUsage: strings.TrimSpace(`
serve https:<port> <mount-point> <source> [off] serve https:<port> <mount-point> <source> [off]
serve tcp:<port> tcp://localhost:<local-port> [off] serve tcp:<port> tcp://localhost:<local-port> [off]
@ -41,7 +41,7 @@ serve https:<port> <mount-point> <source> [off]
serve status [--json] serve status [--json]
`), `),
LongHelp: strings.TrimSpace(` LongHelp: strings.TrimSpace(`
*** ALPHA; all of this is subject to change *** *** BETA; all of this is subject to change ***
The 'tailscale serve' set of commands allows you to serve The 'tailscale serve' set of commands allows you to serve
content and local servers from your Tailscale node to content and local servers from your Tailscale node to

4
ipn/serve.go
View File

@ -180,7 +180,7 @@ func (sc *ServeConfig) IsFunnelOn() bool {
// CheckFunnelAccess checks whether Funnel access is allowed for the given node // CheckFunnelAccess checks whether Funnel access is allowed for the given node
// and port. // and port.
// It checks: // It checks:
// 1. an invite was used to join the Funnel alpha // 1. Funnel is enabled on the Tailnet
// 2. HTTPS is enabled on the Tailnet // 2. HTTPS is enabled on the Tailnet
// 3. the node has the "funnel" nodeAttr // 3. the node has the "funnel" nodeAttr
// 4. the port is allowed for Funnel // 4. the port is allowed for Funnel
@ -190,7 +190,7 @@ func (sc *ServeConfig) IsFunnelOn() bool {
// Funnel. // Funnel.
func CheckFunnelAccess(port uint16, nodeAttrs []string) error { func CheckFunnelAccess(port uint16, nodeAttrs []string) error {
if slices.Contains(nodeAttrs, tailcfg.CapabilityWarnFunnelNoInvite) { if slices.Contains(nodeAttrs, tailcfg.CapabilityWarnFunnelNoInvite) {
return errors.New("Funnel not available; an invite is required to join the alpha. See https://tailscale.com/s/no-funnel.") return errors.New("Funnel not enabled; See https://tailscale.com/s/no-funnel.")
} }
if slices.Contains(nodeAttrs, tailcfg.CapabilityWarnFunnelNoHTTPS) { if slices.Contains(nodeAttrs, tailcfg.CapabilityWarnFunnelNoHTTPS) {
return errors.New("Funnel not available; HTTPS must be enabled. See https://tailscale.com/s/https.") return errors.New("Funnel not available; HTTPS must be enabled. See https://tailscale.com/s/https.")

3
tailcfg/tailcfg.go
View File

@ -1839,7 +1839,8 @@ const (
// Funnel warning capabilities used for reporting errors to the user. // Funnel warning capabilities used for reporting errors to the user.
// CapabilityWarnFunnelNoInvite indicates an invite has not been accepted for the Funnel alpha. // CapabilityWarnFunnelNoInvite indicates whether Funnel is enabled for the tailnet.
// NOTE: In transition from Alpha to Beta, this capability is being reused as the enablement.
CapabilityWarnFunnelNoInvite = "https://tailscale.com/cap/warn-funnel-no-invite" CapabilityWarnFunnelNoInvite = "https://tailscale.com/cap/warn-funnel-no-invite"
// CapabilityWarnFunnelNoHTTPS indicates HTTPS has not been enabled for the tailnet. // CapabilityWarnFunnelNoHTTPS indicates HTTPS has not been enabled for the tailnet.