Skip to content

Commit

Permalink
Bumped release versions, default stemcell alias, and fixed whitespace
Browse files Browse the repository at this point in the history
  • Loading branch information
dennisjbell committed Jul 23, 2023
1 parent 9fb3ba4 commit f931272
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 36 deletions.
8 changes: 4 additions & 4 deletions manifests/releases/postgres.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
releases:
- name: "postgres"
version: "43"
url: "https://bosh.io/d/github.com/cloudfoundry/postgres-release?v=43"
sha1: "e44bbe8f8a7cdde1cda67b202e399a239d104db6"
- name: "postgres"
version: "44"
sha1: "582b1de9522077102dfa44ff7164cd8f499dbfc8"
url: "https://bosh.io/d/github.com/cloudfoundry/postgres-release?v=44"
25 changes: 14 additions & 11 deletions manifests/releases/routing.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
releases:
- name: "routing"
version: "0.237.0"
url: "https://bosh.io/d/github.com/cloudfoundry/routing-release?v=0.237.0"
sha1: "0024f2d9f8bb3c624a162db4c3a5919388c6d800"
- name: "bpm"
version: "1.1.18"
url: "https://bosh.io/d/github.com/cloudfoundry/bpm-release?v=1.1.18"
sha1: "86675f90d66f7018c57f4ae0312f1b3834dd58c9"
- name: "bosh-dns-aliases"

- name: "routing"
version: "0.266.0"
sha1: "d57ae8fe0d0d8a9b040cea254a782d1d5e8fa2e3"
url: "https://bosh.io/d/github.com/cloudfoundry/routing-release?v=0.266.0"

- name: "bpm"
version: "1.2.1"
sha1: "36299a55c00d28cfe54bbb4772ca617f52d76adb"
url: "https://bosh.io/d/github.com/cloudfoundry/bpm-release?v=1.2.1"

- name: "bosh-dns-aliases"
version: "0.0.4"
url: "https://bosh.io/d/github.com/cloudfoundry/bosh-dns-aliases-release?v=0.0.4"
sha1: "55b3dced813ff9ed92a05cda02156e4b5604b273"
sha1: "55b3dced813ff9ed92a05cda02156e4b5604b273"
url: "https://bosh.io/d/github.com/cloudfoundry/bosh-dns-aliases-release?v=0.0.4"
8 changes: 4 additions & 4 deletions manifests/releases/scheduler.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
releases:
- name: ocf-scheduler
version: 0.0.10
url: https://github.com/starkandwayne/ocf-scheduler-boshrelease/releases/download/0.0.10/ocf-scheduler-v0.0.10.tgz
sha1: b1417d82ec3571f8a177010b21f33fe1d07995bb
- name: ocf-scheduler
version: 0.1.0
url: https://github.com/cloudfoundry-community/ocf-scheduler-boshrelease/releases/download/v0.1.0/ocf-scheduler-0.1.0.tgz
sha1: 0dd081844a7ec208d876b067697178e348aee8ec
33 changes: 16 additions & 17 deletions manifests/scheduler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,25 +27,25 @@ meta:
scheduler:
domain: (( concat "scheduler." meta.cf.system.domain ))

networks:
- name: (( grab params.network || "default" ))
networks:
- name: (( grab params.network || "default" ))

azs:
- (( grab params.availability_zones || "z1"))
- (( grab params.availability_zones || "z1"))

vm_type: (( grab params.vm_type || "default" ))

smoke-tests:
vm_type: (( grab params.vm_type || "errand" ))
vm_type: (( grab params.vm_type || "errand" ))

db:
scheme: "postgres"
username: "scheduler"
password: "scheduler"
hostname: "127.0.0.1"
port: "5432"
sslmode: "disable"
database: "scheduler"
scheme: "postgres"
username: "scheduler"
password: "scheduler"
hostname: "127.0.0.1"
port: "5432"
sslmode: "disable"
database: "scheduler"

params: # NOTE: Contract with kit & genesis is that params are flat for kits.
pg_scheme: (( grab meta.db.scheme ))
Expand All @@ -61,11 +61,11 @@ instance_groups:
- name: scheduler
instances: 1
azs: (( grab meta.scheduler.azs ))
stemcell: (( grab meta.scheduler.stemcell.name ))
stemcell: (( grab meta.scheduler.stemcell.name || "default" ))
networks: (( grab meta.scheduler.networks ))
vm_type: (( grab meta.scheduler.vm_type ))

jobs:
jobs:
- name: scheduler
release: ocf-scheduler
consumes:
Expand All @@ -89,7 +89,7 @@ instance_groups:
roles:
- name: (( grab params.pg_username ))
password: (( grab params.pg_password ))
databases:
databases:
- name: (( grab params.pg_database ))
port: (( grab params.pg_port ))
provides:
Expand Down Expand Up @@ -127,7 +127,6 @@ update:
update_watch_time: 5000-600000

stemcells:
- alias: default
os: (( grab params.stemcell_os || "ubuntu-bionic" ))
- alias: default
os: (( grab params.stemcell_os || "ubuntu-jammy" ))
version: (( grab params.stemcell_version || "latest" ))

0 comments on commit f931272

Please sign in to comment.