mirror of
https://github.com/cloudflare/cloudflared.git
synced 2025-06-18 18:56:34 +00:00
TUN-9495: Remove references to cloudflare-go
## Summary When bumping cloudflared to use go1.24, we no longer need cloudflare-go, since most of the PQ and FIPS compliant curves are already available in go 1.24. Therefore, we can remove everything related with installing our go toolchain.
This commit is contained in:
parent
47085ee0c9
commit
43a3ba347b
8
.teamcity/install-cloudflare-go.sh
vendored
8
.teamcity/install-cloudflare-go.sh
vendored
@ -1,8 +0,0 @@
|
|||||||
# !/usr/bin/env bash
|
|
||||||
|
|
||||||
cd /tmp
|
|
||||||
git clone -q https://github.com/cloudflare/go
|
|
||||||
cd go/src
|
|
||||||
# https://github.com/cloudflare/go/tree/af19da5605ca11f85776ef7af3384a02a315a52b is version go1.22.5-devel-cf
|
|
||||||
git checkout -q af19da5605ca11f85776ef7af3384a02a315a52b
|
|
||||||
./make.bash
|
|
10
.teamcity/mac/install-cloudflare-go.sh
vendored
10
.teamcity/mac/install-cloudflare-go.sh
vendored
@ -1,10 +0,0 @@
|
|||||||
rm -rf /tmp/go
|
|
||||||
export GOCACHE=/tmp/gocache
|
|
||||||
rm -rf $GOCACHE
|
|
||||||
|
|
||||||
./.teamcity/install-cloudflare-go.sh
|
|
||||||
|
|
||||||
export PATH="/tmp/go/bin:$PATH"
|
|
||||||
go version
|
|
||||||
which go
|
|
||||||
go env
|
|
16
.teamcity/windows/install-cloudflare-go.ps1
vendored
16
.teamcity/windows/install-cloudflare-go.ps1
vendored
@ -1,16 +0,0 @@
|
|||||||
Set-StrictMode -Version Latest
|
|
||||||
$ErrorActionPreference = "Stop"
|
|
||||||
$ProgressPreference = "SilentlyContinue"
|
|
||||||
|
|
||||||
Write-Output "Downloading cloudflare go..."
|
|
||||||
|
|
||||||
Set-Location "$Env:Temp"
|
|
||||||
|
|
||||||
git clone -q https://github.com/cloudflare/go
|
|
||||||
Write-Output "Building go..."
|
|
||||||
cd go/src
|
|
||||||
# https://github.com/cloudflare/go/tree/af19da5605ca11f85776ef7af3384a02a315a52b is version go1.22.5-devel-cf
|
|
||||||
git checkout -q af19da5605ca11f85776ef7af3384a02a315a52b
|
|
||||||
& ./make.bat
|
|
||||||
|
|
||||||
Write-Output "Installed"
|
|
20
.teamcity/windows/install-go-msi.ps1
vendored
20
.teamcity/windows/install-go-msi.ps1
vendored
@ -1,20 +0,0 @@
|
|||||||
$ErrorActionPreference = "Stop"
|
|
||||||
$ProgressPreference = "SilentlyContinue"
|
|
||||||
$GoMsiVersion = "go1.22.5.windows-amd64.msi"
|
|
||||||
|
|
||||||
Write-Output "Downloading go installer..."
|
|
||||||
|
|
||||||
Set-Location "$Env:Temp"
|
|
||||||
|
|
||||||
(New-Object System.Net.WebClient).DownloadFile(
|
|
||||||
"https://go.dev/dl/$GoMsiVersion",
|
|
||||||
"$Env:Temp\$GoMsiVersion"
|
|
||||||
)
|
|
||||||
|
|
||||||
Write-Output "Installing go..."
|
|
||||||
Install-Package "$Env:Temp\$GoMsiVersion" -Force
|
|
||||||
|
|
||||||
# Go installer updates global $PATH
|
|
||||||
go env
|
|
||||||
|
|
||||||
Write-Output "Installed"
|
|
13
Makefile
13
Makefile
@ -56,8 +56,6 @@ PACKAGE_DIR := $(CURDIR)/packaging
|
|||||||
PREFIX := /usr
|
PREFIX := /usr
|
||||||
INSTALL_BINDIR := $(PREFIX)/bin/
|
INSTALL_BINDIR := $(PREFIX)/bin/
|
||||||
INSTALL_MANDIR := $(PREFIX)/share/man/man1/
|
INSTALL_MANDIR := $(PREFIX)/share/man/man1/
|
||||||
CF_GO_PATH := /tmp/go
|
|
||||||
PATH := $(CF_GO_PATH)/bin:$(PATH)
|
|
||||||
|
|
||||||
LOCAL_ARCH ?= $(shell uname -m)
|
LOCAL_ARCH ?= $(shell uname -m)
|
||||||
ifneq ($(GOARCH),)
|
ifneq ($(GOARCH),)
|
||||||
@ -183,19 +181,10 @@ fuzz:
|
|||||||
@go test -fuzz=FuzzNewIdentity -fuzztime=600s ./tracing
|
@go test -fuzz=FuzzNewIdentity -fuzztime=600s ./tracing
|
||||||
@go test -fuzz=FuzzNewAccessValidator -fuzztime=600s ./validation
|
@go test -fuzz=FuzzNewAccessValidator -fuzztime=600s ./validation
|
||||||
|
|
||||||
.PHONY: install-go
|
|
||||||
install-go:
|
|
||||||
rm -rf ${CF_GO_PATH}
|
|
||||||
./.teamcity/install-cloudflare-go.sh
|
|
||||||
|
|
||||||
.PHONY: cleanup-go
|
|
||||||
cleanup-go:
|
|
||||||
rm -rf ${CF_GO_PATH}
|
|
||||||
|
|
||||||
cloudflared.1: cloudflared_man_template
|
cloudflared.1: cloudflared_man_template
|
||||||
sed -e 's/\$${VERSION}/$(VERSION)/; s/\$${DATE}/$(DATE)/' cloudflared_man_template > cloudflared.1
|
sed -e 's/\$${VERSION}/$(VERSION)/; s/\$${DATE}/$(DATE)/' cloudflared_man_template > cloudflared.1
|
||||||
|
|
||||||
install: install-go cloudflared cloudflared.1 cleanup-go
|
install: cloudflared cloudflared.1
|
||||||
mkdir -p $(DESTDIR)$(INSTALL_BINDIR) $(DESTDIR)$(INSTALL_MANDIR)
|
mkdir -p $(DESTDIR)$(INSTALL_BINDIR) $(DESTDIR)$(INSTALL_MANDIR)
|
||||||
install -m755 cloudflared $(DESTDIR)$(INSTALL_BINDIR)/cloudflared
|
install -m755 cloudflared $(DESTDIR)$(INSTALL_BINDIR)/cloudflared
|
||||||
install -m644 cloudflared.1 $(DESTDIR)$(INSTALL_MANDIR)/cloudflared.1
|
install -m644 cloudflared.1 $(DESTDIR)$(INSTALL_MANDIR)/cloudflared.1
|
||||||
|
@ -31,7 +31,7 @@ Downloads are available as standalone binaries, a Docker image, and Debian, RPM,
|
|||||||
* Binaries, Debian, and RPM packages for Linux [can be found here](https://developers.cloudflare.com/cloudflare-one/connections/connect-apps/install-and-setup/installation#linux)
|
* Binaries, Debian, and RPM packages for Linux [can be found here](https://developers.cloudflare.com/cloudflare-one/connections/connect-apps/install-and-setup/installation#linux)
|
||||||
* A Docker image of `cloudflared` is [available on DockerHub](https://hub.docker.com/r/cloudflare/cloudflared)
|
* A Docker image of `cloudflared` is [available on DockerHub](https://hub.docker.com/r/cloudflare/cloudflared)
|
||||||
* You can install on Windows machines with the [steps here](https://developers.cloudflare.com/cloudflare-one/connections/connect-apps/install-and-setup/installation#windows)
|
* You can install on Windows machines with the [steps here](https://developers.cloudflare.com/cloudflare-one/connections/connect-apps/install-and-setup/installation#windows)
|
||||||
* To build from source, first you need to download the go toolchain by running `./.teamcity/install-cloudflare-go.sh` and follow the output. Then you can run `make cloudflared`
|
* To build from source, install the required version of go, mentioned in the [Development](#development) section below. Then you can run `make cloudflared`.
|
||||||
|
|
||||||
User documentation for Cloudflare Tunnel can be found at https://developers.cloudflare.com/cloudflare-one/connections/connect-apps
|
User documentation for Cloudflare Tunnel can be found at https://developers.cloudflare.com/cloudflare-one/connections/connect-apps
|
||||||
|
|
||||||
@ -62,7 +62,7 @@ For example, as of January 2023 Cloudflare will support cloudflared version 2023
|
|||||||
### Requirements
|
### Requirements
|
||||||
- [GNU Make](https://www.gnu.org/software/make/)
|
- [GNU Make](https://www.gnu.org/software/make/)
|
||||||
- [capnp](https://capnproto.org/install.html)
|
- [capnp](https://capnproto.org/install.html)
|
||||||
- [cloudflare go toolchain](https://github.com/cloudflare/go)
|
- [go >= 1.24](https://go.dev/doc/install)
|
||||||
- Optional tools:
|
- Optional tools:
|
||||||
- [capnpc-go](https://pkg.go.dev/zombiezen.com/go/capnproto2/capnpc-go)
|
- [capnpc-go](https://pkg.go.dev/zombiezen.com/go/capnproto2/capnpc-go)
|
||||||
- [goimports](https://pkg.go.dev/golang.org/x/tools/cmd/goimports)
|
- [goimports](https://pkg.go.dev/golang.org/x/tools/cmd/goimports)
|
||||||
|
Loading…
Reference in New Issue
Block a user