Skip to content

Commit

Permalink
Don't exclude spiff templates
Browse files Browse the repository at this point in the history
  • Loading branch information
acrmp committed Sep 15, 2014
1 parent 6fa4014 commit 005d419
Show file tree
Hide file tree
Showing 6 changed files with 169 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*.yml
/*.yml
config/dev.yml
config/private.yml
releases/*.tgz
Expand Down
2 changes: 2 additions & 0 deletions config/blobs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
{}
8 changes: 8 additions & 0 deletions config/final.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
final_name: kubernetes
blobstore:
provider: s3
options:
bucket_name: kubernetes-boshrelease
access_key_id:
secret_access_key:
27 changes: 27 additions & 0 deletions templates/k8s-deployment.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
---
name: kubernetes
director_uuid: (( merge ))

releases:
- name: kubernetes
version: latest

compilation:
workers: 4
network: default
reuse_compilation_vms: false
cloud_properties: {}

resource_pools: (( merge ))

update:
canaries: 0
canary_watch_time: 30000-240000
update_watch_time: 30000-240000
max_in_flight: 32
serial: false

networks: (( merge ))
jobs: (( merge ))
resource_pools: (( merge ))
properties: (( merge ))
75 changes: 75 additions & 0 deletions templates/k8s-infrastructure-warden.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
resource_pools:
- name: default
network: default
stemcell:
name: bosh-warden-boshlite-ubuntu-trusty-go_agent
version: latest
cloud_properties: {}

networks:
- name: default
subnets:
- range: 10.244.8.4/30
reserved: [10.244.8.5]
static: [10.244.8.6]
cloud_properties: {}
- range: 10.244.8.8/30
reserved: [10.244.8.9]
static: [10.244.8.10]
cloud_properties: {}
- range: 10.244.8.12/30
reserved: [10.244.8.13]
static: [10.244.8.14]
cloud_properties: {}
- range: 10.244.8.16/30
reserved: [10.244.8.17]
static: [10.244.8.18]
cloud_properties: {}
- range: 10.244.8.20/30
reserved: [10.244.8.21]
static: [10.244.8.22]
cloud_properties: {}
- range: 10.244.8.24/30
reserved: [10.244.8.25]
static: []
cloud_properties: {}
- range: 10.244.8.28/30
reserved: [10.244.8.29]
static: []
cloud_properties: {}
- range: 10.244.8.32/30
reserved: [10.244.8.33]
static: []
cloud_properties: {}
- range: 10.244.8.36/30
reserved: [10.244.8.37]
static: []
cloud_properties: {}

jobs:
- name: master
instances: 1
networks:
- name: default
static_ips: (( static_ips(0) ))
properties:
apiserver:
machines: (( jobs.master.networks.default.static_ips jobs.minion.networks.default.static_ips ))
- name: minion
instances: 2
networks:
- name: default
static_ips: (( static_ips(1, 2) ))
- name: guestbook-example
lifecycle: errand
instances: 1
networks:
- name: default
static_ips: (( static_ips(3) ))
properties:
apiserver:
host: (( jobs.master.networks.default.static_ips.[0] ))

properties:
etcd:
machines: (( jobs.master.networks.default.static_ips jobs.minion.networks.default.static_ips ))
56 changes: 56 additions & 0 deletions templates/k8s-jobs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
jobs:
- name: master
templates:
- name: docker
- name: etcd
- name: rudder
- name: kubernetes-minion
- name: kubernetes-master
instances: 1
resource_pool: default
persistent_disk: 65536
networks:
- name: default
static_ips: (( merge ))
properties:
networks:
apps: default
apiserver:
machines: (( merge ))
- name: minion
templates:
- name: docker
- name: etcd
- name: rudder
- name: kubernetes-minion
instances: 2
resource_pool: default
persistent_disk: 65536
networks:
- name: default
static_ips: (( merge ))
properties:
networks:
apps: default
- name: guestbook-example
lifecycle: errand
templates:
- name: guestbook-example
- name: etcd
- name: rudder
instances: 1
resource_pool: default
networks:
- name: default
static_ips: (( merge ))
properties:
apiserver:
host: (( static_ips(0) ))
networks:
apps: default

properties:
etcd:
machines: (( merge ))

resource_pools: (( merge ))

0 comments on commit 005d419

Please sign in to comment.