Skip to content

Commit

Permalink
Remove dead code
Browse files Browse the repository at this point in the history
  • Loading branch information
johngmyers committed Jun 14, 2021
1 parent 5d844d1 commit 3082847
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions pkg/model/components/cilium.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ limitations under the License.
package components

import (
"github.com/blang/semver/v4"
"k8s.io/apimachinery/pkg/api/resource"
"k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/pkg/wellknownports"
Expand All @@ -43,8 +42,6 @@ func (b *CiliumOptionsBuilder) BuildOptions(o interface{}) error {
c.Version = "v1.10.0"
}

version, _ := semver.ParseTolerant(c.Version)

if c.BPFCTGlobalAnyMax == 0 {
c.BPFCTGlobalAnyMax = 262144

Expand Down Expand Up @@ -78,11 +75,7 @@ func (b *CiliumOptionsBuilder) BuildOptions(o interface{}) error {
}

if c.Ipam == "" {
if version.Minor >= 8 {
c.Ipam = "kubernetes"
} else {
c.Ipam = "hostscope"
}
c.Ipam = "kubernetes"
}

if c.DisableMasquerade == nil {
Expand Down

0 comments on commit 3082847

Please sign in to comment.