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

repo: Move examples to own repo #35471

Merged
merged 2 commits into from
Aug 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
243 changes: 0 additions & 243 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,46 +9,6 @@ updates:
#
# Please ensure any new ones are added here, and any that are removed are removed here also.

- package-ecosystem: "pip"
directory: "/examples/grpc-bridge/client"
groups:
examples-grpc-bridge:
patterns:
- "*"
schedule:
interval: "daily"
time: "06:00"

- package-ecosystem: "pip"
directory: "/examples/cache"
groups:
examples-cache:
patterns:
- "*"
schedule:
interval: "daily"
time: "06:00"

- package-ecosystem: "pip"
directory: "/examples/shared/python/aiohttp"
groups:
examples-shared-python:
patterns:
- "*"
schedule:
interval: "daily"
time: "06:00"

- package-ecosystem: "pip"
directory: "/examples/shared/python/postgres"
groups:
examples-postgres:
patterns:
- "*"
schedule:
interval: "daily"
time: "06:00"

- package-ecosystem: "pip"
directory: "/tools/base"
open-pull-requests-limit: 20
Expand All @@ -68,153 +28,6 @@ updates:
interval: daily
time: "06:00"

- package-ecosystem: "docker"
directory: "/examples/ext_authz"
groups:
examples-ext-authz:
patterns:
- "*"
schedule:
interval: daily
time: "06:00"

- package-ecosystem: "docker"
directory: "/examples/fault-injection"
schedule:
interval: daily
time: "06:00"

- package-ecosystem: "docker"
directory: "/examples/golang-network"
groups:
examples-golang-network:
patterns:
- "*"
schedule:
interval: daily
time: "06:00"

- package-ecosystem: "docker"
directory: "/examples/grpc-bridge"
groups:
examples-grpc-bridge:
patterns:
- "*"
schedule:
interval: daily
time: "06:00"

- package-ecosystem: "docker"
directory: "/examples/kafka"
groups:
examples-kafka:
patterns:
- "*"
schedule:
interval: daily
time: "06:00"

- package-ecosystem: "docker"
directory: "/examples/local_ratelimit"
groups:
examples-local-ratelimit:
patterns:
- "*"
schedule:
interval: daily
time: "06:00"

- package-ecosystem: "docker"
directory: "/examples/mysql"
schedule:
interval: daily
time: "06:00"

- package-ecosystem: "docker"
directory: "/examples/opentelemetry"
schedule:
interval: daily
time: "06:00"

- package-ecosystem: "docker"
directory: "/examples/redis"
schedule:
interval: daily
time: "06:00"

- package-ecosystem: "docker"
directory: "/examples/shared/build"
schedule:
interval: daily
time: "06:00"

- package-ecosystem: "docker"
directory: "/examples/shared/echo"
schedule:
interval: daily
time: "06:00"

# TODO(phlax): just use above
- package-ecosystem: "docker"
directory: "/examples/shared/echo2"
schedule:
interval: daily
time: "06:00"

- package-ecosystem: "docker"
directory: "/examples/shared/golang"
schedule:
interval: daily
time: "06:00"

- package-ecosystem: "docker"
directory: "/examples/shared/jaeger"
schedule:
interval: daily
time: "06:00"

- package-ecosystem: "docker"
directory: "/examples/shared/node"
schedule:
interval: daily
time: "06:00"

- package-ecosystem: "docker"
directory: "/examples/shared/postgres"
schedule:
interval: daily
time: "06:00"

- package-ecosystem: "docker"
directory: "/examples/shared/python"
schedule:
interval: daily
time: "06:00"

- package-ecosystem: "docker"
directory: "/examples/shared/websocket"
schedule:
interval: daily
time: "06:00"

- package-ecosystem: "docker"
directory: "/examples/skywalking"
schedule:
interval: daily
time: "06:00"

- package-ecosystem: "docker"
directory: "/examples/udp"
schedule:
interval: daily
time: "06:00"

- package-ecosystem: "docker"
directory: "/examples/zipkin"
schedule:
interval: daily
time: "06:00"

- package-ecosystem: "github-actions"
directory: "/"
schedule:
Expand Down Expand Up @@ -348,59 +161,3 @@ updates:
schedule:
interval: daily
time: "06:00"

- package-ecosystem: "gomod"
directory: "/examples/ext_authz/auth/grpc-service"
groups:
examples-ext-authz:
patterns:
- "*"
schedule:
interval: daily
time: "06:00"

- package-ecosystem: "gomod"
directory: "/examples/load-reporting-service"
groups:
examples-load-reporting:
patterns:
- "*"
schedule:
interval: daily
time: "06:00"

- package-ecosystem: "gomod"
directory: "/examples/grpc-bridge/server"
groups:
examples-grpc-bridge:
patterns:
- "*"
schedule:
interval: daily
time: "06:00"

- package-ecosystem: "gomod"
directory: "/examples/golang-http/simple"
groups:
examples-golang-http:
patterns:
- "*"
schedule:
interval: daily
time: "06:00"

- package-ecosystem: "gomod"
directory: "/examples/golang-network/simple"
groups:
examples-golang-network:
patterns:
- "*"
schedule:
interval: daily
time: "06:00"

- package-ecosystem: "npm"
directory: "/examples/single-page-app/ui"
schedule:
interval: daily
time: "06:00"
9 changes: 4 additions & 5 deletions .github/workflows/_stage_verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
container-command:
rbe: ${{ matrix.rbe }}
request: ${{ inputs.request }}
runs-on: envoy-x64-small
runs-on: ubuntu-24.04
steps-pre: ${{ matrix.steps-pre }}
source: ${{ matrix.source }}
target: ${{ matrix.target }}
Expand Down Expand Up @@ -62,8 +62,8 @@ jobs:
> /dev/null
sudo apt-get update
sudo apt-get install -y -qq --allow-downgrades \
docker-ce=5:24.0.9-1~ubuntu.22.04~jammy \
docker-ce-cli=5:24.0.9-1~ubuntu.22.04~jammy
docker-ce=5:24.0.9-1~ubuntu.24.04~noble \
docker-ce-cli=5:24.0.9-1~ubuntu.24.04~noble
sudo systemctl restart docker
sudo docker --version
shell: bash
Expand Down Expand Up @@ -102,6 +102,5 @@ jobs:
# Install expected host packages
export DEBIAN_FRONTEND=noninteractive
sudo apt-get -qq update -y
sudo apt-get -qq install -y --no-install-recommends expect gettext whois
pip install -r ./.github/workflows/verify-requirements.txt
sudo apt-get -qq install -y --no-install-recommends expect gettext yq whois
shell: bash
1 change: 0 additions & 1 deletion .github/workflows/verify-requirements.in

This file was deleted.

7 changes: 0 additions & 7 deletions BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,6 @@ package_group(
],
)

package_group(
name = "examples_library",
packages = [
"//examples/...",
],
)

package_group(
name = "mobile_library",
packages = [
Expand Down
2 changes: 2 additions & 0 deletions bazel/repositories.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,8 @@ def envoy_dependencies(skip_targets = []):
external_http_archive("bazel_toolchains")
external_http_archive("bazel_compdb")
external_http_archive("envoy_build_tools")
external_http_archive(name = "envoy_examples")

_com_github_maxmind_libmaxminddb()

external_http_archive("rules_pkg")
Expand Down
14 changes: 14 additions & 0 deletions bazel/repository_locations.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,20 @@ REPOSITORY_LOCATIONS_SPEC = dict(
urls = ["https://github.com/bazelbuild/buildtools/archive/v{version}.tar.gz"],
use_category = ["test_only"],
),
envoy_examples = dict(
project_name = "envoy_examples",
project_desc = "Envoy proxy examples",
project_url = "https://github.com/envoyproxy/examples",
version = "6aa9c3730c91eddaf0c69cc7cbe5294d3da74310",
sha256 = "9bb97f256bedf68cc6696eb7bd8dbb9d0776c137fb88d028e5aa674cfc8ab467",
strip_prefix = "examples-{version}",
urls = ["https://github.com/envoyproxy/examples/archive/{version}.tar.gz"],
use_category = ["test_only"],
release_date = "2024-08-02",
cpe = "N/A",
license = "Apache-2.0",
license_url = "https://github.com/envoyproxy/examples/blob/{version}/LICENSE",
),
rules_fuzzing = dict(
project_name = "Fuzzing Rules for Bazel",
project_desc = "Bazel rules for fuzz tests",
Expand Down
18 changes: 7 additions & 11 deletions ci/do_ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -233,16 +233,6 @@ function bazel_contrib_binary_build() {
bazel_binary_build "$1" "${ENVOY_CONTRIB_BUILD_TARGET}" "${ENVOY_CONTRIB_BUILD_DEBUG_INFORMATION}" envoy-contrib
}

function run_ci_verify () {
export DOCKER_NO_PULL=1
export DOCKER_RMI_CLEANUP=1
# This is set to simulate an environment where users have shared home drives protected
# by a strong umask (ie only group readable by default).
umask 027
chmod -R o-rwx examples/
"${ENVOY_SRCDIR}/ci/verify_examples.sh" "${@}"
}

CI_TARGET=$1
shift

Expand Down Expand Up @@ -960,7 +950,13 @@ case $CI_TARGET in
;;

verify_examples)
run_ci_verify "*" "win32-front-proxy|shared"
DEV_CONTAINER_ID=$(docker inspect --format='{{.Id}}' envoyproxy/envoy:dev)
bazel run --config=ci \
--action_env="DEV_CONTAINER_ID=${DEV_CONTAINER_ID}" \
--host_action_env="DEV_CONTAINER_ID=${DEV_CONTAINER_ID}" \
--sandbox_writable_path="${HOME}/.docker/" \
--sandbox_writable_path="$HOME" \
@envoy_examples//:verify_examples
;;

verify.trigger)
Expand Down
Loading
Loading