Skip to content

H
helm3
Commit 0cecefd4 authored by vaikas-google's avatar vaikas-google
Browse files
Options

Merge branch 'master' of https://github.com/kubernetes/deployment-manager 

Merging from upstream.
parents 79387903 ef6dbb0e
Show whitespace changes
Inline Side-by-side
Showing with 11 additions and 11 deletions
examples/bootstrap/bootstrap.yaml
View file @ 0cecefd4
resources: resources:
- name: expandybird - name: expandybird
type: https://raw.githubusercontent.com/kubernetes/deployment-manager/master/examples/replicatedservice/replicatedservice.py type: https://raw.githubusercontent.com/kubernetes/deployment-manager/master/types/replicatedservice/v1/replicatedservice.py
properties: properties:
service_port: 8081 service_port: 8081
target_port: 8080 target_port: 8080
...@@ -11,7 +11,7 @@ resources: ...@@ -11,7 +11,7 @@ resources:
labels: labels:
app: dm app: dm
- name: resourcifier - name: resourcifier
type: https://raw.githubusercontent.com/kubernetes/deployment-manager/master/examples/replicatedservice/replicatedservice.py type: https://raw.githubusercontent.com/kubernetes/deployment-manager/master/types/replicatedservice/v1/replicatedservice.py
properties: properties:
service_port: 8082 service_port: 8082
target_port: 8080 target_port: 8080
...@@ -22,7 +22,7 @@ resources: ...@@ -22,7 +22,7 @@ resources:
labels: labels:
app: dm app: dm
- name: manager - name: manager
type: https://raw.githubusercontent.com/kubernetes/deployment-manager/master/examples/replicatedservice/replicatedservice.py type: https://raw.githubusercontent.com/kubernetes/deployment-manager/master/types/replicatedservice/v1/replicatedservice.py
properties: properties:
service_port: 8080 service_port: 8080
target_port: 8080 target_port: 8080
......
examples/guestbook/README.md
View file @ 0cecefd4
...@@ -40,7 +40,7 @@ The front end is a replicated service with 3 replicas: ...@@ -40,7 +40,7 @@ The front end is a replicated service with 3 replicas:
``` ```
- name: frontend - name: frontend
type: https://raw.githubusercontent.com/kubernetes/deployment-manager/master/examples/replicatedservice/replicatedservice.py type: https://raw.githubusercontent.com/kubernetes/deployment-manager/master/types/replicatedservice/v1/replicatedservice.py
properties: properties:
service_port: 80 service_port: 80
container_port: 80 container_port: 80
...@@ -63,7 +63,7 @@ which is a [Jinja](http://jinja.pocoo.org/) template with a [schema](../../types ...@@ -63,7 +63,7 @@ which is a [Jinja](http://jinja.pocoo.org/) template with a [schema](../../types
resources: resources:
- name: redis-master - name: redis-master
type: https://raw.githubusercontent.com/kubernetes/deployment-manager/master/examples/replicatedservice/replicatedservice.py type: https://raw.githubusercontent.com/kubernetes/deployment-manager/master/types/replicatedservice/v1/replicatedservice.py
properties: properties:
# This has to be overwritten since service names are hard coded in the code # This has to be overwritten since service names are hard coded in the code
service_name: redis-master service_name: redis-master
...@@ -75,7 +75,7 @@ resources: ...@@ -75,7 +75,7 @@ resources:
image: redis image: redis
- name: redis-slave - name: redis-slave
type: https://raw.githubusercontent.com/kubernetes/deployment-manager/master/examples/replicatedservice/replicatedservice.py type: https://raw.githubusercontent.com/kubernetes/deployment-manager/master/types/replicatedservice/v1/replicatedservice.py
properties: properties:
# This has to be overwritten since service names are hard coded in the code # This has to be overwritten since service names are hard coded in the code
service_name: redis-slave service_name: redis-slave
...@@ -99,7 +99,7 @@ You can see the types you deployed to the cluster using the `deployed-types` com ...@@ -99,7 +99,7 @@ You can see the types you deployed to the cluster using the `deployed-types` com
``` ```
dm deployed-types dm deployed-types
["Service","ReplicationController","redis.jinja","https://raw.githubusercontent.com/kubernetes/deployment-manager/master/examples/replicatedservice/replicatedservice.py"] ["Service","ReplicationController","redis.jinja","https://raw.githubusercontent.com/kubernetes/deployment-manager/master/types/replicatedservice/v1/replicatedservice.py"]
``` ```
This output shows 2 primitive types (Service and ReplicationController), and 2 This output shows 2 primitive types (Service and ReplicationController), and 2
......
examples/guestbook/guestbook.yaml
View file @ 0cecefd4
resources: resources:
- name: frontend - name: frontend
type: https://raw.githubusercontent.com/kubernetes/deployment-manager/master/examples/replicatedservice/replicatedservice.py type: https://raw.githubusercontent.com/kubernetes/deployment-manager/master/types/replicatedservice/v1/replicatedservice.py
properties: properties:
service_port: 80 service_port: 80
container_port: 80 container_port: 80
...@@ -8,5 +8,5 @@ resources: ...@@ -8,5 +8,5 @@ resources:
replicas: 3 replicas: 3
image: gcr.io/google_containers/example-guestbook-php-redis:v3 image: gcr.io/google_containers/example-guestbook-php-redis:v3
- name: redis - name: redis
type: https://raw.githubusercontent.com/kubernetes/deployment-manager/master/examples/redis/redis.jinja type: https://raw.githubusercontent.com/kubernetes/deployment-manager/master/types/redis/v1/redis.jinja
properties: null properties: null
types/redis/v1/redis.jinja
View file @ 0cecefd4
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
resources: resources:
- name: redis-master - name: redis-master
type: https://raw.githubusercontent.com/kubernetes/deployment-manager/master/examples/replicatedservice/replicatedservice.py type: https://raw.githubusercontent.com/kubernetes/deployment-manager/master/types/replicatedservice/v1/replicatedservice.py
properties: properties:
# This has to be overwritten since service names are hard coded in the code # This has to be overwritten since service names are hard coded in the code
service_name: redis-master service_name: redis-master
...@@ -15,7 +15,7 @@ resources: ...@@ -15,7 +15,7 @@ resources:
image: redis image: redis
- name: redis-slave - name: redis-slave
type: https://raw.githubusercontent.com/kubernetes/deployment-manager/master/examples/replicatedservice/replicatedservice.py type: https://raw.githubusercontent.com/kubernetes/deployment-manager/master/types/replicatedservice/v1/replicatedservice.py
properties: properties:
# This has to be overwritten since service names are hard coded in the code # This has to be overwritten since service names are hard coded in the code
service_name: redis-slave service_name: redis-slave
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment