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

Remove dead code

This commit is contained in:
John Gardiner Myers 2021-06-13 16:58:55 -07:00
parent 3cf8234d01
commit 0b7f6e3082
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/model/components/cilium.go
View File

@ -17,7 +17,6 @@ limitations under the License.
package components package components
import ( import (
"github.com/blang/semver/v4"
"k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/api/resource"
"k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/pkg/wellknownports" "k8s.io/kops/pkg/wellknownports"
@ -43,8 +42,6 @@ func (b *CiliumOptionsBuilder) BuildOptions(o interface{}) error {
c.Version = "v1.10.0" c.Version = "v1.10.0"
} }
version, _ := semver.ParseTolerant(c.Version)
if c.BPFCTGlobalAnyMax == 0 { if c.BPFCTGlobalAnyMax == 0 {
c.BPFCTGlobalAnyMax = 262144 c.BPFCTGlobalAnyMax = 262144
@ -78,11 +75,7 @@ func (b *CiliumOptionsBuilder) BuildOptions(o interface{}) error {
} }
if c.Ipam == "" { if c.Ipam == "" {
if version.Minor >= 8 { c.Ipam = "kubernetes"
c.Ipam = "kubernetes"
} else {
c.Ipam = "hostscope"
}
} }
if c.DisableMasquerade == nil { if c.DisableMasquerade == nil {