Skip to content

Commit 486f65c

Browse files
oschaafOtto
andauthored
OSSM-2150 rebase our changes on top of vanilla upstream 1.24 (maistra#222)
* Maistra 2.4 changes * touchups + server side cipher suite deprecations Signed-off-by: Otto van der Schaaf <[email protected]> --------- Signed-off-by: Otto van der Schaaf <[email protected]> Co-authored-by: Otto <[email protected]>
1 parent 7a6b7cd commit 486f65c

File tree

191 files changed

+10149
-4347
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

191 files changed

+10149
-4347
lines changed

.azure-pipelines/pipelines.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,8 @@ stages:
215215
pool:
216216
vmImage: "ubuntu-20.04"
217217
steps:
218+
- bash: .azure-pipelines/cleanup.sh
219+
displayName: "Removing tools from agent"
218220
- template: bazel.yml
219221
parameters:
220222
ciTarget: bazel.release
@@ -376,6 +378,8 @@ stages:
376378
pool:
377379
vmImage: "ubuntu-20.04"
378380
steps:
381+
- bash: .azure-pipelines/cleanup.sh
382+
displayName: "Removing tools from agent"
379383
- bash: |
380384
echo "disk space at beginning of build:"
381385
df -h

.bazelignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22
api
33
examples/grpc-bridge/script
44
tools/clang_tools
5+
test/extensions/quic_listeners/quiche
56
tools/dev/src
67
.project

.bazelrc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,6 @@ build:sanitizer --test_tag_filters=-no_san
5959

6060
# Common flags for Clang
6161
build:clang --action_env=BAZEL_COMPILER=clang
62-
build:clang --action_env=CC=clang --action_env=CXX=clang++
63-
build:clang --linkopt=-fuse-ld=lld
6462

6563
# Flags for Clang + PCH
6664
build:clang-pch --spawn_strategy=local
@@ -417,3 +415,5 @@ build:windows --dynamic_mode=off
417415
try-import %workspace%/clang.bazelrc
418416
try-import %workspace%/user.bazelrc
419417
try-import %workspace%/local_tsan.bazelrc
418+
419+
import %workspace%/maistra/bazelrc

.clang-format

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ ColumnLimit: 100
55
DerivePointerAlignment: false
66
PointerAlignment: Left
77
SortIncludes: false
8-
TypenameMacros: ['STACK_OF']
98
...
109

1110
---

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
blank_issues_enabled: false
2+
23
contact_links:
3-
- name: "Crash bug"
4-
url: https://github.com/envoyproxy/envoy/security/policy
5-
about: "Please file any crash bug with [email protected]."
4+
- name: "Issues"
5+
url: https://issues.redhat.com/browse/OSSM
6+
about: "Issues for this repository are tracked in Red Hat Jira."
Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +0,0 @@
1-
---
2-
name: Feature request
3-
about: Suggest an idea for this project
4-
title: ''
5-
labels: enhancement,triage
6-
assignees: ''
7-
8-
---
9-
10-
*Title*: *One line description*
11-
12-
*Description*:
13-
>Describe the desired behavior, what scenario it enables and how it
14-
would be used.
15-
16-
[optional *Relevant Links*:]
17-
>Any extra documentation required to understand the issue.
Lines changed: 0 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +0,0 @@
1-
---
2-
name: Non-{crash,security} bug
3-
about: Bugs which are not crashes, DoS or other security issue
4-
title: ''
5-
labels: bug,triage
6-
assignees: ''
7-
8-
---
9-
10-
**If you are reporting *any* crash or *any* potential security issue, *do not*
11-
open an issue in this repo. Please report the issue via emailing
12-
[email protected] where the issue will be triaged appropriately.**
13-
14-
*Title*: *One line description*
15-
16-
*Description*:
17-
>What issue is being seen? Describe what should be happening instead of
18-
the bug, for example: Envoy should not crash, the expected value isn't
19-
returned, etc.
20-
21-
*Repro steps*:
22-
> Include sample requests, environment, etc. All data and inputs
23-
required to reproduce the bug.
24-
25-
>**Note**: The [Envoy_collect tool](https://github.com/envoyproxy/envoy/blob/main/tools/envoy_collect/README.md)
26-
gathers a tarball with debug logs, config and the following admin
27-
endpoints: /stats, /clusters and /server_info. Please note if there are
28-
privacy concerns, sanitize the data prior to sharing the tarball/pasting.
29-
30-
*Admin and Stats Output*:
31-
>Include the admin output for the following endpoints: /stats,
32-
/clusters, /routes, /server_info. For more information, refer to the
33-
[admin endpoint documentation.](https://www.envoyproxy.io/docs/envoy/latest/operations/admin)
34-
35-
>**Note**: If there are privacy concerns, sanitize the data prior to
36-
sharing.
37-
38-
*Config*:
39-
>Include the config used to configure Envoy.
40-
41-
*Logs*:
42-
>Include the access logs and the Envoy logs.
43-
44-
>**Note**: If there are privacy concerns, sanitize the data prior to
45-
sharing.
46-
47-
*Call Stack*:
48-
> If the Envoy binary is crashing, a call stack is **required**.
49-
Please refer to the [Bazel Stack trace documentation](https://github.com/envoyproxy/envoy/tree/main/bazel#stack-trace-symbol-resolution).

.github/ISSUE_TEMPLATE/other.md

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +0,0 @@
1-
---
2-
name: Other
3-
about: Questions, design proposals, tech debt, etc.
4-
title: ''
5-
labels: triage
6-
assignees: ''
7-
8-
---
9-
10-
**If you are reporting *any* crash or *any* potential security issue, *do not*
11-
open an issue in this repo. Please report the issue via emailing
12-
[email protected] where the issue will be triaged appropriately.**
13-
14-
*Title*: *One line description*
15-
16-
*Description*:
17-
>Describe the issue.
18-
19-
[optional *Relevant Links*:]
20-
>Any extra documentation required to understand the issue.

0 commit comments

Comments
 (0)