Bump: v0.2.6 (#301)

* Bump: v0.2.6 * service: Fix for config Signed-off-by: Ryan Northey <[email protected]>
envoyproxy · Dec 14, 2020 · cb6211b · cb6211b
1 parent 661f9e5
commit cb6211b
Show file tree

Hide file tree

Showing 29 changed files with 14 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -43,7 +43,7 @@ You can run the playground directly with Docker.
 $ docker run -d --rm \
 	--privileged \
 	-v /var/run/docker.sock:/var/run/docker.sock \
-	phlax/envoy-playground:0.2.5
+	phlax/envoy-playground:0.2.6
 ```
 
 You can stop the playground with.

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.2.5
+0.2.6
diff --git a/docs/getting-started/install.rst b/docs/getting-started/install.rst
@@ -41,7 +41,7 @@ You can run the playground directly with Docker.
    $ docker run -d --rm \
 		--privileged \
 		-v /var/run/docker.sock:/var/run/docker.sock \
-		   phlax/envoy-playground:|playground_version|-alpha
+		   phlax/envoy-playground:|playground_version|
 
 .. warning::
 
@@ -102,7 +102,7 @@ then start the playground.
 		--host=unix:///run/user/1000/docker.sock \
 		-p 8000:8080 \
 		-v /run/user/1000/docker.sock:/var/run/docker.sock \
-		   phlax/envoy-playground:|playground_version|-alpha'
+		   phlax/envoy-playground:|playground_version|'
    f01684843c27385eddb9f89d703d0c16137e4480a6377deb0a753e34d730c0e1
 
 You should now be able to access the playground UI on http://localhost:8000

diff --git a/docs/screenshots/network.create.name.png b/docs/screenshots/network.create.name.png
diff --git a/docs/screenshots/network.create.open.png b/docs/screenshots/network.create.open.png
diff --git a/docs/screenshots/network.create.started.png b/docs/screenshots/network.create.started.png
diff --git a/docs/screenshots/network.create.starting.png b/docs/screenshots/network.create.starting.png
diff --git a/docs/screenshots/proxy.create.binaries.png b/docs/screenshots/proxy.create.binaries.png
diff --git a/docs/screenshots/proxy.create.certificates.png b/docs/screenshots/proxy.create.certificates.png
diff --git a/docs/screenshots/proxy.create.configuration.png b/docs/screenshots/proxy.create.configuration.png
diff --git a/docs/screenshots/proxy.create.logging.png b/docs/screenshots/proxy.create.logging.png
diff --git a/docs/screenshots/proxy.create.name.png b/docs/screenshots/proxy.create.name.png
diff --git a/docs/screenshots/proxy.create.open.png b/docs/screenshots/proxy.create.open.png
diff --git a/docs/screenshots/proxy.create.ports.png b/docs/screenshots/proxy.create.ports.png
diff --git a/docs/screenshots/proxy.create.started.png b/docs/screenshots/proxy.create.started.png
diff --git a/docs/screenshots/proxy.create.starting.png b/docs/screenshots/proxy.create.starting.png
diff --git a/docs/screenshots/service.create.configuration.png b/docs/screenshots/service.create.configuration.png
diff --git a/docs/screenshots/service.create.env.png b/docs/screenshots/service.create.env.png
diff --git a/docs/screenshots/service.create.name.png b/docs/screenshots/service.create.name.png
diff --git a/docs/screenshots/service.create.open.png b/docs/screenshots/service.create.open.png
diff --git a/docs/screenshots/service.create.ports.png b/docs/screenshots/service.create.ports.png
diff --git a/docs/screenshots/service.create.readme.png b/docs/screenshots/service.create.readme.png
diff --git a/docs/screenshots/service.create.started.png b/docs/screenshots/service.create.started.png
diff --git a/docs/screenshots/service.create.starting.png b/docs/screenshots/service.create.starting.png
diff --git a/integration/bin/start-playground.sh b/integration/bin/start-playground.sh
@@ -6,8 +6,8 @@ if [[ -e /code/docker/playground.tar.gz ]]; then
     docker load < /code/docker/playground.tar.gz
 elif [[ -n "$PLAYGROUND_VERSION" ]]; then
     echo ">>> Pulling playground: ${PLAYGROUND_VERSION}"
-    docker pull "phlax/envoy-playground:${PLAYGROUND_VERSION}-alpha"
-    docker tag "phlax/envoy-playground:${PLAYGROUND_VERSION}-alpha envoy-playground"
+    docker pull "phlax/envoy-playground:${PLAYGROUND_VERSION}"
+    docker tag "phlax/envoy-playground:${PLAYGROUND_VERSION} envoy-playground"
 else
     echo "ERROR: Need either an image or a version to pull, can't continue, exiting, bye" >&2
     exit 1

diff --git a/integration/tests/journeys/test_network_journeys.py b/integration/tests/journeys/test_network_journeys.py
@@ -11,7 +11,8 @@ def test_journey_network_create(playground):
     # open the proxy modal
     playground.web.find_elements_by_name('Networks')[0].click()
     time.sleep(1)
-    name_input = playground.web.find_elements_by_id('name')[0]
+    name_input = playground.web.find_elements_by_id(
+        'envoy.playground.name')[0]
     assert (
         name_input.get_attribute('placeholder')
         == 'Enter network name')

diff --git a/integration/tests/journeys/test_proxy_journeys.py b/integration/tests/journeys/test_proxy_journeys.py
@@ -11,7 +11,8 @@ def test_journey_proxy_create(playground):
     # open the proxy modal
     playground.web.find_elements_by_name('Proxies')[0].click()
     time.sleep(1)
-    name_input = playground.web.find_elements_by_id('name')[0]
+    name_input = playground.web.find_elements_by_id(
+        'envoy.playground.name')[0]
     assert (
         name_input.get_attribute('placeholder')
         == 'Enter proxy name')

diff --git a/integration/tests/journeys/test_service_journeys.py b/integration/tests/journeys/test_service_journeys.py
@@ -11,7 +11,8 @@ def test_journey_service_create(playground):
     # open the proxy modal
     playground.web.find_elements_by_name('Services')[0].click()
     time.sleep(1)
-    name_input = playground.web.find_elements_by_id('name')[0]
+    name_input = playground.web.find_elements_by_id(
+        'envoy.playground.name')[0]
     assert (
         name_input.get_attribute('placeholder')
         == 'Enter service name')

diff --git a/ui/src/service/forms/configuration.js b/ui/src/service/forms/configuration.js
@@ -16,7 +16,7 @@ import {PlaygroundEditor} from '../../shared/editor';
 
 
 export class ServiceConfigurationForm extends React.PureComponent {
-    static contexType = PlaygroundContext;
+    static contextType = PlaygroundContext;
     static propTypes = exact({
         dispatch: PropTypes.func.isRequired,
         form: PropTypes.object.isRequired,
@@ -41,6 +41,7 @@ export class ServiceConfigurationForm extends React.PureComponent {
         }
         const configDefault  = service_types[service_type]['labels']['envoy.playground.config.default'];
         if (configDefault) {
+            console.log(configDefault);
             const content = await api.get(
                 ['/static', service_type, configDefault].join('/'),
                 'text');