Skip to content

Commit

Permalink
Merge pull request #962 from seriva/0.5.3-reverse-merge
Browse files Browse the repository at this point in the history
0.5.3 reverse merge
  • Loading branch information
seriva authored Mar 4, 2020
2 parents 265c5db + d508b0d commit f00dc45
Show file tree
Hide file tree
Showing 39 changed files with 1,954 additions and 2,996 deletions.
31 changes: 24 additions & 7 deletions CHANGELOG-0.5.md
Original file line number Diff line number Diff line change
@@ -1,22 +1,39 @@
# Changelog 0.5

## [0.5.3] 2020-xx-xx

### Added

- Upgraded Epicli container and devcontainer from `python3.7-alpine` to `python:3.7-slim`

### Fixed

- [#940](https://github.com/epiphany-platform/epiphany/issues/940) - Epicli init does not include any infrastructure documents
- [#611](https://github.com/epiphany-platform/epiphany/issues/611) - Lack of configuration/rabbitmq and configuration/postgresql after running epicli init --full
- [#736](https://github.com/epiphany-platform/epiphany/issues/736) - Running epicli init -p any --full generates cloud sample configuration instead of bare metal config
- [#942](https://github.com/epiphany-platform/epiphany/issues/942) - Additional security rules for NSGs are not applied properly for Azure
- [#951](https://github.com/epiphany-platform/epiphany/issues/951) - Fix PGBouncer to use v1.10 for all platforms
- [#945](https://github.com/epiphany-platform/epiphany/issues/945) - Disable NSG creation on Azure
- Fix for [CVE-2019-14864](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-14864)

## [0.5.2] 2020-02-17

### Added

- PostgreSQL: PGBouncer implementation [#854](https://github.com/epiphany-platform/epiphany/issues/854)
- PostgreSQL: pgAudit extension for audit logging [#905](https://github.com/epiphany-platform/epiphany/pull/905)
- [#854](https://github.com/epiphany-platform/epiphany/issues/854) - PostgreSQL: PGBouncer implementation
- [#905](https://github.com/epiphany-platform/epiphany/pull/905) - PostgreSQL: pgAudit extension for audit logging
- PostgreSQL: Send logs to Elasticsearch
- PostgreSQL: Add logrotate configuration [#915](https://github.com/epiphany-platform/epiphany/pull/915)
- [#915](https://github.com/epiphany-platform/epiphany/pull/915) - PostgreSQL: Add logrotate configuration

### Fixed

- Open Distro for Elasticsearch: Task 'Install Elasticsearch package' fails [#906](https://github.com/epiphany-platform/epiphany/issues/906)
- Upgrade: Missing property 'name' when running epicli upgrade [#909](https://github.com/epiphany-platform/epiphany/issues/909)
- Common: Issue installing Debian packages [#869](https://github.com/epiphany-platform/epiphany/issues/869)
- [#906](https://github.com/epiphany-platform/epiphany/issues/906) - Open Distro for Elasticsearch: Task 'Install Elasticsearch package' fails
- [#909](https://github.com/epiphany-platform/epiphany/issues/909) - Upgrade: Missing property 'name' when running epicli upgrade
- [#869](https://github.com/epiphany-platform/epiphany/issues/869) - Common: Issue installing Debian packages

### Known issues
- Elasticsearch service not starting on RHEL after running epicli upgrade command [#922](https://github.com/epiphany-platform/epiphany/issues/922)

- [#922](https://github.com/epiphany-platform/epiphany/issues/922) - Elasticsearch service not starting on RHEL after running epicli upgrade command

## [0.5.1] 2020-01-23

Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ Reference for actual cluster component versions can be found [here](docs/home/CO

### 0.5.x

- [CHANGELOG-0.5.3](./CHANGELOG-0.5.md#051-2020-xx-xx)
- [CHANGELOG-0.5.2](./CHANGELOG-0.5.md#051-2020-02-17)
- [CHANGELOG-0.5.1](./CHANGELOG-0.5.md#051-2020-01-23)
- [CHANGELOG-0.5.0](./CHANGELOG-0.5.md#050-2020-01-17)

Expand Down
23 changes: 16 additions & 7 deletions core/src/epicli/.devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
FROM python:3.7
FROM python:3.7-slim

ENV DEBIAN_FRONTEND=noninteractive

ARG USERNAME=vscode
ARG USER_UID=1000
ARG USER_GID=$USER_UID

RUN apt-get update \
COPY cert/cert.md cert/*.crt /usr/local/share/ca-certificates/
COPY cert/config-pre.sh /
COPY cert/config-post.sh /
COPY requirements.txt /

RUN chmod +x /config-pre.sh \
&& /bin/bash -c /config-pre.sh \

&& apt-get update \
&& apt-get -y install --no-install-recommends apt-utils dialog 2>&1 \

&& apt-get -y install git procps lsb-release gcc make musl-dev libffi-dev tar unzip \
Expand All @@ -15,9 +23,9 @@ RUN apt-get update \

&& gem install serverspec rake rspec_junit_formatter \

&& pip --disable-pip-version-check --no-cache-dir install pylint \
&& pip --disable-pip-version-check --no-cache-dir install pylint pytest wheel setuptools twine --default-timeout=100 \

&& pip --disable-pip-version-check --no-cache-dir install pipenv \
&& pip --disable-pip-version-check --no-cache-dir install -r /requirements.txt --default-timeout=100 \

&& groupadd --gid $USER_GID $USERNAME \
&& useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \
Expand All @@ -28,8 +36,9 @@ RUN apt-get update \

&& apt-get autoremove -y \
&& apt-get clean -y \
&& rm -rf /var/lib/apt/lists/*

ENV DEBIAN_FRONTEND=
&& rm -rf /var/lib/apt/lists/* \

&& chmod +x /config-post.sh \
&& /bin/bash -c /config-post.sh

ENV DEBIAN_FRONTEND=
4 changes: 4 additions & 0 deletions core/src/epicli/.devcontainer/cert/cert.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Custom CA certificate

In this folder you can place a CA certificate which will be installed in the devcontainer.
It can have any name but it needs to have the crt extension.
13 changes: 13 additions & 0 deletions core/src/epicli/.devcontainer/cert/config-post.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#!/bin/bash
if ls /usr/local/share/ca-certificates/*.crt 1> /dev/null 2>&1; then
echo "Setup cert for Ansible, AWS..."
pattern="/usr/local/share/ca-certificates/*.crt"
files=( $pattern )
f="${files[0]}"
mkdir "/home/vscode/.aws/"
echo -e "[defaults]\ntimeout=0" >> "/home/vscode/.ansible.cfg"
echo -e "[default]\nca_bundle=$f" >> "/home/vscode/.aws/config"
else
echo "No cert to setup"
fi

15 changes: 15 additions & 0 deletions core/src/epicli/.devcontainer/cert/config-pre.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
#!/bin/bash
if ls /usr/local/share/ca-certificates/*.crt 1> /dev/null 2>&1; then
echo "Setup cert for System, PIP..."
pattern="/usr/local/share/ca-certificates/*.crt"
files=( $pattern )
f="${files[0]}"
echo "Processing cert $f"
chmod 644 $f
pip config set global.cert $f
pip config list
update-ca-certificates
else
echo "No cert to setup"
fi

1 change: 0 additions & 1 deletion core/src/epicli/.devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,5 @@
"settings": {
"python.pythonPath": "/usr/local/bin/python"
},
"postCreateCommand": "sudo --preserve-env=https_proxy pipenv install --system --dev",
"runArgs": [ "-u", "vscode" ]
}
214 changes: 214 additions & 0 deletions core/src/epicli/.devcontainer/requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,214 @@
adal==1.2.2
ansible==2.8.8
antlr4-python3-runtime==4.7.2
applicationinsights==0.11.7
argcomplete==1.10.0
astroid==2.3.3
attrs==19.3.0
azure-batch==6.0.0
azure-cli==2.0.67
azure-cli-acr==2.2.9
azure-cli-acs==2.4.4
azure-cli-advisor==2.0.1
azure-cli-ams==0.4.7
azure-cli-appservice==0.2.21
azure-cli-backup==1.2.5
azure-cli-batch==4.0.3
azure-cli-batchai==0.4.10
azure-cli-billing==0.2.2
azure-cli-botservice==0.2.2
azure-cli-cdn==0.2.4
azure-cli-cloud==2.1.1
azure-cli-cognitiveservices==0.2.6
azure-cli-command-modules-nspkg==2.0.2
azure-cli-configure==2.0.24
azure-cli-consumption==0.4.4
azure-cli-container==0.3.18
azure-cli-core==2.0.67
azure-cli-cosmosdb==0.2.11
azure-cli-deploymentmanager==0.1.1
azure-cli-dla==0.2.6
azure-cli-dls==0.1.10
azure-cli-dms==0.1.4
azure-cli-eventgrid==0.2.4
azure-cli-eventhubs==0.3.7
azure-cli-extension==0.2.5
azure-cli-feedback==2.2.1
azure-cli-find==0.3.4
azure-cli-hdinsight==0.3.5
azure-cli-interactive==0.4.5
azure-cli-iot==0.3.11
azure-cli-iotcentral==0.1.7
azure-cli-keyvault==2.2.16
azure-cli-kusto==0.2.3
azure-cli-lab==0.1.8
azure-cli-maps==0.3.5
azure-cli-monitor==0.2.15
azure-cli-natgateway==0.1.1
azure-cli-network==2.5.2
azure-cli-nspkg==3.0.3
azure-cli-policyinsights==0.1.4
azure-cli-privatedns==1.0.2
azure-cli-profile==2.1.5
azure-cli-rdbms==0.3.12
azure-cli-redis==0.4.4
azure-cli-relay==0.1.5
azure-cli-reservations==0.4.3
azure-cli-resource==2.1.16
azure-cli-role==2.6.4
azure-cli-search==0.1.2
azure-cli-security==0.1.2
azure-cli-servicebus==0.3.6
azure-cli-servicefabric==0.1.20
azure-cli-signalr==1.0.1
azure-cli-sql==2.2.5
azure-cli-sqlvm==0.2.0
azure-cli-storage==2.4.3
azure-cli-telemetry==1.0.2
azure-cli-vm==2.2.23
azure-common==1.1.23
azure-cosmos==3.1.2
azure-datalake-store==0.0.39
azure-functions-devops-build==0.0.22
azure-graphrbac==0.60.0
azure-keyvault==1.1.0
azure-mgmt-advisor==2.0.1
azure-mgmt-applicationinsights==0.1.1
azure-mgmt-authorization==0.50.0
azure-mgmt-batch==6.0.0
azure-mgmt-batchai==2.0.0
azure-mgmt-billing==0.2.0
azure-mgmt-botservice==0.2.0
azure-mgmt-cdn==3.1.0
azure-mgmt-cognitiveservices==3.0.0
azure-mgmt-compute==5.0.0
azure-mgmt-consumption==2.0.0
azure-mgmt-containerinstance==1.4.0
azure-mgmt-containerregistry==2.8.0
azure-mgmt-containerservice==5.2.0
azure-mgmt-cosmosdb==0.6.1
azure-mgmt-datalake-analytics==0.2.1
azure-mgmt-datalake-nspkg==3.0.1
azure-mgmt-datalake-store==0.5.0
azure-mgmt-datamigration==0.1.0
azure-mgmt-deploymentmanager==0.1.0
azure-mgmt-devtestlabs==2.2.0
azure-mgmt-dns==2.1.0
azure-mgmt-eventgrid==2.2.0
azure-mgmt-eventhub==2.6.0
azure-mgmt-hdinsight==0.2.1
azure-mgmt-imagebuilder==0.2.1
azure-mgmt-iotcentral==1.0.0
azure-mgmt-iothub==0.8.2
azure-mgmt-iothubprovisioningservices==0.2.0
azure-mgmt-keyvault==1.1.0
azure-mgmt-kusto==0.3.0
azure-mgmt-loganalytics==0.2.0
azure-mgmt-managementgroups==0.1.0
azure-mgmt-maps==0.1.0
azure-mgmt-marketplaceordering==0.1.0
azure-mgmt-media==1.1.1
azure-mgmt-monitor==0.5.2
azure-mgmt-msi==0.2.0
azure-mgmt-network==3.0.0
azure-mgmt-nspkg==3.0.2
azure-mgmt-policyinsights==0.3.1
azure-mgmt-privatedns==0.1.0
azure-mgmt-rdbms==1.8.0
azure-mgmt-recoveryservices==0.1.1
azure-mgmt-recoveryservicesbackup==0.1.2
azure-mgmt-redis==6.0.0
azure-mgmt-relay==0.1.0
azure-mgmt-reservations==0.3.1
azure-mgmt-resource==2.1.0
azure-mgmt-search==2.0.0
azure-mgmt-security==0.1.0
azure-mgmt-servicebus==0.6.0
azure-mgmt-servicefabric==0.2.0
azure-mgmt-signalr==0.1.1
azure-mgmt-sql==0.12.0
azure-mgmt-sqlvirtualmachine==0.3.0
azure-mgmt-storage==3.3.0
azure-mgmt-trafficmanager==0.51.0
azure-mgmt-web==0.42.0
azure-multiapi-storage==0.2.3
azure-nspkg==3.0.2
azure-storage-blob==1.3.1
azure-storage-common==1.4.2
azure-storage-nspkg==3.1.0
bcrypt==3.1.7
bleach==3.1.1
boto3==1.10.9
botocore==1.13.9
certifi==2019.9.11
cffi==1.13.2
chardet==3.0.4
colorama==0.4.1
cryptography==2.8
docutils==0.15.2
fabric==2.5.0
humanfriendly==4.18
idna==2.8
importlib-metadata==0.23
invoke==1.3.0
isodate==0.6.0
isort==4.3.21
jeepney==0.4.2
Jinja2==2.10.3
jmespath==0.9.4
jsonschema==3.1.1
keyring==21.1.0
knack==0.6.3
lazy-object-proxy==1.4.3
MarkupSafe==1.1.1
mccabe==0.6.1
mock==3.0.5
more-itertools==7.2.0
msrest==0.6.10
msrestazure==0.6.2
oauthlib==3.1.0
packaging==20.1
paramiko==2.6.0
pkginfo==1.5.0.1
pluggy==0.13.1
portalocker==1.2.1
prompt-toolkit==1.0.18
psutil==5.6.4
py==1.8.1
pycparser==2.19
Pygments==2.4.2
PyJWT==1.7.1
PyNaCl==1.3.0
pyOpenSSL==19.0.0
pyparsing==2.4.6
pyperclip==1.7.0
pyrsistent==0.15.5
python-dateutil==2.8.0
python-json-logger==0.1.11
pytz==2019.3
PyYAML==5.3
readme-renderer==24.0
requests==2.22.0
requests-oauthlib==1.2.0
requests-toolbelt==0.9.1
ruamel.yaml==0.16.10
ruamel.yaml.clib==0.2.0
s3transfer==0.2.1
scp==0.13.2
SecretStorage==3.1.2
six==1.12.0
skopeo-bin==1.0.3
sshtunnel==0.1.5
tabulate==0.8.5
terraform-bin==1.0.1
tqdm==4.43.0
typed-ast==1.4.1
urllib3==1.25.6
vsts==0.1.25
vsts-cd-manager==1.0.2
wcwidth==0.1.7
webencodings==0.5.1
websocket-client==0.56.0
wrapt==1.11.2
xmltodict==0.12.0
zipp==0.6.0
2 changes: 0 additions & 2 deletions core/src/epicli/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ share/python-wheels/
*.egg
MANIFEST

/requirements.txt

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
Expand Down
1 change: 1 addition & 0 deletions core/src/epicli/.vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
"python.testing.unittestEnabled": false,
"python.testing.nosetestsEnabled": false,
"python.testing.pytestEnabled": true,
"python.pythonPath": "/usr/local/bin/python",
}
2 changes: 1 addition & 1 deletion core/src/epicli/Dockerfile-debian
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.7
FROM python:3.7-slim

ARG EPICLI_VERSION

Expand Down
Loading

0 comments on commit f00dc45

Please sign in to comment.