kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8958 from justinsb/flannel_sysctls_rhel7 

Turn on flannel sysctl fixes on rhel7 as well
This commit is contained in:
Kubernetes Prow Robot 2020-04-22 18:33:45 -07:00 committed by GitHub
parent 9621254b5d bb071bfb3a
commit f2f9252a79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nodeup/pkg/model/sysctls.go
View File

@ -118,14 +118,14 @@ func (b *SysctlBuilder) Build(c *fi.ModelBuilderContext) error {
)
}
// Running Flannel on CentOS 7 needs custom settings
// Running Flannel on CentOS7 / rhel7 needs custom settings
if b.Cluster.Spec.Networking.Flannel != nil {
proxyMode := b.Cluster.Spec.KubeProxy.ProxyMode
if proxyMode == "" {
proxyMode = "iptables"
}
if proxyMode == "iptables" && b.Distribution == distros.DistributionCentos7 {
if proxyMode == "iptables" && (b.Distribution == distros.DistributionCentos7 || b.Distribution == distros.DistributionRhel7) {
sysctls = append(sysctls,
"# Flannel settings on CentOS 7",
"# Issue https://github.com/coreos/flannel/issues/902",