Skip to content

Commit

Permalink
helm: Remove duplicated key hostAliases
Browse files Browse the repository at this point in the history
The original commit adding .Values.hostAliases was to support cluster
mesh installation, however, recently, clustermesh installation via helm
is more polished in #17851. Hence, it's better to remove one.

Relates: 18a5fa9
Relates: #17851
Signed-off-by: Tam Mach <tam.mach@cilium.io>
  • Loading branch information
sayboras authored and kkourt committed Jun 23, 2022
1 parent 959568b commit ac4952d
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 21 deletions.
4 changes: 0 additions & 4 deletions Documentation/helm-values.rst

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion install/kubernetes/cilium/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,6 @@ contributors across the globe, there is almost always someone available to help.
| gke.enabled | bool | `false` | Enable Google Kubernetes Engine integration |
| healthChecking | bool | `true` | Enable connectivity health checking. |
| healthPort | int | `9879` | TCP port for the agent health API. This is not the port for cilium-health. |
| hostAliases | list | `[]` | Host aliases for cilium-agent. |
| hostFirewall | object | `{"enabled":false}` | Configure the host firewall. |
| hostFirewall.enabled | bool | `false` | Enables the enforcement of host policies in the eBPF datapath. |
| hostPort.enabled | bool | `false` | Enable hostPort service support. |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -627,10 +627,6 @@ spec:
# the etcd service
dnsPolicy: ClusterFirstWithHostNet
{{- end }}
{{- with .Values.hostAliases }}
hostAliases:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.affinity }}
affinity:
{{- toYaml . | nindent 8 }}
Expand Down
6 changes: 0 additions & 6 deletions install/kubernetes/cilium/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -117,12 +117,6 @@ tolerations:
# value: "value"
# effect: "NoSchedule|PreferNoSchedule|NoExecute(1.6 only)"

# -- Host aliases for cilium-agent.
hostAliases: []
# - ip: 10.10.xx.xx
# hostnames:
# - cluster1.mesh.cilium.io

# -- The priority class to use for cilium-agent.
priorityClassName: ""

Expand Down
6 changes: 0 additions & 6 deletions install/kubernetes/cilium/values.yaml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -114,12 +114,6 @@ tolerations:
# value: "value"
# effect: "NoSchedule|PreferNoSchedule|NoExecute(1.6 only)"

# -- Host aliases for cilium-agent.
hostAliases: []
# - ip: 10.10.xx.xx
# hostnames:
# - cluster1.mesh.cilium.io

# -- The priority class to use for cilium-agent.
priorityClassName: ""

Expand Down

0 comments on commit ac4952d

Please sign in to comment.