Remove Calico bgppeer KeepOriginalNextHop default

kubernetes · Apr 11, 2021 · 3e75879 · 3e75879
1 parent e288df4
commit 3e75879
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 67 deletions.
diff --git a/upup/models/bindata.go b/upup/models/bindata.go
diff --git a/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.16.yaml.template b/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.16.yaml.template
@@ -78,8 +78,6 @@ data:
 ---
 # Source: calico/templates/kdd-crds.yaml
 
-
----
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
@@ -212,8 +210,6 @@ status:
   conditions: []
   storedVersions: []
 
----
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -254,7 +250,6 @@ spec:
                 format: int32
                 type: integer
               keepOriginalNextHop:
-                default: false
                 description: Option to keep the original nexthop field when routes
                   are sent to a BGP Peer. Setting "true" configures the selected BGP
                   Peers node to use the "next hop keep;" instead of "next hop self;"(default)
@@ -319,8 +314,6 @@ status:
   conditions: []
   storedVersions: []
 
----
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -384,8 +377,6 @@ status:
   conditions: []
   storedVersions: []
 
----
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -452,15 +443,11 @@ status:
   conditions: []
   storedVersions: []
 
----
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: felixconfigurations.crd.projectcalico.org
-  labels:
-    role.kubernetes.io/networking: "1"
 spec:
   group: crd.projectcalico.org
   names:
@@ -1008,8 +995,6 @@ status:
   conditions: []
   storedVersions: []
 
----
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -1783,8 +1768,6 @@ status:
   conditions: []
   storedVersions: []
 
----
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -1840,8 +1823,6 @@ status:
   conditions: []
   storedVersions: []
 
----
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -1952,8 +1933,6 @@ status:
   conditions: []
   storedVersions: []
 
----
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -2037,8 +2016,6 @@ status:
   conditions: []
   storedVersions: []
 
----
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -2097,8 +2074,6 @@ status:
   conditions: []
   storedVersions: []
 
----
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -2157,8 +2132,6 @@ status:
   conditions: []
   storedVersions: []
 
----
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -2260,8 +2233,6 @@ status:
   conditions: []
   storedVersions: []
 
----
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -2487,8 +2458,6 @@ status:
   conditions: []
   storedVersions: []
 
----
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -3243,8 +3212,6 @@ status:
   conditions: []
   storedVersions: []
 
----
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition

diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
@@ -858,7 +858,7 @@ func (b *BootstrapChannelBuilder) buildAddons(c *fi.ModelBuilderContext) (*chann
 			"k8s-1.7":    "2.6.12-kops.1",
 			"k8s-1.7-v3": "3.8.0-kops.2",
 			"k8s-1.12":   "3.9.6-kops.2",
-			"k8s-1.16":   "3.17.3-kops.1",
+			"k8s-1.16":   "3.17.3-kops.2",
 		}
 
 		{