Skip to content

Commit

Permalink
Merge branch 'master' of github.com:emissary-ingress/emissary into dc…
Browse files Browse the repository at this point in the history
…amata/remote-control-rollouts
  • Loading branch information
Douglas Camata committed Feb 3, 2022
2 parents a5a26f0 + 46c2044 commit 9c07c67
Show file tree
Hide file tree
Showing 51 changed files with 2,342 additions and 611 deletions.
35 changes: 0 additions & 35 deletions .github/workflows/execute-chart-test.yml

This file was deleted.

52 changes: 49 additions & 3 deletions .github/workflows/execute-tests-and-promote.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: job-promote-to-passed

on:
"on":
push:
branches:
- master
Expand All @@ -11,6 +11,9 @@ jobs:

lint: ########################################################################
runs-on: ubuntu-latest
env:
# See docker/base-python.docker.gen
BASE_PYTHON_REPO: ${{ secrets.BASE_PYTHON_REPO }}
steps:
- uses: actions/checkout@v2
with:
Expand All @@ -24,8 +27,8 @@ jobs:
generate: ####################################################################
runs-on: ubuntu-latest
env:
# Set DEV_REGISTRY to match BASE_REGISTRY.
DEV_REGISTRY: "docker.io/emissaryingress"
# See docker/base-python.docker.gen
BASE_PYTHON_REPO: ${{ secrets.BASE_PYTHON_REPO }}
steps:
- uses: actions/checkout@v2
with:
Expand All @@ -52,6 +55,9 @@ jobs:

check-envoy-version: #########################################################
runs-on: ubuntu-latest
env:
# See docker/base-python.docker.gen
BASE_PYTHON_REPO: ${{ secrets.BASE_PYTHON_REPO }}
steps:
- uses: actions/checkout@v2
with:
Expand All @@ -63,6 +69,9 @@ jobs:
# Tests ######################################################################
check-gotest:
runs-on: ubuntu-latest
env:
# See docker/base-python.docker.gen
BASE_PYTHON_REPO: ${{ secrets.BASE_PYTHON_REPO }}
steps:
- uses: actions/checkout@v2
with:
Expand Down Expand Up @@ -90,6 +99,9 @@ jobs:
name: "Collect testing logs"
check-pytest:
runs-on: ubuntu-latest
env:
# See docker/base-python.docker.gen
BASE_PYTHON_REPO: ${{ secrets.BASE_PYTHON_REPO }}
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -147,6 +159,9 @@ jobs:
# pytest-unit is separate from pytests (above) because we know for certain that no cluster is needed.
# XXX This is pretty much a crock.
runs-on: ubuntu-latest
env:
# See docker/base-python.docker.gen
BASE_PYTHON_REPO: ${{ secrets.BASE_PYTHON_REPO }}
strategy:
matrix:
test:
Expand Down Expand Up @@ -185,6 +200,34 @@ jobs:
- uses: ./.github/actions/collect-testing-logs
if: always()
name: "Collect testing logs"
check-chart:
runs-on: ubuntu-latest
name: chart-test
env:
AWS_S3_BUCKET: ${{ secrets.AWS_S3_BUCKET }}
AWS_ACCESS_KEY_ID: ${{ secrets.GH_AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.GH_AWS_SECRET_ACCESS_KEY }}
AWS_EC2_METADATA_DISABLED: true
DEV_REGISTRY: ${{ secrets.DEV_REGISTRY }}
# See docker/base-python.docker.gen
BASE_PYTHON_REPO: ${{ secrets.BASE_PYTHON_REPO }}
steps:
- uses: docker/login-action@v1
with:
username: ${{ secrets.GH_DOCKER_BUILD_USERNAME }}
password: ${{ secrets.GH_DOCKER_BUILD_TOKEN }}
- uses: actions/checkout@v2
with:
fetch-depth: 0
ref: ${{ github.event.pull_request.head.sha }}
- name: Install Deps
uses: ./.github/actions/setup-deps
- name: make test-chart
run: |
make test-chart
- name: make release/promote-chart-passed
run: |
make release/promote-chart-passed
build: #######################################################################
runs-on: ubuntu-latest
Expand All @@ -194,6 +237,8 @@ jobs:
AWS_EC2_METADATA_DISABLED: true
AWS_S3_BUCKET: ${{ secrets.AWS_S3_BUCKET }}
DEV_REGISTRY: ${{ secrets.DEV_REGISTRY }}
# See docker/base-python.docker.gen
BASE_PYTHON_REPO: ${{ secrets.BASE_PYTHON_REPO }}
steps:
- uses: actions/checkout@v2
with:
Expand Down Expand Up @@ -228,6 +273,7 @@ jobs:
- check-gotest
- check-pytest
- check-pytest-unit
- check-chart
runs-on: ubuntu-latest
env:
AWS_ACCESS_KEY_ID: ${{ secrets.GH_AWS_ACCESS_KEY_ID }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/promote-ga.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: promote-to-ga
on:
"on":
push:
tags:
- 'v[0-9]+.[0-9]+.[0-9]+'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/promote-rc.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: promote-to-rc
on:
"on":
push:
tags:
- 'v[0-9]+.[0-9]+.[0-9]+-rc.[0-9]+'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-chart.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: chart-publish
on:
"on":
push:
tags:
- 'chart/v*'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-manifests.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: manifest-publish
on:
"on":
push:
tags:
- 'chart/v*'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/repatriate.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: repatriate
on:
"on":
push:
branches:
- release/v*
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,9 @@ Please see the [Envoy documentation](https://www.envoyproxy.io/docs/envoy/latest
to Ambassador's cloud including the command ID, whether it ran successfully, and an error message
in case there was any. ([4040])

- Security: Emissary has been upgraded from Alpine 3.12 to Alpine 3.15, which incorporates numerous
security patches.

[3906]: https://github.com/emissary-ingress/emissary/issues/3906
[3821]: https://github.com/emissary-ingress/emissary/issues/3821
[4040]: https://github.com/emissary-ingress/emissary/pull/4040
Expand Down
13 changes: 4 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ ifneq ($(MAKECMDGOALS),$(OSS_HOME)/build-aux/go-version.txt)
$(info [make] CHART_VERSION=$(CHART_VERSION))
endif

# If SOURCE_DATE_EPOCH isn't set, AND the tree isn't dirty, then set
# SOURCE_DATE_EPOCH to the commit timestamp.
#
# if [[ -z "$SOURCE_DATE_EPOCH" ]] && [[ -z "$(git status --porcelain)" ]]; then
ifeq ($(SOURCE_DATE_EPOCH)$(shell git status --porcelain),)
SOURCE_DATE_EPOCH := $(shell git log -1 --pretty=%ct)
endif
Expand All @@ -43,15 +47,6 @@ endif

# Everything else...

# BASE_REGISTRY is where the base images (as in
# `builder/Dockerfile.base`) get pulled-from/pushed-to. We default
# this to docker.io/emissaryingress rather than to $(DEV_REGISTRY) or
# to a .local registry because rebuilding orjson takes so long, we
# really want to cache it unless the dev really wants to force doing
# everything locally.
BASE_REGISTRY ?= docker.io/emissaryingress
export BASE_REGISTRY

NAME ?= emissary
_git_remote_urls := $(shell git remote | xargs -n1 git remote get-url --all)
IS_PRIVATE ?= $(findstring private,$(_git_remote_urls))
Expand Down
128 changes: 63 additions & 65 deletions OPENSOURCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -129,68 +129,66 @@ following Free and Open Source software:
The Emissary-ingress Python code makes use of the following Free and Open Source
libraries:

Name Version License(s)
---- ------- ----------
CacheControl 0.12.6 Apache License 2.0
Cython 0.29.19 Apache License 2.0
Flask 2.0.2 3-clause BSD license
Jinja2 3.0.3 3-clause BSD license
MarkupSafe 2.0.1 3-clause BSD license
PyYAML 5.4.1 MIT license
Werkzeug 2.0.2 3-clause BSD license
appdirs 1.4.4 MIT license
attrs 19.3.0 MIT license
cachetools 4.1.1 MIT license
certifi 2020.6.20 Mozilla Public License 2.0
charset-normalizer 2.0.8 MIT license
click 8.0.3 3-clause BSD license
clize 4.2.1 MIT license
colorama 0.4.3 3-clause BSD license
contextlib2 0.6.0 Python Software Foundation license
distlib 0.3.0 Python Software Foundation license
distro 1.5.0 Apache License 2.0
docutils 0.17.1 2-clause BSD license, GNU General Public License Version 3, Public domain, Python Software Foundation license
durationpy 0.5 MIT license
expiringdict 1.2.1 Apache License 2.0
google-auth 1.23.0 Apache License 2.0
gunicorn 20.1.0 MIT license
html5lib 1.0.1 MIT license
idna 2.7 3-clause BSD license, Python Software Foundation license, Unicode License Agreement for Data Files and Software (2015)
importlib-resources 5.4.0 Apache License 2.0
itsdangerous 2.0.1 3-clause BSD license
jsonpatch 1.32 3-clause BSD license
jsonpointer 2.0 3-clause BSD license
jsonschema 4.2.1 MIT license
k8s-proto 0.0.3 Apache License 2.0
kubernetes 20.13.0 Apache License 2.0
lockfile 0.12.2 MIT license
msgpack 1.0.0 Apache License 2.0
oauthlib 3.1.0 3-clause BSD license
od 1.0 MIT license
ordered-set 4.0.1 MIT license
orjson 3.3.1 Apache License 2.0, MIT license
packaging 20.4 2-clause BSD license, Apache License 2.0
pep517 0.8.2 MIT license
pip-tools 5.3.1 3-clause BSD license
progress 1.5 ISC license
prometheus-client 0.12.0 Apache License 2.0
protobuf 3.13.0 3-clause BSD license
pyasn1 0.4.8 2-clause BSD license
pyasn1-modules 0.2.8 2-clause BSD license
pyparsing 2.4.7 MIT license
pyrsistent 0.17.3 MIT license
python-dateutil 2.8.1 3-clause BSD license, Apache License 2.0
python-json-logger 2.0.2 2-clause BSD license
pytoml 0.1.21 MIT license
requests 2.26.0 Apache License 2.0
requests-oauthlib 1.3.0 ISC license
retrying 1.3.3 Apache License 2.0
rsa 4.6 Apache License 2.0
semantic-version 2.8.5 2-clause BSD license
sigtools 2.0.2 MIT license
six 1.15.0 MIT license
toml 0.10.1 MIT license
urllib3 1.26.5 MIT license
webencodings 0.5.1 3-clause BSD license
websocket-client 0.57.0 3-clause BSD license
zipp 3.6.0 MIT license
Name Version License(s)
---- ------- ----------
CacheControl 0.12.10 Apache License 2.0
Cython 0.29.24 Apache License 2.0
Flask 2.0.2 3-clause BSD license
Jinja2 3.0.3 3-clause BSD license
MarkupSafe 2.0.1 3-clause BSD license
PyYAML 5.4.1 MIT license
Werkzeug 2.0.2 3-clause BSD license
appdirs 1.4.4 MIT license
attrs 19.3.0 MIT license
cachetools 4.1.1 MIT license
certifi 2020.6.20 Mozilla Public License 2.0
charset-normalizer 2.0.8 MIT license
click 8.0.3 3-clause BSD license
clize 4.2.1 MIT license
colorama 0.4.4 3-clause BSD license
contextlib2 21.6.0 Python Software Foundation license
distlib 0.3.3 Python Software Foundation license
distro 1.6.0 Apache License 2.0
docutils 0.17.1 2-clause BSD license, GNU General Public License Version 3, Public domain, Python Software Foundation license
durationpy 0.5 MIT license
expiringdict 1.2.1 Apache License 2.0
google-auth 1.23.0 Apache License 2.0
gunicorn 20.1.0 MIT license
html5lib 1.1 MIT license
idna 2.7 3-clause BSD license, Python Software Foundation license, Unicode License Agreement for Data Files and Software (2015)
itsdangerous 2.0.1 3-clause BSD license
jsonpatch 1.32 3-clause BSD license
jsonpointer 2.0 3-clause BSD license
jsonschema 4.2.1 MIT license
k8s-proto 0.0.3 Apache License 2.0
kubernetes 20.13.0 Apache License 2.0
lockfile 0.12.2 MIT license
msgpack 1.0.2 Apache License 2.0
oauthlib 3.1.0 3-clause BSD license
od 1.0 MIT license
ordered-set 4.0.2 MIT license
orjson 3.6.6 Apache License 2.0, MIT license
packaging 20.9 2-clause BSD license, Apache License 2.0
pep517 0.12.0 MIT license
pip-tools 6.3.1 3-clause BSD license
progress 1.6 ISC license
prometheus-client 0.12.0 Apache License 2.0
protobuf 3.13.0 3-clause BSD license
pyasn1 0.4.8 2-clause BSD license
pyasn1-modules 0.2.8 2-clause BSD license
pyparsing 2.4.7 MIT license
pyrsistent 0.17.3 MIT license
python-dateutil 2.8.1 3-clause BSD license, Apache License 2.0
python-json-logger 2.0.2 2-clause BSD license
requests 2.26.0 Apache License 2.0
requests-oauthlib 1.3.0 ISC license
retrying 1.3.3 Apache License 2.0
rsa 4.6 Apache License 2.0
semantic-version 2.8.5 2-clause BSD license
sigtools 2.0.2 MIT license
six 1.16.0 MIT license
toml 0.10.2 MIT license
tomli 1.2.2 MIT license
urllib3 1.26.5 MIT license
webencodings 0.5.1 3-clause BSD license
websocket-client 0.57.0 3-clause BSD license
Loading

0 comments on commit 9c07c67

Please sign in to comment.