Skip to content

Commit

Permalink
feat: add hostNetwork option for controller-manager and update doc ac…
Browse files Browse the repository at this point in the history
…cordingly (chaos-mesh#874)

Signed-off-by: colstuwjx <colstuwjx@gmail.com>
  • Loading branch information
Colstuwjx committed Sep 7, 2020
1 parent eccbbbd commit 6a0e7aa
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 1 deletion.
3 changes: 3 additions & 0 deletions helm/chaos-mesh/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ The following tables list the configurable parameters of the Chaos Mesh chart an
| `rbac.create` | | `true` |
| `timezone` | The timezone where controller-manager, chaos-daemon and dashboard uses. For example: `UTC`, `Asia/Shanghai` | `UTC` |
| `enableProfiling` | A flag to enable pprof in controller-manager and chaos-daemon | `true` |
| `controllerManager.hostNetwork` | running chaos-controller-manager on host network | `false` |
| `controllerManager.serviceAccount` | The serviceAccount for chaos-controller-manager | `chaos-controller-manager` |
| `controllerManager.replicaCount` | Replicas for chaos-controller-manager | `1` |
| `controllerManager.image` | docker image for chaos-controller-manager | `pingcap/chaos-mesh:latest` |
Expand All @@ -38,6 +39,8 @@ The following tables list the configurable parameters of the Chaos Mesh chart an
| `chaosDaemon.imagePullPolicy` | image pull policy | `Always` |
| `chaosDaemon.grpcPort` | The port which grpc server listens on | `31767` |
| `chaosDaemon.httpPort` | The port which http server listens on | `31766` |
| `chaosDaemon.env` | chaosDaemon envs | `{}` |
| `chaosDaemon.hostNetwork` | running chaosDaemon on host network | `false` |
| `chaosDaemon.podAnnotations` | Pod annotations of chaos-daemon | `{}` |
| `chaosDaemon.runtime` | Runtime specifies which container runtime to use. Currently we only supports docker and containerd. | `docker` |
| `chaosDaemon.socketPath` | Specifies the container runtime socket | `/var/run/docker.sock` |
Expand Down
3 changes: 3 additions & 0 deletions helm/chaos-mesh/templates/controller-manager-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ spec:
{{ toYaml . | indent 8 }}
{{- end }}
spec:
{{- if .Values.controllerManager.hostNetwork }}
hostNetwork: true
{{- end }}
{{- if .Values.controllerManager.serviceAccount }}
serviceAccount: {{ .Values.controllerManager.serviceAccount }}
{{- end }}
Expand Down
2 changes: 1 addition & 1 deletion helm/chaos-mesh/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ enableProfiling: true
kubectlImage: bitnami/kubectl:latest

controllerManager:
hostNetwork: false
serviceAccount: chaos-controller-manager

replicaCount: 1
Expand Down Expand Up @@ -155,7 +156,6 @@ dashboard:
#
subPath: ""


# The keys within the "env" map are mounted as environment variables on the Chaos Dashboard pod.
env:
LISTEN_HOST: "0.0.0.0"
Expand Down

0 comments on commit 6a0e7aa

Please sign in to comment.