Skip to content

Commit

Permalink
1.28 | bazel: update to a newer version of envoy-fork with http2 cont…
Browse files Browse the repository at this point in the history
…inuation cve (#322)

* bazel: update to a newer version of envoy-fork with http2 continuation cve

* Use private pool cloud build worker (#316)

* use 16core private worker

* mimic build-bot's repo tag

* sub-job tag

---------

Co-authored-by: Jacob Bohanon <jacob.bohanon@solo.io>
  • Loading branch information
nfuden and jbohanon authored Apr 11, 2024
1 parent 5ddcf40 commit 42867b7
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 9 deletions.
4 changes: 2 additions & 2 deletions bazel/repository_locations.bzl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
REPOSITORY_LOCATIONS = dict(
envoy = dict(
# envoy 1.28.1 with backported ext_proc updates
commit = "47d4c36d399b9daae47cd7f6c4d41cf75e7e3ff8",
# envoy 1.28.2 with backported ext_proc updates
commit = "3a260838159e2d4ba6d2499e1d6bd6740e55fce5",
remote = "https://github.com/solo-io/envoy-fork",
),
inja = dict(
Expand Down
10 changes: 10 additions & 0 deletions changelog/v1.28.2-patch1/bump-envoy.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
changelog:
- type: DEPENDENCY_BUMP
dependencyOwner: solo-io
dependencyRepo: envoy-fork
dependencyTag: v1.28.2
resolvesIssue: false
issueLink: https://github.com/solo-io/solo-projects/issues/6008
description: >-
Update Envoy to latest from forked 1.28.2
Tackles the http2 crazy cve CVE-2024-30255
11 changes: 10 additions & 1 deletion ci/cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,23 @@ steps:
- 'TAGGED_VERSION=$TAG_NAME'

options:
machineType: 'N1_HIGHCPU_32'
pool:
name: 'projects/solo-public/locations/us-central1/workerPools/envoy-gloo-runner'
timeout: 20000s

artifacts:
objects:
location: 'gs://solo-public-artifacts.solo.io/envoy/$COMMIT_SHA/'
paths: ['linux/amd64/build_envoy_release/envoy']

tags:
- "repo_envoy-gloo"
# This tag can be used to filter for or out jobs which are spawned by the main job
# submitted by build-bot. It's somewhat redundant as one could filter on `tags~^pr`
# to achieve the same effect since that tag is added to main jobs by build-bot,
# but this is somewhat less esoteric
- "sub-job"

availableSecrets:
inline:
- kmsKeyName: projects/solo-public/locations/global/keyRings/build/cryptoKeys/build-key
Expand Down
5 changes: 1 addition & 4 deletions ci/do_ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,8 @@ fi

export ENVOY_SRCDIR=$SOURCE_DIR

# google cloud build times out when using full throttle.
export NUM_CPUS=10

# google cloud build doesn't like ipv6
export BAZEL_EXTRA_TEST_OPTIONS="--test_env=ENVOY_IP_TEST_VERSIONS=v4only --test_output=errors --jobs=${NUM_CPUS}"
export BAZEL_EXTRA_TEST_OPTIONS="--test_env=ENVOY_IP_TEST_VERSIONS=v4only --test_output=errors"

# We do not need/want to build the Envoy contrib filters so we replace the
# associated targets with the ENVOY_BUILD values
Expand Down
6 changes: 4 additions & 2 deletions cloudbuild.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
steps:

- name: 'gcr.io/cloud-builders/gcloud'
args: ['builds','submit','--config=ci/cloudbuild.yaml','--substitutions','TAG_NAME=$TAG_NAME,COMMIT_SHA=$COMMIT_SHA,_BUILD_TYPE=']
id: "standard"
args: ['builds','submit','--region=us-central1','--config=ci/cloudbuild.yaml','--substitutions','TAG_NAME=$TAG_NAME,COMMIT_SHA=$COMMIT_SHA,_BUILD_TYPE=']

- name: 'gcr.io/cloud-builders/gcloud'
args: ['builds','submit','--config=ci/cloudbuild.yaml','--substitutions','COMMIT_SHA=$COMMIT_SHA,_BUILD_TYPE=clang-asan']
id: "asan"
args: ['builds','submit','--region=us-central1','--config=ci/cloudbuild.yaml','--substitutions','COMMIT_SHA=$COMMIT_SHA,_BUILD_TYPE=clang-asan']
waitFor: ['-']

timeout: 20000s

0 comments on commit 42867b7

Please sign in to comment.