Merge branch 'cloudflare:master' into master

This commit is contained in:
Areg Vrtanesyan 2025-10-15 11:56:27 +01:00 committed by GitHub
commit 93c870ac4c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 28 additions and 14 deletions

View File

@ -1,3 +1,17 @@
2025.10.0
- 2025-10-14 chore: Fix upload of RPM repo file during double signing
- 2025-10-13 TUN-9882: Bump datagram v3 write channel capacity
- 2025-10-10 chore: Fix import of GPG keys when two keys are provided
- 2025-10-10 chore: Fix parameter order when uploading RPM .repo file to R2
- 2025-10-10 TUN-9883: Add new datagram v3 feature flag
- 2025-10-09 chore: Force usage of go-boring 1.24
- 2025-10-08 TUN-9882: Improve metrics for datagram v3
- 2025-10-07 GRC-16749: Add fedramp tags to catalog
- 2025-10-07 TUN-9882: Add buffers for UDP and ICMP datagrams in datagram v3
- 2025-10-07 TUN-9882: Add write deadline for UDP origin writes
- 2025-09-29 TUN-9776: Support signing Debian packages with two keys for rollover
- 2025-09-22 TUN-9800: Add pipeline to sync between gitlab and github repos
2025.9.1 2025.9.1
- 2025-09-22 TUN-9855: Create script to ignore vulnerabilities from govuln check - 2025-09-22 TUN-9855: Create script to ignore vulnerabilities from govuln check
- 2025-09-19 TUN-9852: Remove fmt.Println from cloudflared access command - 2025-09-19 TUN-9852: Remove fmt.Println from cloudflared access command

View File

@ -26,7 +26,7 @@ const (
// The maximum amount of datagrams a session will queue up before it begins dropping datagrams. // The maximum amount of datagrams a session will queue up before it begins dropping datagrams.
// This channel buffer is small because we assume that the dedicated writer to the origin is typically // This channel buffer is small because we assume that the dedicated writer to the origin is typically
// fast enought to keep the channel empty. // fast enought to keep the channel empty.
writeChanCapacity = 16 writeChanCapacity = 512
logFlowID = "flowID" logFlowID = "flowID"
logPacketSizeKey = "packetSize" logPacketSizeKey = "packetSize"

View File

@ -133,16 +133,16 @@ class PkgCreator:
""" """
def create_repo_file(self, file_path, binary_name, baseurl, gpgkey_url): def create_repo_file(self, file_path, binary_name, baseurl, gpgkey_url):
repo_file = os.path.join(file_path, binary_name + '.repo') repo_file_path = os.path.join(file_path, binary_name + '.repo')
with open(repo_file, "w+") as repo_file: with open(repo_file_path, "w+") as repo_file:
repo_file.write(f"[{binary_name}-stable]") repo_file.write(f"[{binary_name}-stable]\n")
repo_file.write(f"{binary_name}-stable") repo_file.write(f"name={binary_name}-stable\n")
repo_file.write(f"baseurl={baseurl}/rpm") repo_file.write(f"baseurl={baseurl}/rpm\n")
repo_file.write("enabled=1") repo_file.write("enabled=1\n")
repo_file.write("type=rpm") repo_file.write("type=rpm\n")
repo_file.write("gpgcheck=1") repo_file.write("gpgcheck=1\n")
repo_file.write(f"gpgkey={gpgkey_url}") repo_file.write(f"gpgkey={gpgkey_url}\n")
return repo_file return repo_file_path
def _sign_rpms(self, file_path, gpg_key_name): def _sign_rpms(self, file_path, gpg_key_name):
@ -153,7 +153,7 @@ class PkgCreator:
raise raise
def _sign_repomd(self): def _sign_repomd(self):
p = Popen(["gpg", "--batch", "--detach-sign", "--armor", "./rpm/repodata/repomd.xml"], stdout=PIPE, stderr=PIPE) p = Popen(["gpg", "--batch", "--yes", "--detach-sign", "--armor", "./rpm/repodata/repomd.xml"], stdout=PIPE, stderr=PIPE)
out, err = p.communicate() out, err = p.communicate()
if p.returncode != 0: if p.returncode != 0:
print(f"sign repomd result => {out}, {err}") print(f"sign repomd result => {out}, {err}")
@ -322,7 +322,7 @@ def create_rpm_packaging(
repo_file = pkg_creator.create_repo_file(artifacts_path, binary_name, base_url, gpg_key_url) repo_file = pkg_creator.create_repo_file(artifacts_path, binary_name, base_url, gpg_key_url)
print("Uploading repo file") print("Uploading repo file")
pkg_uploader.upload_pkg_to_r2(binary_name + "repo", repo_file) pkg_uploader.upload_pkg_to_r2(repo_file, binary_name + ".repo")
print("uploading latest to r2...") print("uploading latest to r2...")
upload_from_directories(pkg_uploader, "rpm", None, binary_name) upload_from_directories(pkg_uploader, "rpm", None, binary_name)