cleanup/ipam: Remove hostscope-legacy IPAM option

To remove hostscope-legacy IPAM option Fixes: #12974 Signed-off-by: Tam Mach <sayboras@yahoo.com>
cilium · Sep 7, 2020 · 175bd96 · 175bd96
1 parent c15b3fc
commit 175bd96
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 83 deletions.
diff --git a/Documentation/cmdref/cilium-agent.md b/Documentation/cmdref/cilium-agent.md
diff --git a/Documentation/cmdref/cilium-operator-generic.md b/Documentation/cmdref/cilium-operator-generic.md
diff --git a/Documentation/cmdref/cilium-operator.md b/Documentation/cmdref/cilium-operator.md
diff --git a/Documentation/concepts/networking/ipam/hostscope.rst b/Documentation/concepts/networking/ipam/hostscope.rst
diff --git a/Documentation/concepts/networking/ipam/index.rst b/Documentation/concepts/networking/ipam/index.rst
@@ -24,5 +24,4 @@ Cilium. Various IPAM modes are supported to meet the needs of different users:
    eni
    gke
    crd
-   hostscope
    deep_dive
diff --git a/Documentation/install/upgrade.rst b/Documentation/install/upgrade.rst
@@ -378,6 +378,9 @@ Removed options
 * The ``prometheus-serve-addr-deprecated`` option is now removed. Please use
   ``prometheus-serve-addr`` instead.
 
+* The ``hostscope-legacy`` option value for ``ipam`` is now removed. The ``ipam``
+  option now defaults to ``cluster-pool``.
+
 Removed cilium-operator options
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -402,6 +405,9 @@ Removed cilium-operator options
 * The ``metrics-address`` option is now removed. Please use
   ``operator-prometheus-serve-addr`` instead.
 
+* The ``hostscope-legacy`` option value for ``ipam`` is now removed. The ``ipam``
+  option now defaults to ``cluster-pool``.
+
 .. _1.8_upgrade_notes:
 
 1.8 Upgrade Notes

diff --git a/daemon/cmd/daemon_main.go b/daemon/cmd/daemon_main.go
@@ -425,7 +425,7 @@ func init() {
 	flags.String(option.IdentityAllocationMode, option.IdentityAllocationModeKVstore, "Method to use for identity allocation")
 	option.BindEnv(option.IdentityAllocationMode)
 
-	flags.String(option.IPAM, ipamOption.IPAMHostScopeLegacy, "Backend to use for IPAM")
+	flags.String(option.IPAM, ipamOption.IPAMOperator, "Backend to use for IPAM")
 	option.BindEnv(option.IPAM)
 
 	flags.String(option.IPv4Range, AutoCIDR, "Per-node IPv4 endpoint prefix, e.g. 10.16.0.0/16")

diff --git a/install/kubernetes/cilium/charts/config/templates/configmap.yaml b/install/kubernetes/cilium/charts/config/templates/configmap.yaml
@@ -4,7 +4,7 @@
 {{- $defaultBpfMasquerade := "false" -}}
 {{- $defaultBpfClockProbe := "false" -}}
 {{- $defaultBpfTProxy := "false" -}}
-{{- $defaultIPAM := "hostscope" -}}
+{{- $defaultIPAM := "cluster-pool" -}}
 {{- $defaultSessionAffinity := "false" -}}
 {{- $defaultOperatorApiServeAddr := "localhost:9234" -}}
 {{- $defaultBpfCtTcpMax := 524288 -}}

diff --git a/operator/flags.go b/operator/flags.go
@@ -97,15 +97,13 @@ func init() {
 	var defaultIPAM string
 	switch binaryName {
 	case "cilium-operator":
-		defaultIPAM = ipamOption.IPAMHostScopeLegacy
+		defaultIPAM = ipamOption.IPAMOperator
 	case "cilium-operator-aws":
 		defaultIPAM = ipamOption.IPAMENI
 	case "cilium-operator-azure":
 		defaultIPAM = ipamOption.IPAMAzure
 	case "cilium-operator-generic":
-		// Default to Legacy for upgrade paths; new users should
-		// explicitly override the IPAM flag.
-		defaultIPAM = ipamOption.IPAMHostScopeLegacy
+		defaultIPAM = ipamOption.IPAMOperator
 	}
 
 	flags.String(option.IPAM, defaultIPAM, "Backend to use for IPAM")
@@ -156,8 +154,6 @@ func init() {
 			switch ipamFlagValue {
 			case ipamOption.IPAMENI, ipamOption.IPAMAzure:
 				return unsupporterErr()
-			case ipamOption.IPAMHostScopeLegacy:
-				return fmt.Errorf("%s, as it is deprecated, but it is still supported by legacy cilium-operator binary)", unsupporterErr().Error())
 			}
 		}
 

diff --git a/pkg/ipam/ipam.go b/pkg/ipam/ipam.go
@@ -108,7 +108,7 @@ func NewIPAM(nodeAddressing datapath.NodeAddressing, c Configuration, owner Owne
 	}
 
 	switch c.IPAMMode() {
-	case ipamOption.IPAMHostScopeLegacy, ipamOption.IPAMKubernetes, ipamOption.IPAMOperator:
+	case ipamOption.IPAMKubernetes, ipamOption.IPAMOperator:
 		log.WithFields(logrus.Fields{
 			logfields.V4Prefix: nodeAddressing.IPv4().AllocationCIDR(),
 			logfields.V6Prefix: nodeAddressing.IPv6().AllocationCIDR(),

diff --git a/pkg/ipam/ipam_test.go b/pkg/ipam/ipam_test.go
@@ -53,7 +53,7 @@ type testConfiguration struct{}
 func (t *testConfiguration) IPv4Enabled() bool                        { return true }
 func (t *testConfiguration) IPv6Enabled() bool                        { return true }
 func (t *testConfiguration) HealthCheckingEnabled() bool              { return true }
-func (t *testConfiguration) IPAMMode() string                         { return ipamOption.IPAMHostScopeLegacy }
+func (t *testConfiguration) IPAMMode() string                         { return ipamOption.IPAMOperator }
 func (t *testConfiguration) BlacklistConflictingRoutesEnabled() bool  { return false }
 func (t *testConfiguration) SetIPv4NativeRoutingCIDR(cidr *cidr.CIDR) {}
 func (t *testConfiguration) IPv4NativeRoutingCIDR() *cidr.CIDR        { return nil }

diff --git a/pkg/ipam/option/option.go b/pkg/ipam/option/option.go
@@ -15,10 +15,6 @@
 package option
 
 const (
-	// IPAMHostScopeLegacy is the value to select the legacy hostscope IPAM mode
-	// This option will disappear in Cilium v1.9
-	IPAMHostScopeLegacy = "hostscope-legacy"
-
 	// IPAMKubernetes is the value to select the Kubernetes PodCIDR based
 	// hostscope IPAM mode
 	IPAMKubernetes = "kubernetes"