From 719b2f7ceb326c4143a15e4a1ffa499bb22b4c75 Mon Sep 17 00:00:00 2001 From: Dave Cunningham Date: Mon, 22 Feb 2016 20:15:13 -0500 Subject: [PATCH] Update stale template links --- examples/guestbook/README.md | 18 +++++++++--------- examples/wordpress/README.md | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/examples/guestbook/README.md b/examples/guestbook/README.md index 3d7ae6cd3..b64795a5a 100644 --- a/examples/guestbook/README.md +++ b/examples/guestbook/README.md @@ -20,12 +20,12 @@ replication controller and a service with the same selector, so that the service exposes ports from the pods managed by the replication controller. We have created a parameterized template for this kind of replicated service -called [Replicated Service](../../templates/replicatedservice/v1), and we use it +called [Replicated Service](https://raw.githubusercontent.com/kubernetes/application-dm-templates/master/common/replicatedservice/v1), and we use it three times in the Guestbook example. The template is defined by a -[Python script](../../templates/replicatedservice/v1/replicatedservice.py). It -also has a [schema](../../templates/replicatedservice/v1/replicatedservice.py.schema). +[Python script](https://raw.githubusercontent.com/kubernetes/application-dm-templates/master/common/replicatedservice/v1/replicatedservice.py). It +also has a [schema](https://raw.githubusercontent.com/kubernetes/application-dm-templates/master/common/replicatedservice/v1/replicatedservice.py.schema). Schemas are optional. If provided, they are used to validate template invocations that appear in configurations. @@ -42,7 +42,7 @@ The front end is a replicated service with 3 replicas: ``` - name: frontend - type: https://raw.githubusercontent.com/kubernetes/deployment-manager/master/templates/replicatedservice/v1/replicatedservice.py + type: https://raw.githubusercontent.com/kubernetes/application-dm-templates/common/replicatedservice/v1/replicatedservice.py properties: service_port: 80 container_port: 80 @@ -57,8 +57,8 @@ not just the template name.) #### The Redis cluster The Redis cluster consists of two replicated services: a master with a single replica -and the slaves with 2 replicas. It's defined by [this template](../../templates/redis/v1/redis.jinja), -which is a [Jinja](http://jinja.pocoo.org/) file with a [schema](../../templates/redis/v1/redis.jinja.schema). +and the slaves with 2 replicas. It's defined by [this template](https://raw.githubusercontent.com/kubernetes/application-dm-templates/master/storage/redis/v1/redis.jinja), +which is a [Jinja](http://jinja.pocoo.org/) file with a [schema](https://raw.githubusercontent.com/kubernetes/application-dm-templates/master/storage/redis/v1/redis.jinja.schema). ``` {% set REDIS_PORT = 6379 %} @@ -66,7 +66,7 @@ which is a [Jinja](http://jinja.pocoo.org/) file with a [schema](../../templates resources: - name: redis-master - type: https://raw.githubusercontent.com/kubernetes/deployment-manager/master/templates/replicatedservice/v1/replicatedservice.py + type: https://raw.githubusercontent.com/kubernetes/application-dm-templates/master/common/replicatedservice/v1/replicatedservice.py properties: # This has to be overwritten since service names are hard coded in the code service_name: redis-master @@ -78,7 +78,7 @@ resources: image: redis - name: redis-slave - type: https://raw.githubusercontent.com/kubernetes/deployment-manager/master/templates/replicatedservice/v1/replicatedservice.py + type: https://raw.githubusercontent.com/kubernetes/application-dm-templates/master/common/replicatedservice/v1/replicatedservice.py properties: # This has to be overwritten since service names are hard coded in the code service_name: redis-slave @@ -103,7 +103,7 @@ cluster using the `deployed-types` command: ``` dm deployed-types -["Service","ReplicationController","redis.jinja","https://raw.githubusercontent.com/kubernetes/deployment-manager/master/templates/replicatedservice/v1/replicatedservice.py"] +["Service","ReplicationController","redis.jinja","https://raw.githubusercontent.com/kubernetes/application-dm-templates/master/common/replicatedservice/v1/replicatedservice.py"] ``` This output shows 2 primitive types (Service and ReplicationController), and 2 diff --git a/examples/wordpress/README.md b/examples/wordpress/README.md index 9e2e57d06..12573ba0e 100644 --- a/examples/wordpress/README.md +++ b/examples/wordpress/README.md @@ -62,7 +62,7 @@ The nginx service is a replicated service with 2 replicas: ``` - name: nginx - type: https://raw.githubusercontent.com/kubernetes/deployment-manager/master/templates/replicatedservice/v2/replicatedservice.py + type: https://raw.githubusercontent.com/kubernetes/application-dm-templates/master/common/replicatedservice/v2/replicatedservice.py properties: service_port: {{ NGINX_PORT }} container_port: {{ NGINX_PORT }} @@ -82,7 +82,7 @@ The wordpress-php service is a replicated service with 2 replicas: ``` - name: wordpress-php - type: https://raw.githubusercontent.com/kubernetes/deployment-manager/master/templates/replicatedservice/v2/replicatedservice.py + type: https://raw.githubusercontent.com/kubernetes/application-dm-templates/master/common/replicatedservice/v2/replicatedservice.py properties: service_name: wordpress-php service_port: {{ WORDPRESS_PHP_PORT }} @@ -105,7 +105,7 @@ The MySQL service is a replicated service with a single replica: ``` - name: mysql - type: https://raw.githubusercontent.com/kubernetes/deployment-manager/master/templates/replicatedservice/v2/replicatedservice.py + type: https://raw.githubusercontent.com/kubernetes/application-dm-templates/master/common/replicatedservice/v2/replicatedservice.py properties: service_port: {{ MYSQL_PORT }} container_port: {{ MYSQL_PORT }} @@ -126,7 +126,7 @@ The NFS service is a replicated service with a single replica that is available ``` - name: nfs - type: https://raw.githubusercontent.com/kubernetes/deployment-manager/master/templates/nfs/v1/nfs.jinja + type: https://raw.githubusercontent.com/kubernetes/application-dm-templates/master/storage/nfs/v1/nfs.jinja properties: ip: {{ NFS_SERVER_IP }} port: {{ NFS_SERVER_PORT }}