Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

auto-merge envoyproxy/envoy[release/v1.31] into envoyproxy/envoy-openssl[release/v1.31] #266

Merged
merged 17 commits into from
Oct 18, 2024

Conversation

update-openssl-envoy[bot]
Copy link

Generated by envoy-sync-receive.sh

phlax and others added 13 commits September 26, 2024 17:59
Signed-off-by: Ryan Northey <ryan@synca.io>
Signed-off-by: Ryan Northey <ryan@synca.io>
our existing RBE uses the GCR image rather than the dockerhub one

this may/not be related to dockerhub rate limiting that seems to have
started recently

Signed-off-by: Ryan Northey <ryan@synca.io>
Signed-off-by: Ryan Northey <ryan@synca.io>
… (#36298)

Signed-off-by: Ryan Northey <ryan@synca.io>

Signed-off-by: phlax <phlax@users.noreply.github.com>
Signed-off-by: Ryan Northey <ryan@synca.io>
Signed-off-by: Ryan Northey <ryan@synca.io>

Signed-off-by: phlax <phlax@users.noreply.github.com>
Signed-off-by: Ryan Northey <ryan@synca.io>
Commit Message: use bash source rather than dirname $0
Additional Description:

Risk Level: low.
Testing: n/a.
Docs Changes: n/a.
Release Notes: n/a.
Platform Specific Features: n/a.

---------

Signed-off-by: wangbaiping <wbphub@gmail.com>
Signed-off-by: Ryan Northey <ryan@synca.io>
Signed-off-by: Ryan Northey <ryan@synca.io>
Signed-off-by: Ryan Northey <ryan@synca.io>
this test was never really run as `CI_BRANCH` is not automatically set
in azp

now the thing its testing has moved to bazel so the test is not really
correct

also im in the process of moving the thing being tested to toolshed
(where it will be testsed more comprehensively)

Signed-off-by: Ryan Northey <ryan@synca.io>
Signed-off-by: Ryan Northey <ryan@synca.io>
…130c09` in /ci (#36322)


Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Ryan Northey <ryan@synca.io>
Commit Message: opentelemetrytracer: avoid exporting when there are no
spans
Additional Description: Today, the OpenTelemetry tracer exports a OTLP
request on each interval, even when there are no spans to be sent. The
OTLP is empty, only containing the resource (and its attributes).
Risk Level: Low
Testing: Manual
Docs Changes: N/A
Release Notes: N/A
Platform Specific Features:
[Optional Runtime guard:]
[Optional Fixes #35997]
[Optional Fixes commit #PR or SHA]
[Optional Deprecated:]
[Optional [API
Considerations](https://github.com/envoyproxy/envoy/blob/main/api/review_checklist.md):]

Signed-off-by: Joao Grassi <5938087+joaopgrassi@users.noreply.github.com>
@update-openssl-envoy update-openssl-envoy bot force-pushed the auto-merge-release-v1-31 branch 6 times, most recently from 9cf2e92 to 5ce5bdd Compare October 10, 2024 01:31
backing file temporarily deleted and re-updated (with a new hash)

Signed-off-by: Alyssa Wilk <alyssar@chromium.org>
(cherry picked from commit 55b0fc4)
Signed-off-by: Greg Greenway <ggreenway@apple.com>
@update-openssl-envoy update-openssl-envoy bot force-pushed the auto-merge-release-v1-31 branch 5 times, most recently from c457cbe to 7c1fb00 Compare October 15, 2024 01:31
Signed-off-by: Ryan Northey <ryan@synca.io>
@update-openssl-envoy update-openssl-envoy bot force-pushed the auto-merge-release-v1-31 branch 3 times, most recently from d56782b to 57b69dc Compare October 17, 2024 01:31
phlax and others added 2 commits October 17, 2024 16:59
fix #36588

Signed-off-by: Ryan Northey <ryan@synca.io>

Signed-off-by: phlax <phlax@users.noreply.github.com>
…ssl[release/v1.31]

* upstream/release/v1.31:
  docker/release: Update Ubuntu image -> 58b8789 (#36591)
  deps: Fix (renamed) ipp-crypto repo hash (#36540)
  ci: change googleurl dep (#36515)
  opentelemetrytracer: avoid exporting when there are no spans (#36313)
  build(deps): bump distroless/base-nossl-debian12 from `4cc93c5` to `e130c09` in /ci (#36322)
  ci: Workaround flakey ext_proc test
  ci/format: Remove ~unused CI format test (#35986)
  bazel/ci: Mark builds with Engflow pool requirements (#36300)
  bazel/rbe: Rename `engflow_pool` -> `rbe_pool` (#36301)
  use bash source rather than dirname $0 (#35804)
  repo/ci: Shift remaining CI -> github (#35904)
  bazel/ci: Use workspace rather than action envs for fake scm revision (#36298)
  bazel/ci: Prepare repo for using Engflow RBE (#36293)
  ci/rbe: Use GCR image for Engflow RBE (#36032)
  ci: Remove azp (#36355)
  [1.31] ci: Remove mobile config (#36354)

Signed-off-by: tedjpoole <97459248+tedjpoole@users.noreply.github.com>
@tedjpoole tedjpoole merged commit de293d8 into release/v1.31 Oct 18, 2024
1 check passed
@tedjpoole tedjpoole deleted the auto-merge-release-v1-31 branch October 18, 2024 09:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants