Unverified Commit 0d6a2bfb authored by Erik Wilson's avatar Erik Wilson Committed by GitHub

Merge pull request #1974 from mschneider82/patch-1

fixed panic in network_policy_controller
parents 42f0b95a 56a083c8
...@@ -1693,7 +1693,11 @@ func NewNetworkPolicyController( ...@@ -1693,7 +1693,11 @@ func NewNetworkPolicyController(
npc.syncPeriod = ipTablesSyncPeriod npc.syncPeriod = ipTablesSyncPeriod
npc.v1NetworkPolicy = true npc.v1NetworkPolicy = true
v, _ := clientset.Discovery().ServerVersion() v, err := clientset.Discovery().ServerVersion()
if err != nil {
return nil, err
}
valid := regexp.MustCompile("[0-9]") valid := regexp.MustCompile("[0-9]")
v.Minor = strings.Join(valid.FindAllString(v.Minor, -1), "") v.Minor = strings.Join(valid.FindAllString(v.Minor, -1), "")
minorVer, _ := strconv.Atoi(v.Minor) minorVer, _ := strconv.Atoi(v.Minor)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment