Skip to content
This repository has been archived by the owner on Jun 29, 2022. It is now read-only.

Add nodeAffinity and tolerations to contour #386

Merged
merged 5 commits into from
May 4, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
104 changes: 0 additions & 104 deletions assets/components/contour/contour/03-contour.yaml

This file was deleted.

160 changes: 0 additions & 160 deletions assets/components/contour/contour/03-envoy.yaml

This file was deleted.

24 changes: 24 additions & 0 deletions docs/configuration-reference/components/contour.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,28 @@ component "contour" {
# Optional arguments
service_monitor = false
ingress_hosts = ["*.example.lokomotive.org"]

node_affinity {
key = "node-role.kubernetes.io/node"
operator = "Exists"
}

node_affinity {
key = "network.lokomotive.io"
operator = "In"

# If the `operator` is set to `"In"`, `values` should be specified.
values = [
"foo",
]
}

toleration {
key = "network.lokomotive.io"
operator = "Equal"
value = "contour"
effect = "NoSchedule"
}
}
```

Expand All @@ -48,6 +70,8 @@ Example:
|------------------|---------------------------------------------------------------------------------------------|:-------:|:--------:|
| `service_monitor`| Create ServiceMonitor for Prometheus to scrape Contour and Envoy metrics. | false | false |
| `ingress_hosts` | [ExternalDNS component](external-dns.md) creates DNS entries from the values provided. | "" | false |
| `node_affinity` | Node affinity for deploying the operator pod and envoy daemonset. | - | false |
| `toleration` | Tolerations that the operator and envoy pods will tolerate. | - | false |

## Applying

Expand Down
6 changes: 3 additions & 3 deletions docs/configuration-reference/components/rook-ceph.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ component "rook-ceph" {
namespace = "rook-test"
monitor_count = 3
metadata_device = "md127"
node_selector {
node_affinity {
key = "node-role.kubernetes.io/storage"
operator = "Exists"
}
node_selector {
node_affinity {
key = "storage.lokomotive.io"
operator = "In"

Expand Down Expand Up @@ -66,7 +66,7 @@ Example:
|---------------------|----------------------------------------------------------------------------------------------------------------------------------------------------|:-------:|:--------:|
| `namespace` | Namespace to deploy the Ceph cluster into. Must be the same as the rook operator. | rook | false |
| `monitor_count` | Number of Ceph monitors to deploy. An odd number like 3 or 5 is recommended which should also be sufficient for most cases. | 1 | false |
| `node_selector` | Node selectors for deploying the Ceph cluster pods. | - | false |
| `node_affinity` | Node affinity for deploying the Ceph cluster pods. | - | false |
| `toleration` | Tolerations that the Ceph cluster pods will tolerate. | - | false |
| `metadata_device` | Name of the device to store the metadata on each storage machine. **Note**: Provide just the name of the device and skip prefixing with `/dev/`. | - | false |

Expand Down
6 changes: 3 additions & 3 deletions docs/configuration-reference/components/rook.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ component "rook" {
# Optional arguments
namespace = "rook-test"

node_selector {
node_affinity {
key = "node-role.kubernetes.io/node"
operator = "Exists"
}

node_selector {
node_affinity {
key = "storage.lokomotive.io"
operator = "In"

Expand Down Expand Up @@ -69,7 +69,7 @@ Example:
| Argument | Description | Default | Required |
|------------------------------|----------------------------------------------------------------------------------------------------------|:-------:|:--------:|
| `namespace` | Namespace to deploy the rook operator into. | rook | false |
| `node_selector` | Node selectors for deploying the operator pod. | - | false |
| `node_affinity` | Node affinity for deploying the operator pod. | - | false |
| `toleration` | Tolerations that the operator's pods will tolerate. | - | false |
| `agent_toleration_key` | Toleration key for the rook agent pods. | - | false |
| `agent_toleration_effect` | Toleration effect for the rook agent pods. Needs to be specified if `agent_toleration_key` is set. | - | false |
Expand Down
Loading