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

Merge develop into master #602

Merged
merged 81 commits into from
Oct 11, 2019
Merged
Changes from 1 commit
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
95aab45
Updated documentation
seriva Jul 31, 2019
601c62a
Fixed links.
seriva Jul 31, 2019
a4c9065
Fixed changelog.
seriva Jul 31, 2019
044bcf9
Merge branch 'develop' into develop
seriva Jul 31, 2019
1a1365c
Merge remote-tracking branch 'upstream/develop' into develop
seriva Aug 1, 2019
e94b678
Added node_exporter port known issue.
seriva Aug 1, 2019
b914eef
Merge remote-tracking branch 'upstream/develop' into develop
seriva Aug 2, 2019
d350a76
Added new terraform-bin plugin and updated templates to 0.12.6 (#418)
seriva Aug 5, 2019
aed56ba
Fix/ports security groups aws for defaults (#417)
erzetpe Aug 5, 2019
18c2af2
Documentation - users and groups created directly by Epiphany (#420)
erzetpe Aug 5, 2019
8528f8d
Merge remote-tracking branch 'upstream/develop' into develop
seriva Aug 5, 2019
7b529b3
Removing the test environment destruction function (#421)
przemyslavic Aug 6, 2019
9e8a4ed
Opened ports documentation (#423)
erzetpe Aug 6, 2019
c87c3f9
Item: #422 Desc: Add missing ports for prometheus and grafana (#425)
erzetpe Aug 6, 2019
19c3d7d
Feature/skip terraform if any (#426)
erzetpe Aug 7, 2019
7625cfc
Changing latest tag to build id in Dockerfiles (#428)
przemyslavic Aug 7, 2019
3501e73
Setup Diffie-Hellman settings in haproxy. (#430)
erzetpe Aug 8, 2019
ef96749
AzureCLI integration (#427)
seriva Aug 8, 2019
60d2f96
Merge remote-tracking branch 'upstream/develop' into develop
seriva Aug 8, 2019
6c2671b
VSCode remote Remote Python Development (#431)
seriva Aug 9, 2019
d790b86
Merge remote-tracking branch 'upstream/develop' into develop
seriva Aug 9, 2019
cc95462
Azure complete run through (#432)
seriva Aug 9, 2019
ed3c8e1
Merge remote-tracking branch 'upstream/develop' into develop
seriva Aug 9, 2019
52ef5c2
Feature/cluster delete (#436)
seriva Aug 12, 2019
0f7b6f4
Merge remote-tracking branch 'upstream/develop' into develop
seriva Aug 12, 2019
a2bb7ff
Feature/az resource group (#437)
seriva Aug 13, 2019
d816883
Merge remote-tracking branch 'upstream/develop' into develop
seriva Aug 14, 2019
96e7a7a
Debug improvements (#438)
seriva Aug 14, 2019
a47abd0
Merge remote-tracking branch 'upstream/develop' into develop
seriva Aug 14, 2019
7e67c74
HAProxy and Prometheus test fixes (#435)
przemyslavic Aug 16, 2019
6c919a7
Feature/development-docs (#439)
seriva Aug 26, 2019
81a8411
Merge remote-tracking branch 'upstream/develop' into develop
seriva Aug 26, 2019
d5b20ee
Feature/azure-subnets (#440)
seriva Aug 27, 2019
3015241
Changing epicli output directory (#441)
przemyslavic Aug 28, 2019
604a237
always apt update before apt install (#442)
lukurde Aug 29, 2019
f24ff2e
Workaround for RspecJUnitFormatter encoding issue (#445)
przemyslavic Aug 29, 2019
1a6ef4e
Added docs on how to upgrade Kubernetes cluster from 1.13.1 to 1.13.1…
przemyslavic Sep 2, 2019
c905bce
Fix rabbit bad exporter and ports (#446)
erzetpe Sep 2, 2019
e46a10b
Added docs on how to upgrade Kubernetes cluster on Ubuntu (#457)
przemyslavic Sep 3, 2019
28b5364
Allow outgoing connections on rabbitmq vms (#456)
przemyslavic Sep 3, 2019
b50ca37
Merge remote-tracking branch 'upstream/develop' into develop
seriva Sep 3, 2019
be7c12d
Wait for the cluster to be available before running deployments/appli…
przemyslavic Sep 4, 2019
c4b1199
Changed ansible default 10s ping timeout to 60s; added junit xml repo…
przemyslavic Sep 4, 2019
ebbeb93
Merge remote-tracking branch 'upstream/develop' into develop
seriva Sep 9, 2019
631891f
Feature/skopeo (#475)
seriva Sep 10, 2019
de8fae2
subnets, network interfaces, security rules, ansible inventory (#469)
seriva Sep 10, 2019
8210ba9
Merge remote-tracking branch 'upstream/develop' into develop
seriva Sep 10, 2019
03f3054
File generating hashes for directory (#477)
erzetpe Sep 10, 2019
4555ba9
Merge remote-tracking branch 'upstream/develop' into develop
seriva Sep 12, 2019
76d55a1
Testruns (#506)
seriva Sep 13, 2019
3cf4197
Release prep part 1 (#501)
seriva Sep 13, 2019
df65902
Feature/azure-k8n-storage (#487)
seriva Sep 13, 2019
c3589f9
Merge remote-tracking branch 'upstream/develop' into develop
seriva Sep 17, 2019
017f5cf
Azure rehat fixes (#511)
seriva Sep 19, 2019
60c6949
Merge remote-tracking branch 'upstream/develop' into develop
seriva Sep 20, 2019
761ebc0
Fix typo rabbitmq (#518)
Sep 24, 2019
c2df9f6
Merge remote-tracking branch 'upstream/develop' into develop
seriva Sep 24, 2019
99914c4
Fix/rabbitmq error (#523)
seriva Sep 25, 2019
9db25b7
Fixed link to container-selinux package (legacy) (#525)
przemyslavic Sep 25, 2019
61fc6bc
Merge remote-tracking branch 'upstream/develop' into develop
seriva Sep 26, 2019
4fca543
Feature/document updates (#524)
seriva Sep 27, 2019
531866c
Merge remote-tracking branch 'upstream/develop' into develop
seriva Sep 30, 2019
d678990
Fixes for SP login.
seriva Sep 30, 2019
8dbdfb3
Fixed exit code issue with Ansible.
seriva Sep 30, 2019
11bb14d
Fixed break.
seriva Sep 30, 2019
0ed57be
Preview fixes (#541)
seriva Sep 30, 2019
7a466d4
Commit forgotten file.
seriva Oct 1, 2019
0108c73
Merge remote-tracking branch 'upstream/develop' into develop
seriva Oct 1, 2019
dd0bc03
Bumped wait time to fix timeout issue.
seriva Oct 1, 2019
5591157
Added unccommited file. (#542)
seriva Oct 1, 2019
f3812a2
Bumped skopeo and fixed issue with empty prefix string.
seriva Oct 2, 2019
73ffd2d
Merge remote-tracking branch 'upstream/develop' into develop
seriva Oct 2, 2019
148eb01
Merge branch 'develop' into fix/skopeo-and-prefix
seriva Oct 2, 2019
a5f136e
Added rabbitmq and postgresql tests to epicli (#543)
przemyslavic Oct 2, 2019
2034777
Merge pull request #545 from seriva/fix/skopeo-and-prefix
toszo Oct 3, 2019
93aa4df
Fixed naming issues and added conventions (#553)
seriva Oct 4, 2019
7b984fe
Fix/aws ports and naming (#576)
seriva Oct 8, 2019
f551be1
RabbitMQ test fix for AWS hostnames (#578)
przemyslavic Oct 9, 2019
c5b2743
Test fix - added regexp to eliminate false negatives in particular ca…
przemyslavic Oct 10, 2019
ab173f8
Feature/doc updates (#584)
seriva Oct 11, 2019
43a1e50
Merge offline into develop. (#603)
seriva Oct 11, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
VSCode remote Remote Python Development (#431)
- Added Added VS Remote-Containers development
- Cleaned up some files
- Fixed terraform schema change where it could not find the key after subsequent build
- Set fixed version of python to 3.7
seriva authored Aug 9, 2019
commit 6c2671b0c8ab6630d33d63f95bac00d7f44a921f
29 changes: 29 additions & 0 deletions core/src/epicli/.devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
FROM python:3.7

ENV DEBIAN_FRONTEND=noninteractive

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

RUN 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 \

&& pip --disable-pip-version-check --no-cache-dir install pipenv \

&& groupadd --gid $USER_GID $USERNAME \
&& useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \

&& apt-get install -y sudo \
&& echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \
&& chmod 0440 /etc/sudoers.d/$USERNAME \

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

ENV DEBIAN_FRONTEND=


12 changes: 12 additions & 0 deletions core/src/epicli/.devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"name": "epicli",
"dockerFile": "Dockerfile",
"extensions": [
"ms-python.python"
],
"settings": {
"python.pythonPath": "/usr/local/bin/python",
},
"postCreateCommand": "sudo pipenv install --system --dev",
"runArgs": [ "-u", "vscode" ]
}
6 changes: 3 additions & 3 deletions core/src/epicli/.gitignore
Original file line number Diff line number Diff line change
@@ -121,8 +121,8 @@ dmypy.json
# pycharm settings
.idea/

# external packages for BDS scan
# epicli specific
external/

# test results
tests_result/
.terraform
clusters
9 changes: 9 additions & 0 deletions core/src/epicli/.vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"recommendations": [
"ms-python.python",
"vscoss.vscode-ansible",
"wholroyd.jinja",
"redhat.vscode-yaml",
"ms-vscode-remote.remote-containers"
]
}
19 changes: 19 additions & 0 deletions core/src/epicli/.vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "epicli",
"type": "python",
"request": "launch",
"program": "${workspaceFolder}/cli/epicli.py",
"cwd": "${workspaceFolder}",
"pythonPath": "${config:python.pythonPath}",
"env": { "PYTHONPATH": "${workspaceFolder}" },
"console": "integratedTerminal",
"args": ["apply", "-f", "${workspaceFolder}/PATH_TO_YOUR_DATA_YAML"]
}
]
}
4 changes: 2 additions & 2 deletions core/src/epicli/cli/engine/aws/InfrastructureBuilder.py
Original file line number Diff line number Diff line change
@@ -192,8 +192,8 @@ def get_public_key(self):
tfstate_path = get_terraform_path(self.cluster_model.specification.name) + '/terraform.tfstate'
if os.path.isfile(tfstate_path):
tfstate = load_json_obj(tfstate_path)
public_key_config.specification.key_name = \
tfstate['modules'][0]['resources']['aws_key_pair.' + public_key_config.specification.name]['primary']['id']
key_pair = select_first(tfstate['resources'], lambda x: x['type'] == 'aws_key_pair')
public_key_config.specification.key_name = key_pair['instances'][0]['attributes']['id']
else:
public_key_config.specification.key_name = self.cluster_model.specification.admin_user.name + '-' \
+ str(uuid.uuid4())
23 changes: 0 additions & 23 deletions core/src/epicli/epicli.code-workspace

This file was deleted.

4 changes: 0 additions & 4 deletions core/src/epicli/run-tests.bat

This file was deleted.

2 changes: 1 addition & 1 deletion core/src/epicli/run-tests.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Run the python test for Epicli
mkdir -p tests_result
pipenv run python -m pytest ./tests/ > tests_result/result.txt
python -m pytest ./tests/ > tests_result/result.txt
echo "Done running tests. See tests_result/result.txt"