Skip to content

Commit

Permalink
IT
Browse files Browse the repository at this point in the history
  • Loading branch information
@kruftik
kruftik committed Apr 15, 2024
1 parent 7a930d4 commit 30c5eb8
Show file tree
Hide file tree
Showing 2 changed files with 165 additions and 59 deletions.
156 changes: 97 additions & 59 deletions node/pkg/lifecycle/startup/startup.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -749,16 +749,33 @@ func configureIPPools(ctx context.Context, client client.Interface, kubeadmConfi
return
}

var (
ipv4PoolEnabled = true
ipv6PoolEnabled = true
)

if ipv4Pool == "none" {
log.Info("Skipping IPv4 pool configuration")

ipv4PoolEnabled = false
}

if ipv6Pool == "none" {
log.Info("Skipping IPv6 pool configuration")

ipv6PoolEnabled = false
}

// If CIDRs weren't specified through the environment variables, check if they're present in kubeadm's
// config map.
if (len(ipv4Pool) == 0 || len(ipv6Pool) == 0) && kubeadmConfig != nil {
if ((ipv4PoolEnabled && len(ipv4Pool) == 0) || (ipv6PoolEnabled && len(ipv6Pool) == 0)) && kubeadmConfig != nil {
v4, v6, err := extractKubeadmCIDRs(kubeadmConfig)
if err == nil {
if len(ipv4Pool) == 0 {
if ipv4PoolEnabled && len(ipv4Pool) == 0 {
ipv4Pool = v4
log.Infof("found v4=%s in the kubeadm config map", ipv4Pool)
}
if len(ipv6Pool) == 0 {
if ipv6PoolEnabled && len(ipv6Pool) == 0 {
ipv6Pool = v6
log.Infof("found v6=%s in the kubeadm config map", ipv6Pool)
}
Expand All @@ -767,32 +784,86 @@ func configureIPPools(ctx context.Context, client client.Interface, kubeadmConfi
}
}

ipv4IpipModeEnvVar := strings.ToLower(os.Getenv("CALICO_IPV4POOL_IPIP"))
ipv4VXLANModeEnvVar := strings.ToLower(os.Getenv("CALICO_IPV4POOL_VXLAN"))
ipv6VXLANModeEnvVar := strings.ToLower(os.Getenv("CALICO_IPV6POOL_VXLAN"))

var (
ipv4BlockSize int
ipv6BlockSize int

ipv4IpipModeEnvVar, ipv4VXLANModeEnvVar, ipv4BlockSizeEnvVar string
ipv6VXLANModeEnvVar, ipv6BlockSizeEnvVar string

ipv4NodeSelector string
ipv6NodeSelector string

ipv4Cidr *cnet.IPNet
ipv6Cidr *cnet.IPNet

err error
)
ipv4BlockSizeEnvVar := os.Getenv("CALICO_IPV4POOL_BLOCK_SIZE")
if ipv4BlockSizeEnvVar != "" {
ipv4BlockSize = parseBlockSizeEnvironment(ipv4BlockSizeEnvVar)
} else {
ipv4BlockSize = DEFAULT_IPV4_POOL_BLOCK_SIZE

if ipv4PoolEnabled {
ipv4IpipModeEnvVar = strings.ToLower(os.Getenv("CALICO_IPV4POOL_IPIP"))
ipv4VXLANModeEnvVar = strings.ToLower(os.Getenv("CALICO_IPV4POOL_VXLAN"))
ipv6VXLANModeEnvVar = strings.ToLower(os.Getenv("CALICO_IPV6POOL_VXLAN"))

ipv4BlockSizeEnvVar = os.Getenv("CALICO_IPV4POOL_BLOCK_SIZE")
if ipv4BlockSizeEnvVar != "" {
ipv4BlockSize = parseBlockSizeEnvironment(ipv4BlockSizeEnvVar)
} else {
ipv4BlockSize = DEFAULT_IPV4_POOL_BLOCK_SIZE
}

validateBlockSize(4, ipv4BlockSize)

ipv4NodeSelector = os.Getenv("CALICO_IPV4POOL_NODE_SELECTOR")
validateNodeSelector(4, ipv4NodeSelector)

// Read IPV4 CIDR from env if set and parse then check it for errors
if ipv4Pool == "" {
ipv4Pool = DEFAULT_IPV4_POOL_CIDR

_, preferedNet, _ := net.ParseCIDR(DEFAULT_IPV4_POOL_CIDR)
if selectedPool, err := ipv4.GetDefaultIPv4Pool(preferedNet); err == nil {
ipv4Pool = selectedPool.String()
}

log.Infof("Selected default IP pool is '%s'", ipv4Pool)
}
_, ipv4Cidr, err = cnet.ParseCIDR(ipv4Pool)
if err != nil || ipv4Cidr.Version() != 4 {
log.Errorf("Invalid CIDR specified in CALICO_IPV4POOL_CIDR '%s'", ipv4Pool)
utils.Terminate()
return // not really needed but allows testing to function
}
}
validateBlockSize(4, ipv4BlockSize)
ipv6BlockSizeEnvVar := os.Getenv("CALICO_IPV6POOL_BLOCK_SIZE")
if ipv6BlockSizeEnvVar != "" {
ipv6BlockSize = parseBlockSizeEnvironment(ipv6BlockSizeEnvVar)
} else {
ipv6BlockSize = DEFAULT_IPV6_POOL_BLOCK_SIZE

if ipv6PoolEnabled {
ipv6BlockSizeEnvVar = os.Getenv("CALICO_IPV6POOL_BLOCK_SIZE")
if ipv6BlockSizeEnvVar != "" {
ipv6BlockSize = parseBlockSizeEnvironment(ipv6BlockSizeEnvVar)
} else {
ipv6BlockSize = DEFAULT_IPV6_POOL_BLOCK_SIZE
}

validateBlockSize(6, ipv6BlockSize)

ipv6NodeSelector = os.Getenv("CALICO_IPV6POOL_NODE_SELECTOR")
validateNodeSelector(6, ipv6NodeSelector)

// If no IPv6 pool is specified, generate one.
if ipv6Pool == "" {
ipv6Pool, err = GenerateIPv6ULAPrefix()
if err != nil {
log.Errorf("Failed to generate an IPv6 default pool")
utils.Terminate()
}
}
_, ipv6Cidr, err = cnet.ParseCIDR(ipv6Pool)
if err != nil || ipv6Cidr.Version() != 6 {
log.Errorf("Invalid CIDR specified in CALICO_IPV6POOL_CIDR '%s'", ipv6Pool)
utils.Terminate()
return // not really needed but allows testing to function
}
}
validateBlockSize(6, ipv6BlockSize)
ipv4NodeSelector := os.Getenv("CALICO_IPV4POOL_NODE_SELECTOR")
validateNodeSelector(4, ipv4NodeSelector)
ipv6NodeSelector := os.Getenv("CALICO_IPV6POOL_NODE_SELECTOR")
validateNodeSelector(6, ipv6NodeSelector)

// Get a list of all IP Pools
poolList, err := client.IPPools().List(ctx, options.ListOptions{})
Expand All @@ -819,55 +890,22 @@ func configureIPPools(ctx context.Context, client client.Interface, kubeadmConfi
}
}

// Read IPV4 CIDR from env if set and parse then check it for errors
if ipv4Pool == "" {
ipv4Pool = DEFAULT_IPV4_POOL_CIDR

_, preferedNet, _ := net.ParseCIDR(DEFAULT_IPV4_POOL_CIDR)
if selectedPool, err := ipv4.GetDefaultIPv4Pool(preferedNet); err == nil {
ipv4Pool = selectedPool.String()
}

log.Infof("Selected default IP pool is '%s'", ipv4Pool)
}
_, ipv4Cidr, err := cnet.ParseCIDR(ipv4Pool)
if err != nil || ipv4Cidr.Version() != 4 {
log.Errorf("Invalid CIDR specified in CALICO_IPV4POOL_CIDR '%s'", ipv4Pool)
utils.Terminate()
return // not really needed but allows testing to function
}

// If no IPv6 pool is specified, generate one.
if ipv6Pool == "" {
ipv6Pool, err = GenerateIPv6ULAPrefix()
if err != nil {
log.Errorf("Failed to generate an IPv6 default pool")
utils.Terminate()
}
}
_, ipv6Cidr, err := cnet.ParseCIDR(ipv6Pool)
if err != nil || ipv6Cidr.Version() != 6 {
log.Errorf("Invalid CIDR specified in CALICO_IPV6POOL_CIDR '%s'", ipv6Pool)
utils.Terminate()
return // not really needed but allows testing to function
}

// Ensure there are pools created for each IP version.
if !ipv4Present {
if ipv4PoolEnabled && !ipv4Present {
log.Debug("Create default IPv4 IP pool")
outgoingNATEnabled := evaluateENVBool("CALICO_IPV4POOL_NAT_OUTGOING", true)
bgpExportDisabled := evaluateENVBool("CALICO_IPV4POOL_DISABLE_BGP_EXPORT", false)

createIPPool(ctx, client, ipv4Cidr, DEFAULT_IPV4_POOL_NAME, ipv4IpipModeEnvVar, ipv4VXLANModeEnvVar, outgoingNATEnabled, ipv4BlockSize, ipv4NodeSelector, bgpExportDisabled)
}
if !ipv6Present && ipv6Supported() {

if ipv6PoolEnabled && !ipv6Present && ipv6Supported() {
log.Debug("Create default IPv6 IP pool")
outgoingNATEnabled := evaluateENVBool("CALICO_IPV6POOL_NAT_OUTGOING", false)
bgpExportDisabled := evaluateENVBool("CALICO_IPV6POOL_DISABLE_BGP_EXPORT", false)

createIPPool(ctx, client, ipv6Cidr, DEFAULT_IPV6_POOL_NAME, string(api.IPIPModeNever), ipv6VXLANModeEnvVar, outgoingNATEnabled, ipv6BlockSize, ipv6NodeSelector, bgpExportDisabled)
}

}

// createIPPool creates an IP pool using the specified CIDR. This
Expand Down
68 changes: 68 additions & 0 deletions node/pkg/lifecycle/startup/startup_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -476,6 +476,74 @@ var _ = Describe("FV tests against a real etcd", func() {
Expect(poolList.Items).To(BeEmpty(), "Environment %#v", os.Environ())
})

DescribeTable("Test skip pool creation via 'none' CALICO_IPVxPOOL_CIDR env variable values",
func(envList []EnvItem, poolsCount int, expectIPV4Pool, expectIPV6Pool bool) {
// Create clients for test.
cfg, err := apiconfig.LoadClientConfigFromEnvironment()
Expect(err).NotTo(HaveOccurred())
c, err := client.New(*cfg)
Expect(err).NotTo(HaveOccurred())
be, err := backend.NewClient(*cfg)
Expect(err).NotTo(HaveOccurred())

err = be.Clean()
Expect(err).NotTo(HaveOccurred())

// Get the IPPool list.
poolList, err := c.IPPools().List(ctx, options.ListOptions{})
Expect(err).NotTo(HaveOccurred())
Expect(poolList.Items).To(BeEmpty(), "Environment %#v", os.Environ())

// Set the env variables specified.
for _, env := range envList {
os.Setenv(env.key, env.value)
}
defer func() {
for _, env := range envList {
os.Unsetenv(env.key)
}
}()

// Run the UUT.
configureIPPools(ctx, c, kubeadmConfig)

poolList, err = c.IPPools().List(ctx, options.ListOptions{})
Expect(err).NotTo(HaveOccurred())
Expect(len(poolList.Items)).To(BeIdenticalTo(poolsCount), "Expected number of default pools")

// Look through the pool for the expected data.
foundv4pool := false
foundv6pool := false

for _, pool := range poolList.Items {
if pool.Name == DEFAULT_IPV4_POOL_NAME {
foundv4pool = true
continue
}
if pool.Name == DEFAULT_IPV6_POOL_NAME {
foundv6pool = true
continue
}
}

Expect(foundv4pool).To(BeIdenticalTo(expectIPV4Pool),
"Expected IPv4 pool is in Pools")
Expect(foundv6pool).To(BeIdenticalTo(expectIPV6Pool),
"Expected IPv6 pool is in Pools")
},

Entry("CALICO_IPV4POOL_CIDR=none", []EnvItem{
{key: "CALICO_IPV4POOL_CIDR", value: "none"},
}, 1, false, true),
Entry("CALICO_IPV6POOL_CIDR=none", []EnvItem{
{key: "CALICO_IPV6POOL_CIDR", value: "none"},
}, 1, true, false),
Entry("CALICO_IPV4POOL_CIDR=none and CALICO_IPV6POOL_CIDR=none", []EnvItem{
{key: "CALICO_IPV4POOL_CIDR", value: "none"},
{key: "CALICO_IPV6POOL_CIDR", value: "none"},
}, 0, false, false),
)

DescribeTable("Test IP pool env variables that cause exit",
func(envList []EnvItem) {
my_ec := 0
Expand Down

0 comments on commit 30c5eb8

Please sign in to comment.