diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3cfcef039..390c0bfb9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -103,6 +103,8 @@ jobs: - name: Build and Test env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + ziti_ci_gpg_key: ${{ secrets.ZITI_CI_GPG_KEY }} + ziti_ci_gpg_key_id: ${{ secrets.ZITI_CI_GPG_KEY_ID }} run: | sudo apt-get update sudo apt-get -yq install gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf gcc-aarch64-linux-gnu diff --git a/CHANGELOG.md b/CHANGELOG.md index a72901345..1f88fe601 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +# Release 0.25.1 + +* Bug fix: Fix panic caused by race condition at router start up + * Regression since 0.25.0 + # Release 0.25.0 ## Breaking Changes diff --git a/go.mod b/go.mod index 16517b77b..ecc92df7e 100644 --- a/go.mod +++ b/go.mod @@ -27,7 +27,7 @@ require ( github.com/fatih/color v1.13.0 github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa github.com/go-acme/lego/v4 v4.2.0 - github.com/go-openapi/runtime v0.23.1 + github.com/go-openapi/runtime v0.23.2 github.com/go-openapi/strfmt v0.21.2 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b github.com/golang/protobuf v1.5.2 @@ -154,11 +154,11 @@ require ( github.com/yusufpapurcu/wmi v1.2.2 // indirect go.mongodb.org/mongo-driver v1.8.3 // indirect go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1 // indirect - golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect + golang.org/x/crypto v0.0.0-20220307211146-efcb8507fb70 // indirect golang.org/x/image v0.0.0-20191206065243-da761ea9ff43 // indirect golang.org/x/mod v0.5.1 // indirect golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect - golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9 // indirect + golang.org/x/sys v0.0.0-20220307203707-22a9840ba4d7 // indirect golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect golang.org/x/text v0.3.7 // indirect golang.org/x/tools v0.1.7 // indirect @@ -173,7 +173,7 @@ require ( require ( github.com/jedib0t/go-pretty/v6 v6.2.4 - github.com/openziti/edge v0.21.120 - github.com/openziti/fabric v0.17.60 + github.com/openziti/edge v0.21.124 + github.com/openziti/fabric v0.17.61 github.com/rivo/uniseg v0.2.0 // indirect ) diff --git a/go.sum b/go.sum index 83fc98942..edd2503d5 100644 --- a/go.sum +++ b/go.sum @@ -343,8 +343,8 @@ github.com/go-openapi/runtime v0.19.15/go.mod h1:dhGWCTKRXlAfGnQG0ONViOZpjfg0m2g github.com/go-openapi/runtime v0.19.16/go.mod h1:5P9104EJgYcizotuXhEuUrzVc+j1RiSjahULvYmlv98= github.com/go-openapi/runtime v0.19.24/go.mod h1:Lm9YGCeecBnUUkFTxPC4s1+lwrkJ0pthx8YvyjCfkgk= github.com/go-openapi/runtime v0.21.0/go.mod h1:aQg+kaIQEn+A2CRSY1TxbM8+sT9g2V3aLc1FbIAnbbs= -github.com/go-openapi/runtime v0.23.1 h1:/Drg9R96eMmgKJHVWZADz78XbE39/6QiIiB45mc+epo= -github.com/go-openapi/runtime v0.23.1/go.mod h1:AKurw9fNre+h3ELZfk6ILsfvPN+bvvlaU/M9q/r9hpk= +github.com/go-openapi/runtime v0.23.2 h1:SLoYVM3ovq+lynpgrHQZ5WQcx+CBE0HHHCZU3c2jQoo= +github.com/go-openapi/runtime v0.23.2/go.mod h1:AKurw9fNre+h3ELZfk6ILsfvPN+bvvlaU/M9q/r9hpk= github.com/go-openapi/spec v0.17.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI= github.com/go-openapi/spec v0.18.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI= github.com/go-openapi/spec v0.19.2/go.mod h1:sCxk3jxKgioEJikev4fgkNmwS+3kuYdJtcsZsD5zxMY= @@ -820,19 +820,16 @@ github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+ github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8= github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= -github.com/openziti/channel v0.18.13/go.mod h1:9z2HLdoYZ3RYm9S8XqlQB5spf3j+BLPof0A1zvjLyzc= github.com/openziti/channel v0.18.14 h1:MS6Wfo0BklKI/IQ/HQl+wKJBw9rPimTSSqFIeBcsHGQ= github.com/openziti/channel v0.18.14/go.mod h1:F370DYbKEKpIEhRaZVbEK6xN+pirSZx4qnwbObQAV2I= github.com/openziti/dilithium v0.3.3 h1:PLgQ6PMNLSTzCFbX/h98cmudgz/cU6TmjdSv5NAPD8k= github.com/openziti/dilithium v0.3.3/go.mod h1:vsCjI2AU/hon9e+dLhUFbCNGesJDj2ASgkySOcpmvjo= -github.com/openziti/edge v0.21.120 h1:hoSmHPec/PEgQE4JZ3L05IBnyR8UqRpVOJUK5egQlNc= -github.com/openziti/edge v0.21.120/go.mod h1:Sdf0gOmnF3tgts9cV4nQxMzyhY/R4KpXZxKqTMje+7M= -github.com/openziti/fabric v0.17.60 h1:xUc2e2ITkpgyeWvHHb8JGv7r5AtwSzFv2PenaIiXo2E= -github.com/openziti/fabric v0.17.60/go.mod h1:8oBcmWriG/nTGF/+8pkv1oAKQY97XXG4ptns8dUTMr4= -github.com/openziti/foundation v0.17.6/go.mod h1:dTaJgdO5OqnKpV+0OPHpnTnqfPpqNGbhJv8O6pMot6o= +github.com/openziti/edge v0.21.124 h1:+GmkJ/4HFXNeOVv4zn2gmZEURGDBuDi3N8lMzwsw6sI= +github.com/openziti/edge v0.21.124/go.mod h1:qZ4Jn3Y0POBdIQR03maD+GAzNI7C5W57aiBiFE5c7is= +github.com/openziti/fabric v0.17.61 h1:3sWTJdZPfHOsyxGWA0e5D7fQhjaZWRoB8dj9JHfqaPQ= +github.com/openziti/fabric v0.17.61/go.mod h1:8oBcmWriG/nTGF/+8pkv1oAKQY97XXG4ptns8dUTMr4= github.com/openziti/foundation v0.17.8 h1:vlX6yQHrs5Tcp39xHylJhzohTDOZ6d/VrVlQahw7GBo= github.com/openziti/foundation v0.17.8/go.mod h1:dTaJgdO5OqnKpV+0OPHpnTnqfPpqNGbhJv8O6pMot6o= -github.com/openziti/sdk-golang v0.16.19/go.mod h1:ougRN3x0v2L7sHwjkoeoa05ZlWs9+0ObyUCc2Sm8Kfw= github.com/openziti/sdk-golang v0.16.20 h1:AtSaD0Do5HgkDWFR0dLUVpiOpky2WAh6cf78hcG30jk= github.com/openziti/sdk-golang v0.16.20/go.mod h1:uQ90QCehBrfO/xmpnWGVr3Jj65BMUrvGPH4I0gRl0og= github.com/oracle/oci-go-sdk v24.2.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888= @@ -1134,8 +1131,9 @@ golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f/go.mod h1:jdWPYTVW3xRLrWP golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20220214200702-86341886e292 h1:f+lwQ+GtmgoY+A2YaQxlSOnDjXcQ7ZRLWOHbC6HtRqE= golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220307211146-efcb8507fb70 h1:syTAU9FwmvzEoIYMqcPHOcVm4H3U5u90WsvuYgwpETU= +golang.org/x/crypto v0.0.0-20220307211146-efcb8507fb70/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -1383,8 +1381,9 @@ golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9 h1:nhht2DYV/Sn3qOayu8lM+cU1ii9sTLUeBQwQQfUHtrs= golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220307203707-22a9840ba4d7 h1:8IVLkfbr2cLhv0a/vKq4UFUcJym8RmDoDboxCFWEjYE= +golang.org/x/sys v0.0.0-20220307203707-22a9840ba4d7/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= diff --git a/quickstart/aws.md b/quickstart/aws.md index ed0624e8b..5a1b02510 100644 --- a/quickstart/aws.md +++ b/quickstart/aws.md @@ -1,171 +1,7 @@ -# Quickstart - AWS + + + -This quickstart is a barebones guide to running a full developer environment in AWS. It is not fault-tolerant. If you require fault tolerance this guide is not for you. This guide also assumes you're at least familiar with AWS's console and cloud development. Feel free to replace any steps along the way you desire but these steps were tested at least a few times and hopefully whenever you're reading this, the steps are still valid. If not file an issue or shoot over to [Discourse](https://openziti.discourse.group/) and start a discussion. +# Content moved -## Setup a Server - -1. After logging into AWS, navigate to the EC2 Dashboard -1. From the EC2 Dashboard, click "Launch Instance" -1. Find "Ubuntu Server 20.04 LTS (HVM), SSD Volume Type" and click 'select' -1. At the bottom of the screen - click the "Review and Launch" button -1. In AWS "Step 7. Review Instance Launch", find the "Security Groups" row and expand it if necessary -1. Click "Edit security groups" -1. Click "Add Rule" and select "Custom TCP Rule" and enter Port Range:"8441" Source: "0.0.0.0/0", Description: "Ziti Controller Port" -1. Click "Add Rule" and select "Custom TCP Rule" and enter Port Range:"8442" Source: "0.0.0.0/0", Description: "Ziti Edge Router Port" -1. Click "Add Rule" and select "Custom TCP Rule" and enter Port Range:"8443" Source: "0.0.0.0/0", Description: "Ziti Console TLS Port" -1. Your console should look like this: - ![security-groups.png](security-groups.png) - -1. click "Review and Launch" and then "Launch" -1. Select your keypair and choose "Launch Instances" - -## SSH to the Server - -1. After ssh'ing to the new ubuntu machine - run: `sudo apt update && sudo apt install jq -y` -1. Set some environment variables which are used to establish a PKI as well as the necessary configuration files. You will need to know the public IPv4 DNS name assigned to this machine. Replace "____EXTERNAL___DNS____" with the proper values. (**IMPORTANT** make sure the name is correct): - - export EXTERNAL_DNS="____EXTERNAL___DNS______FILLIN example: ec2-3-129-206-186.us-east-2.compute.amazonaws.com" - - export EXTERNAL_IP="$(curl -s eth0.me)" - export ZITI_EDGE_CONTROLLER_IP_OVERRIDE="${EXTERNAL_IP}" - export ZITI_EDGE_ROUTER_IP_OVERRIDE="${EXTERNAL_IP}" - export ZITI_EDGE_CONTROLLER_HOSTNAME="${EXTERNAL_DNS}" - export ZITI_EDGE_ROUTER_HOSTNAME="${EXTERNAL_DNS}" - export ZITI_EDGE_CONTROLLER_PORT=8441 - export ZITI_EDGE_ROUTER_PORT=8442 - -1. Run this single command to download and bootstrap the ziti-controller and ziti-router (feel free to read the bash script before running if you like): - - source <(wget -qO- https://raw.githubusercontent.com/openziti/ziti/release-next/quickstart/docker/image/ziti-cli-functions.sh); expressInstall - -1. At this point the controller and router are running and can be accessed from anywhere. Confirm both are running by running: - - ps -ef | grep ziti - root 2520 1 0 May19 ? 00:00:15 /home/ubuntu/.ziti/quickstart/ip-172-31-22-212/ziti-bin/ziti-v0.20.2/ziti-controller run /home/ubuntu/.ziti/quickstart/ip-172-31-22-212/controller.yaml - root 2547 1 0 May19 ? 00:00:10 /home/ubuntu/.ziti/quickstart/ip-172-31-22-212/ziti-bin/ziti-v0.20.2/ziti-router run /home/ubuntu/.ziti/quickstart/ip-172-31-22-212/ip-172-31-22-212-edge-router.yaml - -1. You can also issue this statement from the server and you will see a similar response to this: - - curl -sk "https://${ZITI_EDGE_CONTROLLER_HOSTNAME}:${ZITI_EDGE_CONTROLLER_PORT}/version" - {"data":{"apiVersions":{"edge":{"v1":{"path":"/edge/v1"}}},"buildDate":"2021-05-05 20:59:40","revision":"73dd1db42bf4","runtimeVersion":"go1.16.3","version":"v0.19.13"},"meta":{}} - -## Setting up Ziti Controller and Router as a service - -1. Stop ziti-controller and ziti-router if they are running: - - killall ziti-controller ziti-router -1. copy the two systemd files and refresh systemd - - sudo cp "${ZITI_HOME}/ziti-controller.service" /etc/systemd/system - sudo cp "${ZITI_HOME}/ziti-router-${ZITI_EDGE_ROUTER_RAWNAME}.service" /etc/systemd/system/ziti-router.service - sudo systemctl daemon-reload - sudo systemctl start ziti-controller - sudo systemctl start ziti-router -1. Allow 5 to 10 seconds for the ziti-controller and router to start completely. Run these two commands to verify ziti-controller and ziti-router are running: - - sudo systemctl -q status ziti-controller --lines=0 --no-pager - sudo systemctl -q status ziti-router --lines=0 --no-pager - - #sample output: - ubuntu@ip-172-31-22-212:~$ sudo systemctl -q status ziti-controller --lines=0 --no-pager - ● ziti-controller.service - Ziti-Controller - Loaded: loaded (/etc/systemd/system/ziti-controller.service; disabled; vendor preset: enabled) - Active: active (running) since Thu 2021-05-20 11:24:40 UTC; 5min ago - Main PID: 26848 (ziti-controller) - Tasks: 7 (limit: 1160) - Memory: 50.5M - CGroup: /system.slice/ziti-controller.service - └─26848 /home/ubuntu/.ziti/quickstart/ip-172-31-22-212/ziti-bin/ziti-v0.20.2/ziti-controller run /home/ubu… - - ubuntu@ip-172-31-22-212:~$ sudo systemctl -q status ziti-router --lines=0 --no-pager - ● ziti-router.service - Ziti-Router for ip-172-31-22-212-edge-router - Loaded: loaded (/etc/systemd/system/ziti-router.service; disabled; vendor preset: enabled) - Active: active (running) since Thu 2021-05-20 11:24:42 UTC; 5min ago - Main PID: 26864 (ziti-router) - Tasks: 7 (limit: 1160) - Memory: 28.4M - CGroup: /system.slice/ziti-router.service - └─26864 /home/ubuntu/.ziti/quickstart/ip-172-31-22-212/ziti-bin/ziti-v0.20.2/ziti-router run /home/ubuntu/… - ubuntu@ip-172-31-22-212:~$ - -## Setting up the Ziti Admin Console - -### By Cloning from Github - -1. clone the ziti-console repo from github: - - git clone https://github.com/openziti/ziti-console.git "${ZITI_HOME}/ziti-console" -1. Install node and npm and get the server ready - - cd "${ZITI_HOME}/ziti-console" - sudo apt install npm nodejs -y - npm install -1. Use the ziti-controller certificates for the Ziti Console: - - ln -s "${ZITI_PKI}/${ZITI_EDGE_CONTROLLER_HOSTNAME}-intermediate/certs/${ZITI_EDGE_CONTROLLER_HOSTNAME}-server.chain.pem" "${ZITI_HOME}/ziti-console/server.chain.pem" - ln -s "${ZITI_PKI}/${ZITI_EDGE_CONTROLLER_HOSTNAME}-intermediate/keys/${ZITI_EDGE_CONTROLLER_HOSTNAME}-server.key" "${ZITI_HOME}/ziti-console/server.key" -1. Emit the Ziti Console systemd file and update systemd to start the Ziti Console - - createZacSystemdFile - sudo cp "${ZITI_HOME}/ziti-console.service" /etc/systemd/system - sudo systemctl daemon-reload - sudo systemctl start ziti-console -1. Verify the Ziti Console is running - sudo systemctl status ziti-console --lines=0 --no-pager - - #sample output of the command: - ubuntu@ip-172-31-22-212:~$ sudo systemctl status ziti-console --lines=0 --no-pager - ● ziti-console.service - Ziti-Console - Loaded: loaded (/etc/systemd/system/ziti-console.service; disabled; vendor preset: enabled) - Active: active (running) since Wed 2021-05-19 22:04:44 UTC; 13h ago - Main PID: 13458 (node) - Tasks: 11 (limit: 1160) - Memory: 33.4M - CGroup: /system.slice/ziti-console.service - └─13458 /usr/bin/node /home/ubuntu/.ziti/quickstart/ip-172-31-22-212/ziti-console/server.js - -### By Using Docker - -1. If needed, install docker on the machine. I followed these instructions https://linuxize.com/post/how-to-install-and-use-docker-on-ubuntu-20-04/ but we'll condense them here for you to copy/paste: - - sudo apt update - sudo apt install apt-transport-https ca-certificates curl gnupg-agent software-properties-common -y - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" - sudo apt install docker-ce docker-ce-cli containerd.io -y - sudo usermod -aG docker $USER -1. Log out of the server, and log back in to activate docker for your user -1. Copy/paste this command to start the Ziti Admin Console in TLS mode: - - docker run -d \ - --name zac \ - -p 8443:8443 \ - -v "${ZITI_PKI}/${ZITI_EDGE_CONTROLLER_HOSTNAME}-intermediate/keys/${ZITI_EDGE_CONTROLLER_HOSTNAME}-server.key":/usr/src/app/server.key \ - -v "${ZITI_PKI}/${ZITI_EDGE_CONTROLLER_HOSTNAME}-intermediate/certs/${ZITI_EDGE_CONTROLLER_HOSTNAME}-server.chain.pem":/usr/src/app/server.chain.pem \ - openziti/zac - -## Login and use the Ziti Console -1. At this point you should be able to navigate to both: https://${ZITI_EDGE_CONTROLLER_HOSTNAME}:8443 as well as https://$(curl -s eth0.me):8443 and see the ZAC login screen. (The TLS warnings your browser will show you are normal - it's because these steps use a self-signed certificate generated in the install process) -1. Set the controller as shown: - - ![img_1.png](img_1.png) -1. Login with admin/admin - - ![img_2.png](img_2.png) - -1. **IMPORTANT!!!** Edit your profile and change the password - - ![img_3.png](img_3.png) - -## Adding Environment Variables Back to the Shell - -If you log out and log back in again you can source the '.env' file located at: `. ~/.ziti/quickstart/$(hostname)/$(hostname).env`. Below is an example of logging in, not having ZITI_HOME set, sourcing the .env file and then showing ZITI_HOME set: - - Last login: Thu May 20 11:36:25 2021 from 67.246.244.61 - ubuntu@ip-172-31-22-212:~$ echo $ZITI_HOME - - ubuntu@ip-172-31-22-212:~$ . ~/.ziti/quickstart/$(hostname)/$(hostname).env - - adding /home/ubuntu/.ziti/quickstart/ip-172-31-22-212/ziti-bin/ziti-v0.20.2 to the path - ubuntu@ip-172-31-22-212:~$ echo $ZITI_HOME - /home/ubuntu/.ziti/quickstart/ip-172-31-22-212 +This content has been moved to the official doc repository. Find it at https://openziti.github.io/ziti/quickstarts/quickstart-overview.html \ No newline at end of file diff --git a/quickstart/img_1.png b/quickstart/img_1.png deleted file mode 100644 index a350b34a7..000000000 Binary files a/quickstart/img_1.png and /dev/null differ diff --git a/quickstart/img_2.png b/quickstart/img_2.png deleted file mode 100644 index 14f6a36b6..000000000 Binary files a/quickstart/img_2.png and /dev/null differ diff --git a/quickstart/img_3.png b/quickstart/img_3.png deleted file mode 100644 index bc8d9694c..000000000 Binary files a/quickstart/img_3.png and /dev/null differ diff --git a/quickstart/security-groups.png b/quickstart/security-groups.png deleted file mode 100644 index 242053ced..000000000 Binary files a/quickstart/security-groups.png and /dev/null differ