Merge pull request #9253 from olemarkus/cilium-ipv4

Don't make it possible to toggle ipv4/6. We only support ipv4 anyway
kubernetes · Jun 3, 2020 · c8674f2 · c8674f2
2 parents 4fe5ad0 + 972d7a3
commit c8674f2
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 26 deletions.
diff --git a/k8s/crds/kops.k8s.io_clusters.yaml b/k8s/crds/kops.k8s.io_clusters.yaml
@@ -2937,14 +2937,12 @@ spec:
                           in the future. Setting this has no effect.
                         type: boolean
                       enableipv4:
-                        description: 'EnableIpv4 enables cluster IPv4 traffic. If
-                          both EnableIpv6 and EnableIpv4 are set to false then IPv4
-                          will be enabled. Default: false'
+                        description: EnableIpv4 is not implemented and may be removed
+                          in the future. Setting this has no effect.
                         type: boolean
                       enableipv6:
-                        description: 'EnableIpv6 enables cluster IPv6 traffic. If
-                          both EnableIpv6 and EnableIpv4 are set to false then IPv4
-                          will be enabled. Default: false'
+                        description: EnableIpv6 is not implemented and may be removed
+                          in the future. Setting this has no effect.
                         type: boolean
                       envoyLog:
                         description: EnvoyLog is not implemented and may be removed

diff --git a/pkg/apis/kops/networking.go b/pkg/apis/kops/networking.go
@@ -366,13 +366,11 @@ type CiliumNetworkingSpec struct {
 	// Tunnel specifies the Cilium tunelling mode. Possible values are "vxlan", "geneve", or "disabled".
 	// Default: vxlan
 	Tunnel string `json:"tunnel,omitempty"`
-	// EnableIpv6 enables cluster IPv6 traffic. If both EnableIpv6 and EnableIpv4 are set to false
-	// then IPv4 will be enabled.
-	// Default: false
+	// EnableIpv6 is not implemented and may be removed in the future.
+	// Setting this has no effect.
 	EnableIpv6 bool `json:"enableipv6"`
-	// EnableIpv4 enables cluster IPv4 traffic. If both EnableIpv6 and EnableIpv4 are set to false
-	// then IPv4 will be enabled.
-	// Default: false
+	// EnableIpv4 is not implemented and may be removed in the future.
+	// Setting this has no effect.
 	EnableIpv4 bool `json:"enableipv4"`
 	// MonitorAggregation sets the level of packet monitoring. Possible values are "low", "medium", or "maximum".
 	// Default: medium

diff --git a/pkg/apis/kops/v1alpha2/networking.go b/pkg/apis/kops/v1alpha2/networking.go
@@ -364,13 +364,11 @@ type CiliumNetworkingSpec struct {
 	// Tunnel specifies the Cilium tunelling mode. Possible values are "vxlan", "geneve", or "disabled".
 	// Default: vxlan
 	Tunnel string `json:"tunnel,omitempty"`
-	// EnableIpv6 enables cluster IPv6 traffic. If both EnableIpv6 and EnableIpv4 are set to false
-	// then IPv4 will be enabled.
-	// Default: false
+	// EnableIpv6 is not implemented and may be removed in the future.
+	// Setting this has no effect.
 	EnableIpv6 bool `json:"enableipv6"`
-	// EnableIpv4 enables cluster IPv4 traffic. If both EnableIpv6 and EnableIpv4 are set to false
-	// then IPv4 will be enabled.
-	// Default: false
+	// EnableIpv4 is not implemented and may be removed in the future.
+	// Setting this has no effect.
 	EnableIpv4 bool `json:"enableipv4"`
 	// MonitorAggregation sets the level of packet monitoring. Possible values are "low", "medium", or "maximum".
 	// Default: medium

diff --git a/upup/models/bindata.go b/upup/models/bindata.go
diff --git a/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12.yaml.template b/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12.yaml.template
@@ -46,10 +46,10 @@ data:
   {{ end }}
   # Enable IPv4 addressing. If enabled, all endpoints are allocated an IPv4
   # address.
-  enable-ipv4: "{{- if or  (.EnableIpv4) (and (not (.EnableIpv4)) (not (.EnableIpv6))) -}}true{{- else -}}false{{- end -}}"
+  enable-ipv4: "true"
   # Enable IPv6 addressing. If enabled, all endpoints are allocated an IPv6
   # address.
-  enable-ipv6: "{{- if .EnableIpv6 -}}true{{- else -}}false{{- end -}}"
+  enable-ipv6: "false"
   # If you want cilium monitor to aggregate tracing for packets, set this level
   # to "low", "medium", or "maximum". The higher the level, the less packets
   # that will be seen in monitor output.

diff --git a/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.7.yaml.template b/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.7.yaml.template
@@ -31,10 +31,10 @@ data:
   {{ end }}
   # Enable IPv4 addressing. If enabled, all endpoints are allocated an IPv4
   # address.
-  enable-ipv4: "{{- if or  (.EnableIpv4) (and (not (.EnableIpv4)) (not (.EnableIpv6))) -}}true{{- else -}}false{{- end -}}"
+  enable-ipv4: "true"
   # Enable IPv6 addressing. If enabled, all endpoints are allocated an IPv6
   # address.
-  enable-ipv6: "{{- if .EnableIpv6 -}}true{{- else -}}false{{- end -}}"
+  enable-ipv6: "false"
   # If you want cilium monitor to aggregate tracing for packets, set this level
   # to "low", "medium", or "maximum". The higher the level, the less packets
   # that will be seen in monitor output.