Skip to content

Commit

Permalink
chore: update max_concurrent property in YAML files
Browse files Browse the repository at this point in the history
Signed-off-by: Brooks Townsend <[email protected]>
  • Loading branch information
brooksmtownsend committed Nov 20, 2023
1 parent 66d30c2 commit 6ec32a2
Show file tree
Hide file tree
Showing 22 changed files with 74 additions and 68 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ spec:
traits:
- type: spreadscaler
properties:
replicas: 1
max_concurrent: 1
- type: linkdef
properties:
target: httpserver
Expand All @@ -67,7 +67,7 @@ spec:
traits:
- type: spreadscaler
properties:
replicas: 1
max_concurrent: 1
```
Then, use **wadm** to put the manifest and deploy it.
Expand Down Expand Up @@ -107,7 +107,7 @@ spec:
traits:
- type: spreadscaler
properties:
replicas: 10 # Let's run 10!
max_concurrent: 10 # Let's run 10!
<<ELIDED>>
```

Expand Down
18 changes: 12 additions & 6 deletions oam/README.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,23 @@
# wadm Open Application Model

The wasmCloud Application Deployment Manager uses the [Open Application Model](https://oam.dev) to define application specifications. Because this specification is extensible and _platform agnostic_, it makes for an ideal way to represent applications with metadata specific to wasmCloud.

## wasmCloud OAM Components

The following is a list of the `component`s wasmCloud has added to the model.
* `actor` - An actor
* `provider` - A capability provider

- `actor` - An actor
- `provider` - A capability provider

## wasmCloud OAM Traits

The following is a list of the `traits` wasmCloud has added via customization to its application model.
* `spreadscaler` - Defines the spread of instances of a particular entity across multiple hosts with affinity requirements
* `linkdef` - A link definition that describes a link between an actor and a capability provider

- `spreadscaler` - Defines the spread of instances of a particular entity across multiple hosts with affinity requirements
- `linkdef` - A link definition that describes a link between an actor and a capability provider

## Example Application YAML

The following is an example YAML file describing an ALC application

```yaml
Expand All @@ -31,7 +37,7 @@ spec:
traits:
- type: spreadscaler
properties:
replicas: 4
max_concurrent: 4
spread:
- name: eastcoast
requirements:
Expand Down Expand Up @@ -63,7 +69,7 @@ spec:
traits:
- type: spreadscaler
properties:
replicas: 1
max_concurrent: 1
spread:
- name: haslights
requirements:
Expand Down
2 changes: 1 addition & 1 deletion oam/custom.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
# NOTE: This demonstrates what a custom scaler could look like. This functionality does not currently exist
- type: customscaler
properties:
replicas: 4
max_concurrent: 4
clouds:
- aws
- azure
Expand Down
4 changes: 2 additions & 2 deletions oam/echo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
traits:
- type: spreadscaler
properties:
replicas: 1
max_concurrent: 1
- type: linkdef
properties:
target: httpserver
Expand All @@ -29,4 +29,4 @@ spec:
traits:
- type: spreadscaler
properties:
replicas: 1
max_concurrent: 1
14 changes: 7 additions & 7 deletions oam/petclinic.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
traits:
- type: spreadscaler
properties:
replicas: 1
max_concurrent: 1
spread:
- name: uiclinicapp
requirements:
Expand All @@ -32,7 +32,7 @@ spec:
uri: postgres://user:[email protected]/petclinic
- type: spreadscaler
properties:
replicas: 1
max_concurrent: 1
spread:
- name: customersclinicapp
requirements:
Expand All @@ -50,7 +50,7 @@ spec:
uri: postgres://user:[email protected]/petclinic
- type: spreadscaler
properties:
replicas: 1
max_concurrent: 1
spread:
- name: vetsclinicapp
requirements:
Expand All @@ -69,7 +69,7 @@ spec:

- type: spreadscaler
properties:
replicas: 1
max_concurrent: 1
spread:
- name: visitsclinicapp
requirements:
Expand All @@ -82,7 +82,7 @@ spec:
traits:
- type: spreadscaler
properties:
replicas: 1
max_concurrent: 1
spread:
- name: clinicapp
requirements:
Expand All @@ -101,7 +101,7 @@ spec:
traits:
- type: spreadscaler
properties:
replicas: 1
max_concurrent: 1
spread:
- name: httpserverspread
requirements:
Expand All @@ -115,7 +115,7 @@ spec:
traits:
- type: spreadscaler
properties:
replicas: 1
max_concurrent: 1
spread:
- name: postgresspread
requirements:
Expand Down
4 changes: 2 additions & 2 deletions oam/simple2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
traits:
- type: spreadscaler
properties:
replicas: 4
max_concurrent: 4
spread:
- name: eastcoast
requirements:
Expand Down Expand Up @@ -43,7 +43,7 @@ spec:
traits:
- type: spreadscaler
properties:
replicas: 1
max_concurrent: 1
spread:
- name: haslights
requirements:
Expand Down
4 changes: 2 additions & 2 deletions test/data/all_hosts.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
traits:
- type: spreadscaler
properties:
replicas: 5
max_concurrent: 5
spread:
- name: eastcoast
requirements:
Expand Down Expand Up @@ -42,7 +42,7 @@ spec:
traits:
- type: spreadscaler
properties:
replicas: 5
max_concurrent: 5
spread:
- name: eastcoast
requirements:
Expand Down
6 changes: 3 additions & 3 deletions test/data/complex.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
traits:
- type: spreadscaler
properties:
replicas: 5
max_concurrent: 5
spread:
- name: eastcoast
requirements:
Expand Down Expand Up @@ -43,7 +43,7 @@ spec:
traits:
- type: spreadscaler
properties:
replicas: 3
max_concurrent: 3
spread:
- name: westcoast
requirements:
Expand All @@ -62,7 +62,7 @@ spec:
traits:
- type: spreadscaler
properties:
replicas: 1
max_concurrent: 1
spread:
- name: the-moon
requirements:
Expand Down
14 changes: 7 additions & 7 deletions test/data/duplicate_component.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
traits:
- type: spreadscaler
properties:
replicas: 1
max_concurrent: 1
spread:
- name: uiclinicapp
requirements:
Expand All @@ -32,7 +32,7 @@ spec:
uri: postgres://user:[email protected]/petclinic
- type: spreadscaler
properties:
replicas: 1
max_concurrent: 1
spread:
- name: customersclinicapp
requirements:
Expand All @@ -51,7 +51,7 @@ spec:
foo: bar
- type: spreadscaler
properties:
replicas: 1
max_concurrent: 1
spread:
- name: vetsclinicapp
requirements:
Expand All @@ -70,7 +70,7 @@ spec:

- type: spreadscaler
properties:
replicas: 1
max_concurrent: 1
spread:
- name: visitsclinicapp
requirements:
Expand All @@ -83,7 +83,7 @@ spec:
traits:
- type: spreadscaler
properties:
replicas: 1
max_concurrent: 1
spread:
- name: clinicapp
requirements:
Expand All @@ -102,7 +102,7 @@ spec:
traits:
- type: spreadscaler
properties:
replicas: 1
max_concurrent: 1
spread:
- name: httpserverspread
requirements:
Expand All @@ -116,7 +116,7 @@ spec:
traits:
- type: spreadscaler
properties:
replicas: 1
max_concurrent: 1
spread:
- name: postgresspread
requirements:
Expand Down
2 changes: 1 addition & 1 deletion test/data/duplicate_imageref1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
traits:
- type: spreadscaler
properties:
replicas: 4
max_concurrent: 4
spread:
- name: eastcoast
requirements:
Expand Down
6 changes: 3 additions & 3 deletions test/data/duplicate_imageref2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
traits:
- type: spreadscaler
properties:
replicas: 1
max_concurrent: 1
spread:
- name: uiclinicapp
requirements:
Expand All @@ -27,8 +27,8 @@ spec:
traits:
- type: spreadscaler
properties:
replicas: 1
max_concurrent: 1
spread:
- name: customersclinicapp
requirements:
app: petclinic
app: petclinic
14 changes: 7 additions & 7 deletions test/data/duplicate_linkdef.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
traits:
- type: spreadscaler
properties:
replicas: 1
max_concurrent: 1
spread:
- name: uiclinicapp
requirements:
Expand All @@ -32,7 +32,7 @@ spec:
uri: postgres://user:[email protected]/petclinic
- type: spreadscaler
properties:
replicas: 1
max_concurrent: 1
spread:
- name: customersclinicapp
requirements:
Expand All @@ -56,7 +56,7 @@ spec:
uri: postgres://user:[email protected]/petclinic2
- type: spreadscaler
properties:
replicas: 1
max_concurrent: 1
spread:
- name: vetsclinicapp
requirements:
Expand All @@ -75,7 +75,7 @@ spec:

- type: spreadscaler
properties:
replicas: 1
max_concurrent: 1
spread:
- name: visitsclinicapp
requirements:
Expand All @@ -88,7 +88,7 @@ spec:
traits:
- type: spreadscaler
properties:
replicas: 1
max_concurrent: 1
spread:
- name: clinicapp
requirements:
Expand All @@ -107,7 +107,7 @@ spec:
traits:
- type: spreadscaler
properties:
replicas: 1
max_concurrent: 1
spread:
- name: httpserverspread
requirements:
Expand All @@ -121,7 +121,7 @@ spec:
traits:
- type: spreadscaler
properties:
replicas: 1
max_concurrent: 1
spread:
- name: postgresspread
requirements:
Expand Down
2 changes: 1 addition & 1 deletion test/data/host_stop.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
traits:
- type: spreadscaler
properties:
replicas: 5
max_concurrent: 5
spread:
- name: eastcoast
requirements:
Expand Down
Loading

0 comments on commit 6ec32a2

Please sign in to comment.