From e4f904d535cb234ae4ffe6ed10ed95f19d9eb9d8 Mon Sep 17 00:00:00 2001 From: phlax Date: Fri, 18 Feb 2022 18:21:32 +0000 Subject: [PATCH 1/5] Backport #20038 to release/v1.21 examples: Fix flask import (#20038) * examples: Fix flask import Signed-off-by: Ryan Northey Signed-off-by: phlax Signed-off-by: Ryan Hamilton rch@google.com --- examples/cache/Dockerfile-service | 4 ++-- examples/cors/backend/Dockerfile-service | 4 ++-- examples/cors/frontend/Dockerfile-service | 4 ++-- examples/csrf/crosssite/Dockerfile-service | 4 ++-- examples/csrf/samesite/Dockerfile-service | 4 ++-- examples/double-proxy/Dockerfile-app | 2 +- examples/ext_authz/upstream/service/Dockerfile | 2 +- examples/front-proxy/Dockerfile-jaeger-service | 4 ++-- examples/front-proxy/Dockerfile-service | 4 ++-- examples/load-reporting-service/Dockerfile-http-server | 3 ++- 10 files changed, 18 insertions(+), 17 deletions(-) diff --git a/examples/cache/Dockerfile-service b/examples/cache/Dockerfile-service index 9cb60da727aea..17174f7fbf57d 100644 --- a/examples/cache/Dockerfile-service +++ b/examples/cache/Dockerfile-service @@ -1,7 +1,7 @@ FROM envoyproxy/envoy-alpine-dev:latest -RUN apk update && apk add py3-pip bash curl -RUN pip3 install -q Flask==0.11.1 requests==2.18.4 pyyaml +RUN apk update && apk add py3-pip +RUN pip3 install -q Flask==2.0.3 pyyaml RUN mkdir /code COPY ./start_service.sh /usr/local/bin/start_service.sh COPY ./service-envoy.yaml /etc/service-envoy.yaml diff --git a/examples/cors/backend/Dockerfile-service b/examples/cors/backend/Dockerfile-service index 0583e9c5846aa..da2fb5685af7e 100644 --- a/examples/cors/backend/Dockerfile-service +++ b/examples/cors/backend/Dockerfile-service @@ -1,7 +1,7 @@ FROM envoyproxy/envoy-alpine-dev:latest -RUN apk update && apk add py3-pip bash -RUN pip3 install -q Flask==0.11.1 +RUN apk update && apk add py3-pip +RUN pip3 install -q Flask==2.0.3 RUN mkdir /code ADD ./service.py /code/ ADD ./start_service.sh /usr/local/bin/start_service.sh diff --git a/examples/cors/frontend/Dockerfile-service b/examples/cors/frontend/Dockerfile-service index 31da7f6febf3d..2ebc1daa8911b 100644 --- a/examples/cors/frontend/Dockerfile-service +++ b/examples/cors/frontend/Dockerfile-service @@ -1,7 +1,7 @@ FROM envoyproxy/envoy-alpine-dev:latest -RUN apk update && apk add py3-pip bash -RUN pip3 install -q Flask==0.11.1 +RUN apk update && apk add py3-pip +RUN pip3 install -q Flask==2.0.3 RUN mkdir /code ADD ./service.py ./index.html /code/ ADD ./start_service.sh /usr/local/bin/start_service.sh diff --git a/examples/csrf/crosssite/Dockerfile-service b/examples/csrf/crosssite/Dockerfile-service index ed8cdfdfb5803..9f4270b3d2c3b 100644 --- a/examples/csrf/crosssite/Dockerfile-service +++ b/examples/csrf/crosssite/Dockerfile-service @@ -1,7 +1,7 @@ FROM envoyproxy/envoy-alpine-dev:latest -RUN apk update && apk add py3-pip bash -RUN pip3 install -q Flask==0.11.1 +RUN apk update && apk add py3-pip +RUN pip3 install -q Flask==2.0.3 RUN mkdir /code ADD ./crosssite/service.py ./index.html /code/ ADD ./start_service.sh /usr/local/bin/start_service.sh diff --git a/examples/csrf/samesite/Dockerfile-service b/examples/csrf/samesite/Dockerfile-service index 3a78e72af04e8..a469b87e10c2f 100644 --- a/examples/csrf/samesite/Dockerfile-service +++ b/examples/csrf/samesite/Dockerfile-service @@ -1,7 +1,7 @@ FROM envoyproxy/envoy-alpine-dev:latest -RUN apk update && apk add py3-pip bash -RUN pip3 install -q Flask==0.11.1 +RUN apk update && apk add py3-pip +RUN pip3 install -q Flask==2.0.3 RUN mkdir /code ADD ./samesite/service.py ./index.html /code/ ADD ./start_service.sh /usr/local/bin/start_service.sh diff --git a/examples/double-proxy/Dockerfile-app b/examples/double-proxy/Dockerfile-app index f843db1f8a53a..0e6f664dc63e5 100644 --- a/examples/double-proxy/Dockerfile-app +++ b/examples/double-proxy/Dockerfile-app @@ -1,7 +1,7 @@ FROM python:3.8-alpine RUN apk update && apk add postgresql-dev gcc python3-dev musl-dev -RUN pip3 install -q Flask==0.11.1 requests==2.18.4 psycopg2-binary +RUN pip3 install -q Flask==2.0.3 requests==2.18.4 psycopg2-binary RUN mkdir /code ADD ./service.py /code ENTRYPOINT ["python3", "/code/service.py"] diff --git a/examples/ext_authz/upstream/service/Dockerfile b/examples/ext_authz/upstream/service/Dockerfile index 5f70f40aca7c6..9cd53e82641de 100644 --- a/examples/ext_authz/upstream/service/Dockerfile +++ b/examples/ext_authz/upstream/service/Dockerfile @@ -1,5 +1,5 @@ FROM python:3-alpine -RUN pip3 install -q Flask==0.11.1 +RUN pip3 install -q Flask==2.0.3 COPY . ./app CMD ["python3", "/app/service/server.py"] diff --git a/examples/front-proxy/Dockerfile-jaeger-service b/examples/front-proxy/Dockerfile-jaeger-service index 8c3fe1bd42761..13c0590644fca 100644 --- a/examples/front-proxy/Dockerfile-jaeger-service +++ b/examples/front-proxy/Dockerfile-jaeger-service @@ -1,7 +1,7 @@ FROM envoyproxy/envoy-alpine-dev:latest -RUN apk update && apk add py3-pip bash curl -RUN pip3 install -q Flask==0.11.1 requests==2.18.4 +RUN apt-get update && apt-get -q install --no-install-recommends -y python3-pip curl +RUN pip3 install -q Flask==2.0.3 requests==2.18.4 RUN mkdir /code ADD ./service.py /code ADD ./start_service.sh /usr/local/bin/start_service.sh diff --git a/examples/front-proxy/Dockerfile-service b/examples/front-proxy/Dockerfile-service index 0c2ae43024fa2..896ad3a681deb 100644 --- a/examples/front-proxy/Dockerfile-service +++ b/examples/front-proxy/Dockerfile-service @@ -1,7 +1,7 @@ FROM envoyproxy/envoy-alpine-dev:latest -RUN apk update && apk add py3-pip bash curl -RUN pip3 install -q Flask==0.11.1 requests==2.18.4 +RUN apt-get update && apt-get -q install --no-install-recommends -y python3-pip curl +RUN pip3 install -q Flask==2.0.3 requests==2.18.4 RUN mkdir /code ADD ./service.py /code ADD ./start_service.sh /usr/local/bin/start_service.sh diff --git a/examples/load-reporting-service/Dockerfile-http-server b/examples/load-reporting-service/Dockerfile-http-server index e71aa6b754686..1e7d95d7523ab 100644 --- a/examples/load-reporting-service/Dockerfile-http-server +++ b/examples/load-reporting-service/Dockerfile-http-server @@ -1,6 +1,7 @@ FROM envoyproxy/envoy-alpine-dev:latest -RUN apk update && apk add py3-pip bash curl +RUN apk update && apk add py3-pip +RUN pip3 install -q Flask==2.0.3 RUN mkdir /code ADD ./start_service.sh /usr/local/bin/start_service.sh COPY . ./code From 6e98ce5f8e7bc14b8324dd100b7d311296e462dd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 24 Feb 2022 18:56:33 +0000 Subject: [PATCH 2/5] Backport #20107 to release/v1.21 build(deps): bump github/codeql-action from 1.1.2 to 1.1.3 (#20107) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 1.1.2 to 1.1.3. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/d39d5d5c9707b926d517b1b292905ef4c03aa777...75f07e7ab2ee63cba88752d8c696324e4df67466) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Signed-off-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Signed-off-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Signed-off-by: Ryan Hamilton Signed-off-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-daily.yml | 6 +++++- .github/workflows/codeql-push.yml | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codeql-daily.yml b/.github/workflows/codeql-daily.yml index 00707a85782ac..66d7daa4f625e 100644 --- a/.github/workflows/codeql-daily.yml +++ b/.github/workflows/codeql-daily.yml @@ -26,7 +26,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v1 + uses: github/codeql-action/init@75f07e7ab2ee63cba88752d8c696324e4df67466 # Override language selection by uncommenting this and choosing your languages with: languages: cpp @@ -52,4 +52,8 @@ jobs: git clean -xdf - name: Perform CodeQL Analysis +<<<<<<< HEAD uses: github/codeql-action/analyze@v1 +======= + uses: github/codeql-action/analyze@75f07e7ab2ee63cba88752d8c696324e4df67466 +>>>>>>> 60bcb1fb3f (Backport #20107 to release/v1.21) diff --git a/.github/workflows/codeql-push.yml b/.github/workflows/codeql-push.yml index 56254401e418f..56730b2a4c59c 100644 --- a/.github/workflows/codeql-push.yml +++ b/.github/workflows/codeql-push.yml @@ -34,7 +34,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v1 + uses: github/codeql-action/init@75f07e7ab2ee63cba88752d8c696324e4df67466 # Override language selection by uncommenting this and choosing your languages with: languages: cpp @@ -63,4 +63,8 @@ jobs: - name: Perform CodeQL Analysis if: env.BUILD_TARGETS != '' +<<<<<<< HEAD uses: github/codeql-action/analyze@v1 +======= + uses: github/codeql-action/analyze@75f07e7ab2ee63cba88752d8c696324e4df67466 +>>>>>>> 60bcb1fb3f (Backport #20107 to release/v1.21) From ffe82b1334a303d37c92ab7c4a5d9e90ed138107 Mon Sep 17 00:00:00 2001 From: Lizan Zhou Date: Thu, 3 Feb 2022 13:45:38 -0800 Subject: [PATCH 3/5] ci: not using alpine image in examples (#19805) Signed-off-by: Lizan Zhou Signed-off-by: Ryan Hamilton --- examples/front-proxy/Dockerfile-jaeger-service | 2 +- examples/front-proxy/Dockerfile-service | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/front-proxy/Dockerfile-jaeger-service b/examples/front-proxy/Dockerfile-jaeger-service index 13c0590644fca..e8bc362aca66a 100644 --- a/examples/front-proxy/Dockerfile-jaeger-service +++ b/examples/front-proxy/Dockerfile-jaeger-service @@ -1,4 +1,4 @@ -FROM envoyproxy/envoy-alpine-dev:latest +FROM envoyproxy/envoy-dev:latest RUN apt-get update && apt-get -q install --no-install-recommends -y python3-pip curl RUN pip3 install -q Flask==2.0.3 requests==2.18.4 diff --git a/examples/front-proxy/Dockerfile-service b/examples/front-proxy/Dockerfile-service index 896ad3a681deb..86fdf2b667b4a 100644 --- a/examples/front-proxy/Dockerfile-service +++ b/examples/front-proxy/Dockerfile-service @@ -1,4 +1,4 @@ -FROM envoyproxy/envoy-alpine-dev:latest +FROM envoyproxy/envoy-dev:latest RUN apt-get update && apt-get -q install --no-install-recommends -y python3-pip curl RUN pip3 install -q Flask==2.0.3 requests==2.18.4 From 049fee909bbc127338c6dc99f37a10960df8056a Mon Sep 17 00:00:00 2001 From: Ryan Hamilton Date: Fri, 4 Mar 2022 23:10:15 +0000 Subject: [PATCH 4/5] Fix merge conflicts Signed-off-by: Ryan Hamilton --- .github/workflows/codeql-daily.yml | 4 ---- .github/workflows/codeql-push.yml | 4 ---- examples/load-reporting-service/Dockerfile-http-server | 2 -- 3 files changed, 10 deletions(-) diff --git a/.github/workflows/codeql-daily.yml b/.github/workflows/codeql-daily.yml index 66d7daa4f625e..d89a3afaee4ed 100644 --- a/.github/workflows/codeql-daily.yml +++ b/.github/workflows/codeql-daily.yml @@ -52,8 +52,4 @@ jobs: git clean -xdf - name: Perform CodeQL Analysis -<<<<<<< HEAD - uses: github/codeql-action/analyze@v1 -======= uses: github/codeql-action/analyze@75f07e7ab2ee63cba88752d8c696324e4df67466 ->>>>>>> 60bcb1fb3f (Backport #20107 to release/v1.21) diff --git a/.github/workflows/codeql-push.yml b/.github/workflows/codeql-push.yml index 56730b2a4c59c..b38360ecda945 100644 --- a/.github/workflows/codeql-push.yml +++ b/.github/workflows/codeql-push.yml @@ -63,8 +63,4 @@ jobs: - name: Perform CodeQL Analysis if: env.BUILD_TARGETS != '' -<<<<<<< HEAD - uses: github/codeql-action/analyze@v1 -======= uses: github/codeql-action/analyze@75f07e7ab2ee63cba88752d8c696324e4df67466 ->>>>>>> 60bcb1fb3f (Backport #20107 to release/v1.21) diff --git a/examples/load-reporting-service/Dockerfile-http-server b/examples/load-reporting-service/Dockerfile-http-server index 1e7d95d7523ab..cc1f983020b6b 100644 --- a/examples/load-reporting-service/Dockerfile-http-server +++ b/examples/load-reporting-service/Dockerfile-http-server @@ -6,7 +6,5 @@ RUN mkdir /code ADD ./start_service.sh /usr/local/bin/start_service.sh COPY . ./code -RUN pip3 install -q Flask==0.11.1 - RUN chmod u+x /usr/local/bin/start_service.sh ENTRYPOINT ["/bin/sh", "/usr/local/bin/start_service.sh"] From 52bc5c6b90b14c1fffbc69516e34113251cd70f9 Mon Sep 17 00:00:00 2001 From: Snow Pettersen Date: Fri, 30 Jul 2021 17:06:15 -0400 Subject: [PATCH 5/5] examples: pin version of go-control-plane (#17553) Signed-off-by: Snow Pettersen Signed-off-by: Ryan Hamilton --- examples/dynamic-config-cp/Dockerfile-control-plane | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/dynamic-config-cp/Dockerfile-control-plane b/examples/dynamic-config-cp/Dockerfile-control-plane index 3c5bd17826ef5..c9e5ac48359b3 100644 --- a/examples/dynamic-config-cp/Dockerfile-control-plane +++ b/examples/dynamic-config-cp/Dockerfile-control-plane @@ -3,5 +3,5 @@ FROM golang RUN apt-get -y update && apt-get install -y -qq --no-install-recommends netcat RUN git clone https://github.com/envoyproxy/go-control-plane ADD ./resource.go /go/go-control-plane/internal/example/resource.go -RUN cd go-control-plane && make bin/example +RUN cd go-control-plane && git checkout b4adc3bb5fe5288bff01cd452dad418ef98c676e && make bin/example WORKDIR /go/go-control-plane