Make --networking=cilium-eni configure cilium to use eni ipam

2022-11-23 07:29:10 +01:00 · 2022-11-23 07:29:10 +01:00 · f75bc66732
parent 7a1f0f4bda
commit f75bc66732
2 changed files with 2 additions and 0 deletions
--- a/tests/integration/create_cluster/cilium-eni/expected-v1alpha2.yaml
+++ b/tests/integration/create_cluster/cilium-eni/expected-v1alpha2.yaml
@ -42,6 +42,7 @@ spec:
  networking:
    cilium:
      enableNodePort: true
+      ipam: eni
  nonMasqueradeCIDR: 100.64.0.0/10
  sshAccess:
  - 0.0.0.0/0
--- a/upup/pkg/fi/cloudup/new_cluster.go
+++ b/upup/pkg/fi/cloudup/new_cluster.go
@ -1143,6 +1143,7 @@ func setupNetworking(opt *NewClusterOptions, cluster *api.Cluster) error {
 		cluster.Spec.Networking.Cilium.EtcdManaged = true
 	case "cilium-eni":
 		addCiliumNetwork(cluster)
+		cluster.Spec.Networking.Cilium.IPAM = "eni"
 	case "gce":
 		cluster.Spec.Networking.GCE = &api.GCENetworkingSpec{}
 	default: