Skip to content

Commit

Permalink
Merge branch 'release/v2.21' into release/v2
Browse files Browse the repository at this point in the history
  • Loading branch information
thallgren committed Jan 27, 2025
2 parents 80cf8d3 + 9bc0279 commit 56a069a
Show file tree
Hide file tree
Showing 40 changed files with 690 additions and 687 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,9 @@ jobs:
![Assets](https://static.scarf.sh/a.png?x-pxid=d842651a-2e4d-465a-98e1-4808722c01ab)
- uses: actions/checkout@v4
if: needs.publish-release.semver_check.outputs.make_latest
if: steps.semver_check.outputs.make_latest == true
- name: Update Homebrew
if: needs.publish-release.semver_check.outputs.make_latest
if: steps.semver_check.outputs.make_latest == true
run: |
v=${{ github.ref_name }}
packaging/homebrew-package.sh "${v#v}" tel2oss "${{ vars.GH_BOT_USER }}" "${{ vars.GH_BOT_EMAIL }}" "${{ secrets.HOMEBREW_TAP_TOKEN }}"
Expand Down
15 changes: 15 additions & 0 deletions CHANGELOG.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,21 @@ items:
body: >-
macOS based systems will often PTR queries using nameslike `b._dns-sd._udp`, lb._dns-sd._udp, or
`db-dns-sd._udp`. Those queries are no longer dispatched to the cluster.
- version: 2.21.2
date: 2025-01-26
notes:
- type: bugfix
title: Fix panic when agentpf.client creates a Tunnel
body: >-
A race could occur where several requests where made to `agentpf.client.Tunnel` on a client that had errored
when creating its port-forward to the agent. The implementation could handle one such requests but not
several, resulting in a panic in situations where multiple simultaneous requests were made to the same client
during a very short time period,
- type: bugfix
title: Fix goroutine leak in dialer.
body: >-
The context passed to the `Tunnel` call that creates a stream for a dialer, was not cancelled when the dialer
was finished, so the stream was never properly closed, leading to one dormant goroutine for each stream.
- version: 2.21.1
date: 2024-12-17
notes:
Expand Down
58 changes: 29 additions & 29 deletions DEPENDENCIES.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,22 @@ following Free and Open Source software:
github.com/cenkalti/backoff/v4 v4.3.0 MIT license
github.com/cespare/xxhash/v2 v2.3.0 MIT license
github.com/chai2010/gettext-go v1.0.3 3-clause BSD license
github.com/containerd/containerd v1.7.24 Apache License 2.0
github.com/containerd/containerd v1.7.25 Apache License 2.0
github.com/containerd/errdefs v1.0.0 Apache License 2.0
github.com/containerd/log v0.1.0 Apache License 2.0
github.com/containerd/platforms v0.2.1 Apache License 2.0
github.com/coreos/go-iptables v0.8.0 Apache License 2.0
github.com/cyphar/filepath-securejoin v0.3.6 3-clause BSD license
github.com/cyphar/filepath-securejoin v0.4.0 3-clause BSD license
github.com/datawire/argo-rollouts-go-client v0.0.0-20241216133646-cb1073556c99 Apache License 2.0
github.com/datawire/dlib v1.3.1 Apache License 2.0
github.com/datawire/dtest v0.0.0-20210928162311-722b199c4c2f Apache License 2.0
github.com/datawire/envconfig v0.0.0-20221012222025-09524dc7d59b Apache License 2.0
github.com/datawire/go-ftpserver v0.1.3 Apache License 2.0
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc ISC license
github.com/distribution/reference v0.6.0 Apache License 2.0
github.com/docker/cli v27.4.1+incompatible Apache License 2.0
github.com/docker/cli v27.5.1+incompatible Apache License 2.0
github.com/docker/distribution v2.8.3+incompatible Apache License 2.0
github.com/docker/docker v27.4.1+incompatible Apache License 2.0
github.com/docker/docker v27.5.1+incompatible Apache License 2.0
github.com/docker/docker-credential-helpers v0.8.2 MIT license
github.com/docker/go-connections v0.5.0 Apache License 2.0
github.com/docker/go-metrics v0.0.1 Apache License 2.0
Expand All @@ -52,7 +52,7 @@ following Free and Open Source software:
github.com/fxamacker/cbor/v2 v2.7.0 MIT license
github.com/go-errors/errors v1.5.1 MIT license
github.com/go-gorp/gorp/v3 v3.1.0 MIT license
github.com/go-json-experiment/json v0.0.0-20250106061903-e1879d3334f2 3-clause BSD license
github.com/go-json-experiment/json v0.0.0-20250124004741-3d76ae074650 3-clause BSD license
github.com/go-logr/logr v1.4.2 Apache License 2.0
github.com/go-logr/stdr v1.2.2 Apache License 2.0
github.com/go-openapi/jsonpointer v0.21.0 Apache License 2.0
Expand Down Expand Up @@ -88,10 +88,10 @@ following Free and Open Source software:
github.com/lib/pq v1.10.9 MIT license
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de 3-clause BSD license
github.com/mailru/easyjson v0.9.0 MIT license
github.com/mattn/go-colorable v0.1.13 MIT license
github.com/mattn/go-colorable v0.1.14 MIT license
github.com/mattn/go-isatty v0.0.20 MIT license
github.com/mattn/go-runewidth v0.0.16 MIT license
github.com/miekg/dns v1.1.62 3-clause BSD license
github.com/miekg/dns v1.1.63 3-clause BSD license
github.com/mitchellh/copystructure v1.2.0 MIT license
github.com/mitchellh/go-wordwrap v1.0.1 MIT license
github.com/mitchellh/reflectwalk v1.0.2 MIT license
Expand All @@ -112,17 +112,17 @@ following Free and Open Source software:
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 3-clause BSD license
github.com/prometheus/client_golang v1.20.5 3-clause BSD license, Apache License 2.0
github.com/prometheus/client_model v0.6.1 Apache License 2.0
github.com/prometheus/common v0.61.0 Apache License 2.0
github.com/prometheus/common v0.62.0 Apache License 2.0
github.com/prometheus/procfs v0.15.1 Apache License 2.0
github.com/puzpuzpuz/xsync/v3 v3.4.0 Apache License 2.0
github.com/puzpuzpuz/xsync/v3 v3.5.0 Apache License 2.0
github.com/rivo/uniseg v0.4.7 MIT license
github.com/rogpeppe/go-internal v1.13.1 3-clause BSD license
github.com/rubenv/sql-migrate v1.7.1 MIT license
github.com/russross/blackfriday/v2 v2.1.0 2-clause BSD license
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 MIT license
github.com/shopspring/decimal v1.4.0 MIT license
github.com/sirupsen/logrus v1.9.3 MIT license
github.com/spf13/afero v1.11.0 Apache License 2.0
github.com/spf13/afero v1.12.0 Apache License 2.0
github.com/spf13/cast v1.7.1 MIT license
github.com/spf13/cobra v1.8.1 Apache License 2.0
github.com/spf13/pflag v1.0.5 3-clause BSD license
Expand All @@ -137,10 +137,10 @@ following Free and Open Source software:
github.com/xeipuuv/gojsonschema v1.2.0 Apache License 2.0
github.com/xlab/treeprint v1.2.0 MIT license
go.opentelemetry.io/auto/sdk v1.1.0 Apache License 2.0
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 Apache License 2.0
go.opentelemetry.io/otel v1.33.0 Apache License 2.0
go.opentelemetry.io/otel/metric v1.33.0 Apache License 2.0
go.opentelemetry.io/otel/trace v1.33.0 Apache License 2.0
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 Apache License 2.0
go.opentelemetry.io/otel v1.34.0 Apache License 2.0
go.opentelemetry.io/otel/metric v1.34.0 Apache License 2.0
go.opentelemetry.io/otel/trace v1.34.0 Apache License 2.0
golang.org/x/crypto v0.32.0 3-clause BSD license
golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 3-clause BSD license
golang.org/x/mod v0.22.0 3-clause BSD license
Expand All @@ -155,28 +155,28 @@ following Free and Open Source software:
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 MIT license
golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173 MIT license
golang.zx2c4.com/wireguard/windows v0.5.3 MIT license
google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422 Apache License 2.0
google.golang.org/grpc v1.69.2 Apache License 2.0
google.golang.org/protobuf v1.36.2 3-clause BSD license
google.golang.org/genproto/googleapis/rpc v0.0.0-20250124145028-65684f501c47 Apache License 2.0
google.golang.org/grpc v1.70.0 Apache License 2.0
google.golang.org/protobuf v1.36.4 3-clause BSD license
gopkg.in/evanphx/json-patch.v4 v4.12.0 3-clause BSD license
gopkg.in/inf.v0 v0.9.1 3-clause BSD license
gopkg.in/yaml.v3 v3.0.1 Apache License 2.0, MIT license
gvisor.dev/gvisor v0.0.0-20250106193742-9c4bf5b667b6 Apache License 2.0, MIT license
helm.sh/helm/v3 v3.16.4 Apache License 2.0
k8s.io/api v0.32.0 Apache License 2.0
k8s.io/apiextensions-apiserver v0.32.0 Apache License 2.0
k8s.io/apimachinery v0.32.0 3-clause BSD license, Apache License 2.0
k8s.io/apiserver v0.32.0 Apache License 2.0
k8s.io/cli-runtime v0.32.0 Apache License 2.0
k8s.io/client-go v0.32.0 3-clause BSD license, Apache License 2.0
k8s.io/component-base v0.32.0 Apache License 2.0
gvisor.dev/gvisor v0.0.0-20250115195935-26653e7d8816 Apache License 2.0, MIT license
helm.sh/helm/v3 v3.17.0 Apache License 2.0
k8s.io/api v0.32.1 Apache License 2.0
k8s.io/apiextensions-apiserver v0.32.1 Apache License 2.0
k8s.io/apimachinery v0.32.1 3-clause BSD license, Apache License 2.0
k8s.io/apiserver v0.32.1 Apache License 2.0
k8s.io/cli-runtime v0.32.1 Apache License 2.0
k8s.io/client-go v0.32.1 3-clause BSD license, Apache License 2.0
k8s.io/component-base v0.32.1 Apache License 2.0
k8s.io/klog/v2 v2.130.1 Apache License 2.0
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 3-clause BSD license, Apache License 2.0
k8s.io/kubectl v0.32.0 Apache License 2.0
k8s.io/kubectl v0.32.1 Apache License 2.0
k8s.io/utils v0.0.0-20241210054802-24370beab758 3-clause BSD license, Apache License 2.0
oras.land/oras-go v1.2.6 Apache License 2.0
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 3-clause BSD license, Apache License 2.0
sigs.k8s.io/kustomize/api v0.18.0 Apache License 2.0
sigs.k8s.io/kustomize/kyaml v0.18.1 Apache License 2.0
sigs.k8s.io/kustomize/api v0.19.0 Apache License 2.0
sigs.k8s.io/kustomize/kyaml v0.19.0 Apache License 2.0
sigs.k8s.io/structured-merge-diff/v4 v4.5.0 Apache License 2.0
sigs.k8s.io/yaml v1.4.0 Apache License 2.0, MIT license
2 changes: 1 addition & 1 deletion build-aux/main.mk
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ GOLANGCI_VERSION:=v1.62.2
lint-go: lint-deps ## (QA) Run the golangci-lint
$(eval badimports = $(shell find cmd integration_test pkg -name '*.go' | grep -v '/mocks/' | xargs $(tools/gosimports) --local github.com/datawire/,github.com/telepresenceio/ -l))
$(if $(strip $(badimports)), echo "The following files have bad import ordering (use make format to fix): " $(badimports) && false)
ifeq ($(GOHOSTOS),windows)
ifeq ($(GOOS),windows)
docker run -e GOOS=$(GOOS) --rm -v $$(pwd):/app -v ~/.cache/golangci-lint/$(GOLANGCI_VERSION):/root/.cache -w /app golangci/golangci-lint:$(GOLANGCI_VERSION) golangci-lint \
run --timeout 8m ./cmd/telepresence/... ./integration_test/... ./pkg/...
else
Expand Down
13 changes: 13 additions & 0 deletions docs/release-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,19 @@ The namespace conflict detection mechanism would only discover conflicts between
macOS based systems will often PTR queries using nameslike `b._dns-sd._udp`, lb._dns-sd._udp, or `db-dns-sd._udp`. Those queries are no longer dispatched to the cluster.
</div>

## Version 2.21.2 <span style="font-size: 16px;">(January 26)</span>
## <div style="display:flex;"><img src="images/bugfix.png" alt="bugfix" style="width:30px;height:fit-content;"/><div style="display:flex;margin-left:7px;">Fix panic when agentpf.client creates a Tunnel</div></div>
<div style="margin-left: 15px">

A race could occur where several requests where made to `agentpf.client.Tunnel` on a client that had errored when creating its port-forward to the agent. The implementation could handle one such requests but not several, resulting in a panic in situations where multiple simultaneous requests were made to the same client during a very short time period,
</div>

## <div style="display:flex;"><img src="images/bugfix.png" alt="bugfix" style="width:30px;height:fit-content;"/><div style="display:flex;margin-left:7px;">Fix goroutine leak in dialer.</div></div>
<div style="margin-left: 15px">

The context passed to the `Tunnel` call that creates a stream for a dialer, was not cancelled when the dialer was finished, so the stream was never properly closed, leading to one dormant goroutine for each stream.
</div>

## Version 2.21.1 <span style="font-size: 16px;">(December 17)</span>
## <div style="display:flex;"><img src="images/bugfix.png" alt="bugfix" style="width:30px;height:fit-content;"/><div style="display:flex;margin-left:7px;">[Allow ingest of serverless deployments without specifying an inject-container-ports annotation](https://github.com/telepresenceio/telepresence/issues/3741)</div></div>
<div style="margin-left: 15px">
Expand Down
Loading

0 comments on commit 56a069a

Please sign in to comment.