Skip to content

Commit 7ed243d

Browse files
zeroalphatzeroalphat
committed
fix: make pod scheduling configuration customizable
Signed-off-by: zeroalphat <taichi-takemura@cybozu.co.jp>
1 parent fcc50bf commit 7ed243d

File tree

3 files changed

+33
-25
lines changed

3 files changed

+33
-25
lines changed

‎charts/ofen/README.md‎

Lines changed: 29 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -29,26 +29,35 @@ $ helm install --create-namespace --namespace ofen-system ofen -f values.yaml of
2929

3030
## Values
3131

32-
| Key | Type | Default | Description |
33-
| ---------------------------- | ------ | --------------------------------------------- | ---------------------------------------------------------------------------------- |
34-
| crds.enabled | bool | `true` | Install and update CRDs as part of the Helm chart. |
35-
| crds.keep | bool | `true` | Keep existing CRDs during uninstallation. |
36-
| controller.replicas | int | `2` | Number of replicas for the ofen-controller Deployment. |
37-
| controller.image.repository | string | `"ghcr.io/cybozu-go/ofen"` | ofen-controller image repository to use. |
38-
| controller.image.pullPolicy | string | `"IfNotPresent"` | ofen-controller image pull policy. |
39-
| controller.image.tag | string | `""` | ofen-controller image tag to use. |
40-
| controller.imagePullSecrets | list | `[]` | Secrets for pulling the ofen-controller image from a private repository. |
41-
| controller.resources | object | `{"requests":{"cpu":"100m","memory":"20Mi"}}` | Resource requests and limits for the ofen-controller Deployment. |
42-
| controller.extraArgs | list | `[]` | Additional command line arguments to pass to the ofen-controller binary. |
43-
| daemon.image.repository | string | `"ghcr.io/cybozu-go/ofend"` | ofen-daemon image repository to use. |
44-
| daemon.image.pullPolicy | string | `"IfNotPresent"` | ofen-daemon image pull policy. |
45-
| daemon.image.tag | string | `""` | ofen-daemon image tag to use. |
46-
| daemon.imagePullSecrets | list | `[]` | Secrets for pulling the ofen-daemon image from a private repository. |
47-
| daemon.resources | object | `{"requests":{"cpu":"100m","memory":"20Mi"}}` | Resource requests and limits for the ofen-daemon DaemonSet. |
48-
| daemon.extraArgs | list | `[]` | Additional command line arguments to pass to the ofen-daemon binary. |
49-
| daemon.containerdSockPath | string | `"/run/containerd/containerd.sock"` | Path to the containerd socket. |
50-
| daemon.containerdHostDirPath | string | `"/etc/containerd/certs.d"` | Path to the host directory where containerd certificate configurations are stored. |
51-
| allowRegistries | list | `[]` | Allow pulling images from some registries. |
32+
| Key | Type | Default | Description |
33+
| ------------------------------------ | ------ | --------------------------------------------- | ---------------------------------------------------------------------------------- |
34+
| crds.enabled | bool | `true` | Install and update CRDs as part of the Helm chart. |
35+
| crds.keep | bool | `true` | Keep CRDs when uninstalling the chart. |
36+
| controller.replicas | int | `2` | Number of replicas for the ofen-controller Deployment. |
37+
| controller.image.repository | string | `"ghcr.io/cybozu-go/ofen"` | The ofen-controller image repository to use. |
38+
| controller.image.pullPolicy | string | `"IfNotPresent"` | The ofen-controller image pull policy. |
39+
| controller.image.tag | string | `""` | The ofen-controller image tag to use. |
40+
| controller.imagePullSecrets | list | `[]` | Secrets for pulling the ofen-controller image from a private repository. |
41+
| controller.resources | object | `{"requests":{"cpu":"100m","memory":"20Mi"}}` | Resource requests and limits for the ofen-controller Deployment. |
42+
| controller.extraArgs | list | `[]` | Additional command line arguments to pass to the ofen-controller binary. |
43+
| controller.nodeSelector | object | `{}` | NodeSelector used by the ofen-controller. |
44+
| controller.affinity | object | `{}` | Affinity used by the ofen-controller. |
45+
| controller.tolerations | list | `[]` | Tolerations used by the ofen-controller. |
46+
| controller.topologySpreadConstraints | list | `[]` | Topology spread constraints used by the ofen-controller. |
47+
| controller.priorityClassName | string | `""` | PriorityClass used by the ofen-controller. |
48+
| daemon.image.repository | string | `"ghcr.io/cybozu-go/ofend"` | The ofen-daemon image repository to use. |
49+
| daemon.image.pullPolicy | string | `"IfNotPresent"` | The ofen-daemon image pull policy. |
50+
| daemon.image.tag | string | `""` | The ofen-daemon image tag to use. |
51+
| daemon.imagePullSecrets | list | `[]` | Secrets for pulling the ofen-daemon image from a private repository. |
52+
| daemon.resources | object | `{"requests":{"cpu":"100m","memory":"20Mi"}}` | Resource requests and limits for the ofen-daemon DaemonSet. |
53+
| daemon.extraArgs | list | `[]` | Additional command line arguments to pass to the ofen-daemon binary. |
54+
| daemon.containerdSockPath | string | `"/run/containerd/containerd.sock"` | Path to the containerd socket. |
55+
| daemon.containerdHostDirPath | string | `"/etc/containerd/certs.d"` | Path to the host directory where containerd certificate configurations are stored. |
56+
| daemon.nodeSelector | object | `{}` | Node labels for scheduling the ofen-daemon. |
57+
| daemon.affinity | object | `{}` | Affinity used by the ofen-daemon. |
58+
| daemon.tolerations | list | `[]` | Tolerations used by the ofen-daemon. |
59+
| daemon.priorityClassName | string | `""` | PriorityClass used by the ofen-daemon. |
60+
| allowRegistries | list | `[]` | Allow pulling images from specified registries. |
5261

5362
## Generate Manifests
5463

‎charts/ofen/templates/daemonset.yaml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,3 @@ spec:
9191
- name: containerd-host-dir
9292
hostPath:
9393
path: {{ .Values.daemon.containerdHostDirPath }}
94-
tolerations:
95-
- key: node-role.kubernetes.io/control-plane
96-
effect: NoSchedule

‎charts/ofen/values.yaml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ controller:
5959

6060
# priorityClassName -- PriorityClass used by ofen-controller.
6161
priorityClassName: ""
62-
62+
6363

6464
daemon:
6565
image:
@@ -98,7 +98,9 @@ daemon:
9898
affinity: {}
9999

100100
# tolerations -- tolerations used by ofen-daemon.
101-
tolerations: []
101+
tolerations:
102+
- key: node-role.kubernetes.io/control-plane
103+
effect: NoSchedule
102104

103105
# priorityClassName -- PriorityClass used by ofen-daemon.
104106
priorityClassName: ""

0 commit comments

Comments
 (0)